summaryrefslogtreecommitdiff
path: root/storage
Commit message (Collapse)AuthorAgeFilesLines
* mysql-test/suite/funcs_1/r/storedproc.result:Michael Widenius2011-05-021-2/+3
| | | | | | | | | Fixed test failure mysql-test/suite/funcs_1/t/storedproc.test: Fixed test failure (The error changed as syntax for alter changed with ALTER ONLINE) storage/maria/ha_maria.cc: fixed compiler warning
* Added ALTER ONLINE TABLE, which will give an error if the change can't be ↵Michael Widenius2011-04-281-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | done 'instantly' (without a table copy) mysql-test/r/alter_table_online.result: Test new feature mysql-test/t/alter_table_online.test: Test new feature sql/handler.cc: Added comment sql/lex.h: Added ONLINE keyword sql/mysql_priv.h: Added option to alter table to require online operation sql/share/errmsg.txt: Added error message if ONLINE can't be done sql/sql_lex.h: Added online option sql/sql_parse.cc: Added online option to mysql_alter_table() sql/sql_table.cc: Added test that gives error if table can't be done instantly when requsted to be online. Fixed wrong test if table includes a VARCHAR Fixed wrong (but unlikely) handling of error conditions in ALTER table sql/sql_yacc.yy: Added ALTER ONLINE TABLE syntax storage/maria/ha_maria.cc: Fixed bug where 'start_bulk_insert' used too small buffer if used with unknown number of rows
* Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK"Michael Widenius2011-04-288-9/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to do safe multi volume snapshots as long as one snapshots the volume with the transaction logs last. include/mysql_com.h: Added REFRESH_CHECKPOINT mysql-test/r/flush.result: Added test of new FLUSH TABLES syntax + calls to checkpoint_status handler calls mysql-test/t/flush.test: Added test of new FLUSH TABLES syntax + calls to checkpoint_status handler calls sql/handler.cc: Added code to call checkpoint_state for all handlertons that supports it sql/handler.h: Added new checkpoint_state() handlerton call to temporarly disable checkpoints. sql/lex.h: Added CHECKPOINT keyword sql/sql_yacc.yy: Added support for FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT storage/maria/ha_maria.cc: Added handlerton call to disable checkpoints. storage/maria/ma_checkpoint.c: Don't do checkpoint if checkpoints are disabled. storage/maria/ma_static.c: Added maria_checkpoint_disabled storage/maria/maria_def.h: Added maria_checkpoint_disabled storage/xtradb/handler/ha_innodb.cc: Added handlerton call to disable checkpoints. storage/xtradb/include/log0log.h: Added option to log_checkpoint() to allow one to ignore not critical checkpoints during the time checkpoints are disabled. storage/xtradb/log/log0log.c: Added code to allow one to disable checkpoints during a FLUSH TABLES ... DISABLE CHECKPOINT This was done by adding a new argument to log_checkpoint() which tells us when the checkpoint is called by srv_master_thread (which are safe to ignore) storage/xtradb/srv/srv0srv.c: Tell log_checkpoint() that checkpoints from srv_master_thread() are safe to ignore (will just delay recovery time a bit).
* mergeVladislav Vaintroub2011-04-101-2/+10
|\
| * Detect Boost installation and build OQGRAPH when possible. For now, disable ↵Vladislav Vaintroub2011-04-101-2/+10
| | | | | | | | | | | | oqgraph on x64 until LPBUG 756966 is solved.
* | Merge various replication-related patches into MariaDB 5.3:unknown2011-04-0815-326/+561
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | - MWL#116 Group commit - MWL#136 Enhancements for START TRANSACTION WITH CONSISTENT SNAPSHOT - MWL#47 Annotate_rows_log_event - MWL#163 innodb_release_locks_early - Percona patch enhancing row-based replication for tables with no primary key
| * | MWL#116: After-review fixes.unknown2011-04-074-135/+164
| | | | | | | | | | | | Also implement the InnoDB changes for group commit into innodb_plugin.
| * | Change lock release to assert in XtraDB commit_ordered(); we never want tounknown2011-04-073-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | hold the latch across the 2-phase commit, and it is already released at start of prepare (if not before). Rename trx->active_trans to active_flag; since we changed the semantics of the field, renaming should help prevent silent merge errors.
| * | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-01284-4894/+5883
| |\ \
| * \ \ Merge MWL#116 after-review fixes.unknown2011-03-313-2/+9
| |\ \ \
| | * | | MWL#116: After-review fixes.unknown2011-03-313-2/+9
| | | | |
| * | | | Merge MWL#116, PBXT part into mariadb-5.2-rplunknown2011-01-314-47/+146
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes PBXT implement the commit_ordered() method, so that cross-engine START TRANSACTION WITH CONSISTENT SNAPSHOT works actually consistent with XtraDB. Also mark the version number to show this is the -rpl feature preview.
| | * | | | MWL#116: Efficient group commit: PBXT partunknown2010-10-154-47/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the commit_ordered() API in PBXT, getting consistent commit ordering with other engines and binlog. Make pbxt_support_xa default in MariaDB debug build (as the bug that causes assert in MySQL is fixed in MariaDB).
| * | | | | After-merge fixes for MWL#47 (which causes changes in binlog positions in ↵unknown2011-01-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .result files). Also fix one incorrect printf() format.
| * | | | | Merge three Percona patches into mariadb-5.2-rpl:unknown2011-01-2629-99/+37
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - MWL#47, allowing to annotate row-based binlog events with the SQL test of the originating query (eg. in mysqlbinlog output). - row_based_replication_without_primary_key.patch, providing more intelligent selection of index to use on slave when applying row-based binlog events for tables with no primary key. - Make mysqlbinlog omit redundant `use` around BEGIN/SAVEPOINT/COMMIT/ ROLLBACK in 5.0 binlogs.
| * | | | | | Fix wrong printf() format.unknown2011-01-261-1/+2
| | | | | | |
| * | | | | | Merge MWL#163 into mariadb-5.2-rplunknown2010-12-254-1/+82
| |\ \ \ \ \ \
| | * | | | | | MWL#163: release of row locks in InnoDB during prepareunknown2010-11-034-1/+82
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port the Facebook patch for releasing InnoDB row locks early to the MWL#116 framework. A new --innodb-release-locks-early option (off by default) enables a prepare_ordered() handlerton method which will release row locks and commit a transaction to memory immediately after successful prepare. If the server subsequently tries to rollback (ie. due to binlog error), crashes the server to prevent corrupting the InnoDB state. mysql-test/r/innodb_release_row_locks_early.result: Test case. mysql-test/t/innodb_release_row_locks_early-master.opt: Test case. mysql-test/t/innodb_release_row_locks_early.test: Test case. sql/log.cc: Add DEBUG_SYNC points for testing. storage/xtradb/handler/ha_innodb.cc: Release locks during prepare phase if --innodb-release-locks-early. Crash the server if we are asked to rollback after releasing locks and committing the transaction to memory. storage/xtradb/include/srv0srv.h: Add variable for --innodb-release-locks-early option. storage/xtradb/include/trx0sys.ic: If --innodb-release-locks-early, treat a transaction as committed to memory as soon as it enters the TRX_PREPARED state. storage/xtradb/srv/srv0srv.c: Add variable for --innodb-release-locks-early option.
| * | | | | | Merge MWL#116 into mariadb-5.2-rpl.unknown2010-12-253-135/+153
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge latest MariaDB 5.1 into MWL#116.unknown2010-11-0195-567/+2066
| | |\ \ \ \ \
| | * | | | | | MWL#116: Efficient group commit: Fix bug that binlog pos stored by XtraDB ↵unknown2010-10-182-24/+12
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during commit was wrong when more than one commit in group. Now the actual binlog position for each commit is stored in THD, and XtraDB can fetch the correct value from within commit_ordered() or commit(). mysql-test/r/group_commit_binlog_pos.result: Test case for XtraDB binlog position. mysql-test/t/group_commit_binlog_pos-master.opt: Test case for XtraDB binlog position. mysql-test/t/group_commit_binlog_pos.test: Test case for XtraDB binlog position. sql/log.cc: Save binlog position corresponding to commit in THD, and make accessible to storage engine. sql/sql_parse.cc: Add generic crash point for use in test cases. storage/xtradb/handler/ha_innodb.cc: Update to use new method of getting current binlog position that works with group commit. storage/xtradb/handler/ha_innodb.h: Update to use new method of getting current binlog position that works with group commit.
| | * | | | | MWL#116: Efficient group commitunknown2010-10-042-67/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak the commit_ordered() semantics. Now it is only called for transactions that go through 2-phase commit. This avoids forcing engines to make commits visible before they are durable. Also take LOCK_commit_ordered() around START TRANSACTION WITH CONSISTENT SNAPSHOT, to get a truly consistent snapshot.
| | * | | | | Merge with latest MariaDB 5.1unknown2010-10-01594-20165/+55117
| | |\ \ \ \ \
| | * | | | | | MWL#116: Efficient group commit for binary logunknown2010-09-301-106/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preliminary commit for testing
* | | | | | | | Merge: Make EXPLAIN better at displaying MRR/BKASergey Petrunya2011-04-046-1/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Make EXPLAIN better at displaying MRR/BKA:Sergey Petrunya2011-04-026-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "Using MRR" is no longer shown with range access. - Instead, both range and BKA accesses will show one of the following: = "Rowid-ordered scan" = "Key-ordered scan" = "Key-ordered Rowid-ordered scan" depending on whether DS-MRR implementation will do scan keys in order, rowids in order, or both. - The patch also introduces a way for other storage engines/MRR implementations to pass information to EXPLAIN output about the properties of employed MRR scans.
* | | | | | | | | Fixed all BUILD scripts to use g++ instead of gcc for linkingMichael Widenius2011-03-311-0/+10
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed memory leak from HEAP tables that was not deleted properly BUILD/compile-alpha-ccc: Use g++ instead of gcc for linking BUILD/compile-alpha-debug: Use g++ instead of gcc for linking BUILD/compile-pentium-pgcc: Use g++ instead of gcc for linking BUILD/compile-solaris-sparc: Use g++ instead of gcc for linking BUILD/compile-solaris-sparc-debug: Use g++ instead of gcc for linking BUILD/compile-solaris-sparc-purify: Use g++ instead of gcc for linking sql/item.cc: Safety fixes for expr_cache Call Item_result:field::cleanup() in Item_cache_wrapper::cleanup() More DBUG_PRINT sql/sql_base.cc: Simple optimization for setup_wild More DBUG_PRINT sql/sql_expression_cache.cc: Added header Removed not needed initialization sql/sql_lex.cc: More DBUG_PRINT sql/sql_select.cc: More DBUG_PRINT Fixed memory leak from HEAP tables that was not deleted properly storage/heap/hp_create.c: More DBUG_PRINT
* | | | | | | | merge mwl#55Vladislav Vaintroub2011-03-113-33/+18
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | merge 5.2Vladislav Vaintroub2011-03-10265-4801/+5546
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | MBUG#688404 : Fix pbxt crashes on Windows 64 in debug build Vladislav Vaintroub2011-02-041-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for the crash is misalignment on SSE instruciton in setjmp(). The root cause is PBXT debug malloc(), which unlike OS malloc does not guarantee 16 bytes alignment. So the fix for now is disable PBXT debug malloc on Windows. It was obsolete anyway, as it does not provide additional benefits to C runtime debug routines (always used in debug compilation) or to pageheap, available at runtime.
| * | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-293-33/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be able to build MSI based installer
* | | | | | | | Merge with 5.2Michael Widenius2011-03-09269-4798/+5539
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Fixed wrong filenames in maria unittest that caused unittest to failMichael Widenius2011-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/sphinx/suite.pm: Update test to support 1.10-beta storage/maria/unittest/ma_test_all-t: Fixed old filenames
| * | | | | | | Merge with 5.1 to get fixes for tests and compiler warningsMichael Widenius2011-03-011-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Get rid of compiler warningsMichael Widenius2011-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/parts/t/partition_alter4_innodb.test: Removed duplicated big_test marker sql-common/my_time.c: Get rid of compiler warning about uninitialized members
| * | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-28266-4793/+5549
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Automatic merge with 5.1-merge to get in Merge with MySQL 5.1.55Michael Widenius2011-02-26228-4400/+4747
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/parts/t/partition_debug_sync_innodb.test: Fixed failure on windows partition file is with small '#p#'
| | | * | | | | | | Fixed compiler warningsMichael Widenius2011-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmd-line-utils/readline/complete.c: Don't ignore value from fwrite() cmd-line-utils/readline/terminal.c: Don't ignore value from fwrite() extra/yassl/taocrypt/include/file.hpp: Changed prototype to be able to return value from fwrite() extra/yassl/taocrypt/src/file.cpp: Return value from fwrite for put() storage/xtradb/ut/ut0ut.c: Added casts to remove warnings for not critical usage of fwrite()
| | | * | | | | | | Fixed compiler and build error:Michael Widenius2011-02-252-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed main.mysqlcheck error on windows - Fixed 'can't drop database pbxt' failure when running pbxt.mysqlslap sql/table.cc: When using not legal file names for checking a non existing table, one got a warning in the log file which caused mysql.mysqlcheck to fail storage/innodb_plugin/row/row0upd.c: Fixed compiler warning storage/pbxt/src/table_xt.cc: Remove table that is dropped from 'repair-pending'. Fixed 'can't drop database pbxt' failure when running pbxt.mysqlslap
| | | * | | | | | | - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testingMichael Widenius2011-02-2511-132/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed mysql-test-run failures on window - Fixed compiler warnings from my last push (sorry about that) - Fixed that maria_chk --repair --extended works again - Fixed compiler warnings about using not unitialized data mysql-test/mysql-test-run.pl: Better output mysql-test/suite/parts/inc/partition_check_drop.inc: Use remove_files_wildcard instead of rm mysys/safemalloc.c: Fixed argument to printf storage/maria/ma_cache.c: Don't give errors when running maria_chk storage/maria/ma_dynrec.c: Don't give errors when running maria_chk storage/maria/ma_rt_test.c: Added option --datadir for where to put logs and test data storage/maria/ma_test1.c: Added option --datadir for where to put logs and test data storage/maria/ma_test2.c: Added option --datadir for where to put logs and test data storage/maria/maria_chk.c: If --datadir is used but --logdir is not, set --logdir from --datadir (this reflects how --help said how things should work) storage/maria/maria_read_log.c: Changed short option for 'maria-log-dir-path' from -l to -h to be same as mysqld, maria_chk, ma_test1 etc.. storage/maria/unittest/ma_test_all-t: Allow one to specify --tmpdir for where to store logs and data storage/xtradb/buf/buf0buf.c: Fixed compiler warnings about using not unitialized data storage/xtradb/row/row0upd.c: Fixed compiler warnings about using not unitialized data storage/xtradb/srv/srv0srv.c: Fixed compiler warnings about using not unitialized data
| | | * | | | | | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a ↵Michael Widenius2011-02-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | speedup for 5x for some tests. - Reduced memory usage from safe_mutex. - Fixed problem with failing tests that could not restart mysqld becasue the port was reserved - More DBUG information - Fixed bug where bitmap_set_prefix() wrote over buffer area. - Initialize n_pages_flushed in xtradb which was used uninitialized. client/mysqltest.cc: Reduced memory usage (400K -> 80 for simple test; 400M -> 70M for some other tests) - Smaller dynamic arrays at start - Made 'st_connection' significantly smaller by allocation 'mysql' on demand in mysql_init() and storing require_file in a mem_root. - Fixed that when one does --debug we get information from safemalloc in the trace (Most of changes are changing &connect->mysql to connect->mysql libmysql/libmysql.c: Don't call mysql_thread_end() if my_init() was called outside of mysql_server_init() This is needed to get information from my_end() into the DBUG log mysql-test/README: Fixed wrong comment mysql-test/mysql-test-run.pl: Reserv 20 ports / mysql-test-run thread. (Needed as some tests uses 9 mysqld servers) mysys/hash.c: More DBUG information mysys/my_bitmap.c: Fixed bug where bitmap_set_prefix() wrote over buffer area. mysys/safemalloc.c: More DBUG information mysys/thr_mutex.c: Initialize smaller arrays be default. sql-common/client.c: More DBUG_PRINT storage/xtradb/srv/srv0srv.c: Initialize n_pages_flushed which was used uninitialized.
| | | * | | | | | | Fixed build failuresMichael Widenius2011-02-234-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed references to deleted files - If we link staticly, check for static zlib - This should fix the problem with 'no -lz found' link error - Fixed build failure on window (Patch from Wlad) - Fixed build problem with federatedx when using -Werror BUILD/Makefile.am: Remove removed file config/ac-macros/zlib.m4: If we compile with --all-static, test that we have a static libz libmysqld/CMakeLists.txt: Fix for build error on windows mysql-test/suite/pbxt/r/key_cache.result: Updated result mysql-test/suite/pbxt/t/key_cache.test: Fixed not updated test case sql/CMakeLists.txt: Fix for build error on windows storage/federatedx/Makefile.am: Don't use CFLAGS to compile C++ programs storage/pbxt/src/lock_xt.cc: Fixed compiler warning about using uninitialized b2 storage/xtradb/buf/buf0buf.c: Fixed wrong printf storage/xtradb/srv/srv0srv.c: Fixed assignment of different width and test with different sign/unsigned
| | | * | | | | | | Merged InnoDB plugin from MySQL 5.1.54 -> MySQL 5.1.55 into xtradbMichael Widenius2011-02-2227-404/+671
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/innodb-zip.result: File has been moved to suite/innodb_plugin mysql-test/t/innodb-zip.test: File has been moved to suite/innodb_plugin
| | | * | | | | | | Merge with xtradb code changesMichael Widenius2011-02-2248-427/+1762
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (4 tests are still failing, so this push is not yet stable)
| | | | * | | | | | | Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB.unknown2011-02-0448-427/+1762
| | | | | | | | | | |
| | | * | | | | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-20156-3506/+2189
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria" - Fixed wrong assert in Aria Now need to merge with latest xtradb before pushing sql/ha_partition.cc: Ensure that m_ordered_rec_buffer is not freed before close. sql/mysqld.cc: Changed to use opt_stack_trace instead of opt_pstack. Removed references to pstack sql/partition_element.h: Ensure that connect_string is initialized storage/maria/ma_key_recover.c: Fixed wrong assert
| | | | * \ \ \ \ \ \ \ mergeGeorgi Kodinov2011-01-1032-393/+521
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Increment InnoDB Plugin version from 1.0.14 to 1.0.15.Vasil Dimov2011-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InnoDB Plugin 1.0.14 has been released with MySQL 5.1.54.
| | | | | * | | | | | | | Followup to vasil.dimov@oracle.com-20110107091222-q23qpb5skev0j9gcVasil Dimov2011-01-071-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use nested AC_CHECK_FUNC() because they result in: ./configure: line 52688: syntax error: unexpected end of file (which happens only on some platforms and does not happen on others, I have no idea what is the reason for this)
| | | | | * | | | | | | | Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2011-01-07105-2793/+989
| | | | | |\ \ \ \ \ \ \ \