mariadb

Tree: 5983048f06

Author	SHA1	Message	Date
vasil	0260a98c32	branches/zip: Merge 2423:2437 from branches/5.1: ------------------------------------------------------------------------ r2429 \| vasil \| 2008-04-30 11:19:06 +0300 (Wed, 30 Apr 2008) \| 10 lines branches/5.1: * Use INNODB_CFLAGS insead of cluttering CFLAGS with InnoDB specific flags. CFLAGS are used to compile every file in the MySQL source tree. * Add INNODB_DYNAMIC_CFLAGS to the flags of the dynamic plugin and use -prefer-non-pic to make the dynamic plugin faster on i386. Approved by: Sunny ------------------------------------------------------------------------ r2430 \| vasil \| 2008-04-30 11:48:35 +0300 (Wed, 30 Apr 2008) \| 8 lines branches/5.1: Use CFLAGS instead of INNODB_CFLAGS to avoid having incompatible flags inserted in CFLAGS and INNODB_CFLAGS and to avoid compiling mysql and innodb with different flags. Discussed with: Sunny ------------------------------------------------------------------------ r2431 \| vasil \| 2008-04-30 11:54:49 +0300 (Wed, 30 Apr 2008) \| 4 lines branches/5.1: Fix r2430, it should be CFLAGS="$CFLAGS ..." not CFLAGS="..." ------------------------------------------------------------------------ r2432 \| vasil \| 2008-04-30 11:58:38 +0300 (Wed, 30 Apr 2008) \| 4 lines branches/5.1: Non-functional change: use tabs for indentation in plug.in. ------------------------------------------------------------------------ r2433 \| vasil \| 2008-04-30 12:02:35 +0300 (Wed, 30 Apr 2008) \| 5 lines branches/5.1: Add vim modeline to hint it that plug.in is a config file so it can be colorized. ------------------------------------------------------------------------ r2434 \| vasil \| 2008-04-30 18:45:44 +0300 (Wed, 30 Apr 2008) \| 17 lines branches/5.1: Merge changes from MySQL: ChangeSet@1.2645, 2007-12-19 13:24:43+00:00, jperkin@chorlton.adsl.perkin.org.uk +14 -0 Add new pkgplugindir handling to seperate plugins from libraries, and allow override for binary distributions. Extend mysql_config to print compiled-in plugin location for third-party plugins to use. Resolves bug#31736. and ChangeSet@1.2646, 2008-01-02 13:00:46+00:00, jperkin@chorlton.adsl.perkin.org.uk +11 -0 Use pkglibdir to simplify pkgplugindir, and fix the path in a couple of Makefiles. Continuation of the fix for bug#31736. ------------------------------------------------------------------------ r2435 \| vasil \| 2008-04-30 19:04:36 +0300 (Wed, 30 Apr 2008) \| 10 lines branches/5.1: Merge change from MySQL: ChangeSet@1.2563, 2008-03-18 19:42:04+04:00, gluh@mysql.com +1 -0 Bug#35406 5.1-opt crashes on select from I_S.REFERENTIAL_CONSTRAINTS added intialization of f_key_info.referenced_key_name for the case when referenced table is dropped ------------------------------------------------------------------------ r2436 \| vasil \| 2008-04-30 19:15:46 +0300 (Wed, 30 Apr 2008) \| 7 lines branches/5.1: Non-functional white space change in Makefile.am: Use tabs for indentation and be consistent about spaces around the equal sign. ------------------------------------------------------------------------ r2437 \| vasil \| 2008-04-30 20:36:11 +0300 (Wed, 30 Apr 2008) \| 8 lines branches/5.1: Fix Bug#36434 ha_innodb.so is installed in the wrong directory Change pkglib_LTLIBRARIES with pkgplugin_LTLIBRARIES which has been forgotten in this commit: http://lists.mysql.com/commits/40206 ------------------------------------------------------------------------	18 years ago
marko	9194c3a9e6	branches/zip: Pass -prefer-non-pic only on IA-32 (x86) when building the dynamic InnoDB plugin, ha_innodb.so. This libtool option cannot be used on every target platform. For instance, the AMD64 (x86_64) ABI mandates position-independent code (PIC) in dynamic shared objects. Makefile.am: Use $(INNODB_CFLAGS) and $(INNODB_DYNAMIC_CFLAGS) in target-specific CFLAGS and CXXFLAGS variable definitions. plug.in: Instead of appending to the MySQL-wide CFLAGS, introduce the variables INNODB_CFLAGS and INNODB_DYNAMIC_CFLAGS. Depending on $target_cpu, append -prefer-non-pic to INNODB_DYNAMIC_CFLAGS.	18 years ago
marko	775fd54ddb	branches/zip: Makefile.am: Disable the generation of position-independent code in the compilation of ha_innodb.so. ha_innodb_la_CXXFLAGS, ha_innodb_la_CFLAGS: Add -prefer-non-pic. This flag is interpreted by the ../../libtool script that acts as a front-end to the compiler and linker.	18 years ago
vasil	8424daa64b	branches/zip: Add mysql_addons.(cc\|h) to Makefile.am, forgotten in r2072. Pointyhat to: Vasil	18 years ago
marko	cf98f66049	branches/zip: Allow the symbols in the dynamic InnoDB plugin to be redefined so that the dynamic plugin can replace the builtin InnoDB in MySQL 5.1. ha_innodb.cc, handler0alter.cc: #include "univ.i" before any other InnoDB header files or before defining any symbols innodb_redefine.h: New file, to contain a mapping of symbols. The idea is that this file will be replaced in the build process; because this is a large file that can be generated automatically, it does not make sense to keep it under version control. univ.i: #include "innodb_redefine.h" and #define ha_innobase ha_innodb Makefile.am (ha_innodb_la_CXXFLAGS): Remove -Dha_innobase=ha_innodb NOTE: there are still some issues in the source code. One known issue is the #undef mutex_free in sync0sync.h, which will cause the plugin to call the function mutex_free in the builtin InnoDB. The preprocessor symbols defined in innodb_redefine.h must not be undefined or redefined anywhere in the code.	18 years ago
marko	15e0e266be	branches/zip: Allow a dynamically loaded InnoDB storage engine plugin to replace a built-in instance of InnoDB in mysqld. This is work in progress, with several limitations: * Other plugins defined in the builtin InnoDB are not disabled. However, InnoDB in MySQL 5.1 only defines the storage engine plugin, no INFORMATION_SCHEMA plugins. * The global C symbols in ha_innodb.so except innodb_hton_ptr and builtin_innobase_plugin will have to be redefined, e.g., by objcopy. * The storage engine cannot be called "InnoDB" to avoid a conflict with the builtin name. Here we call it InnoDBzip. innobase_hton_name[]: Rename to "InnoDBzip" when building a dynamic plugin. innodb_plugin_init(): New function for the dynamic plugin, to copy and redirect configuration parameters from the builtin InnoDB. innodb_dynamic: New configuration parameter. This has to be added to the builtin InnoDB in MySQL 5.1. Also, innodb_hton_ptr must be made global there. innobase_init(): Interpret the parameter innodb_dynamic. Makefile.am: Redefine class ha_innobase to ha_innodb by a preprocessor define. Apparently, C++ classes cannot be easily renamed by objcopy.	18 years ago
vasil	92ff5c4790	branches/zip: Add a type that stores chunks of data in its own storage and avoids duplicates. Supported methods: ha_storage_create() Allocates new storage object. ha_storage_put() Copies a given data chunk into the storage and returns pointer to the copy. If the data chunk is already present, a pointer to the existing object is returned and the given data chunk is not copied. ha_storage_empty() Clears (empties) the storage from all data chunks that are stored in it. ha_storage_free() Destroys a storage object. Opposite to ha_storage_create(). Approved by: Marko	18 years ago
vasil	69a2345cbb	Implement INFORMATION_SCHEMA tables innodb_trx, innodb_locks, innodb_lock_waits. See https://svn.innodb.com/innobase/InformationSchema/TransactionsAndLocks for design notes. Things that need to be resolved before this goes live: * MySQL must add thd_get_thread_id() function to their code http://bugs.mysql.com/30930 * Allocate memory from mem_heap instead of using mem_alloc() * Copy table name and index name into the cache because they may be freed later which will result in referencing freed memory Approved by: Marko	18 years ago
marko	21d303fed2	branches/zip: Move the code related to fast index creation (smart ALTER TABLE) from ha_innodb.cc to a separate module, handler0alter.cc.	18 years ago
marko	0a780db994	branches/zip: Merge 1575:1664 from trunk.	19 years ago
marko	88df83bb3b	branches/zip: Merge revisions 1402:1493 from trunk. Remove mysql.patch, because the configuration parameter interface has changed.	19 years ago
marko	4d6805f2a8	branches/zip: Merge revisions 1322:1402 from trunk.	19 years ago
marko	8f65d7a661	branches/zip: Merge revisions 1165:1206 from trunk.	19 years ago
marko	2a25f556e7	branches/zip: Add the first bits of the binary buddy system for allocating compressed pages from the buffer pool. Makefile.am: Add buf0buddy.h, buf0buddy.ic. buf/Makefile.am: Add buf0buddy.c. Introduce the constants BUF_BUDDY_LOW and BUF_BUDDY_SIZES. buf_pool_t: Add zip_mutex and the lists zip_clean and zip_free[]. buf_page_get_mutex(): Return &buf_pool->zip_mutex instead of NULL. buf_buddy_get_offset(), buf_buddy_get(), buf_buddy_get_slot(), buf_buddy_alloc_free(), buf_buddy_alloc_free_low(): New functions.	19 years ago
marko	8df8b91977	branches/zip: Merge revisions 887:934 from trunk.	19 years ago
marko	c4e548cec0	branches/zip: Add row_ext_t for caching prefixes of externally stored columns. This will be needed for fixing Bug #22496. REC_MAX_INDEX_COL_LEN: New constant, copied from DICT_MAX_INDEX_COL_LEN. row_ext_create(), row_ext_lookup(), row_ext_lookup_low(): New functions.	19 years ago
marko	48dd1ece29	branches/zip: Merge revisions 789:804 from trunk.	19 years ago
marko	d4d321ad85	branches/zip: Merge revisions 767:789 from trunk.	19 years ago
marko	f4f5606fb6	branches/zip: Merge revisions 634:713 from trunk.	20 years ago
marko	7f8cb7aab9	branches/zip: Merge revisions 583:634 from trunk.	20 years ago
marko	e47742cbef	branches/zip: Merge revisions 536:558 from trunk.	20 years ago
marko	5d8a41d9b5	branches/zip: Merge revisions 532:536 from trunk.	20 years ago
marko	d30e44bc32	branches/zip: Merge revisions 465:532 from trunk.	20 years ago
marko	0c4dfda3be	branches/zip: Merge revisions 265:459 from trunk.	20 years ago
marko	dcfc19c47c	branches/zip: Merge revisions 79:200 from trunk.	20 years ago
marko	0bf7f4bd1d	branches/zip: Merge revisions 9:72 from trunk.	20 years ago
osku	2903c72469	Import 5.0 code.	20 years ago

27 Commits (5983048f06e1377dc01d1562794834220d575660)