summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix for Bug#43152 "Assertion `bitmap_is_set_all(&table->s->all_set)' failed ↵Michael Widenius2010-10-062-83/+100
| | | | | | | | | | | | | in handler::ha_reset" The reason for this was that some bitmap test functions changed the bitmap, which caused problems when the same bitmap was used by multiple threads. include/my_bitmap.h: Changed order of elements to get better alignment. mysys/my_bitmap.c: Change bitmap test functions to not modify the bitmap. Fixed compiler errors in test_bitmap
* Merge with 1.0.11-7 Pre-GA - 2010-09-09Michael Widenius2010-09-2822-103/+683
| | | | Updated results for failing test cases (In all cases the estimated number of rows was different)
* MergeIgor Babaev2010-09-264-11/+124
|\
| * Fixed bug #57024.Igor Babaev2010-09-264-11/+124
|/ | | | | | | | | | The condition over the outer tables now are extracted from the on condition of any outer join. This condition is saved in a special field of the JOIN_TAB structure for the first inner table of the outer join. The condition is checked before the first inner table is accessed. If it turns out to be false the table is not accessed at all and a null complemented row is generated immediately.
* MergeIgor Babaev2010-09-252-13/+5
|\
| * Changed the test case for bug #53161 to make it independent onIgor Babaev2010-09-252-13/+5
| | | | | | | | the setting of optimizer switch for table elimination.
* | MergeIgor Babaev2010-09-233-0/+80
|\ \ | |/
| * Fixed bug #53161.Igor Babaev2010-09-203-0/+80
| | | | | | | | | | | | The implementation of the virtual method not_null_tables for the class Item_outer_ref must always return 0.
* | MergeIgor Babaev2010-09-203-1/+110
|\ \
| * | Fixed bug #56862 (lp bug #640419).Igor Babaev2010-09-193-1/+110
| | | | | | | | | | | | | | | Made sure that rr_quick is used to read the next record whenever a quick select is used to retrieve the table records.
* | | fixes for windowsSergei Golubchik2010-09-205-10/+14
| | |
* | | bug in plugin.m4 that prevented group list in the MYSQL_PLUGIN declaration ↵Sergei Golubchik2010-09-181-2/+2
| |/ |/| | | | | from working.
* | Automatic mergeMichael Widenius2010-09-1514-33/+93
|\ \
| * | mysqltest now gives error messages with error code for my_delete, my_rename, ↵Michael Widenius2010-09-1514-33/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | my_copy etc. Fixed crashing bug when doing ALTER TABLE RENAME with transactional tables. client/mysqltest.cc: Added errno to error message for system calls (delete, rename etc) Write error message for failures of system calls mysql-test/include/cleanup_fake_relay_log.inc: Disable warnings for remove_file mysql-test/include/diff_tables.inc: Disable warnings for remove_file mysql-test/include/maria_empty_logs.inc: Disable warnings for remove_file mysql-test/include/maria_make_snapshot.inc: Disable warnings for remove_file mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc: Disable warnings for remove_file mysql-test/include/mysqlhotcopy.inc: Disable warnings for remove_file mysql-test/include/ndb_backup.inc: Disable warnings for remove_file mysql-test/include/ndb_backup_print.inc: Disable warnings for remove_file mysql-test/r/alter_table_trans.result: Test of crashing ALTER TABLE RENAME bug mysql-test/t/alter_table_trans.test: Test of crashing ALTER TABLE RENAME bug mysql-test/t/mysqltest.test: Disable warnings for remove_file and move_file mysys/my_copy.c: Fixed wrong error message sql/sql_table.cc: Fixed crashing bug when doing ALTER TABLE RENAME with transactional tables.
* | | Fix preserving mysqld error log across server restarts, broken by recent mtr ↵unknown2010-09-141-1/+1
| | | | | | | | | | | | changes.
* | | Merge: fix valgrind failure in Unique classSergey Petrunya2010-09-141-1/+1
|\ \ \
| * | | Fix valgrind failure with Unique classSergey Petrunya2010-09-141-1/+1
| | | |
* | | | don't build dynamic plugins when configured with --disable-shared.Sergei Golubchik2010-09-141-0/+8
| | | | | | | | | | | | | | | | libtool does not like it and fails the build.
* | | | mergedSergei Golubchik2010-09-1314-62/+37
|\ \ \ \ | |_|_|/ |/| | |
| * | | to simpliy and unify the codeSergei Golubchik2010-09-112-32/+17
| | | |
| * | | build dynamic plugins with the -shared libtool option to avoidSergei Golubchik2010-09-0912-30/+20
| |/ / | | | | | | | | | double compilation
* | | Adjusted the results of pbxt.join_nested after the fix for bug 49600Igor Babaev2010-09-131-8/+8
| |/ |/|
* | MergeMichael Widenius2010-09-131-5/+63
|\ \
| * | Fixed Aria recovery bug:Michael Widenius2010-09-131-5/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When reopening table during recovery, don't set file length from file sizes as file is not flushed. New feature in Aria recovery: - Create database directory if missing. storage/maria/ma_recovery.c: Don't print Query: twice when running maria_read_log Create database directory if missing. (Needed when running maria_read_log on an empty database direcory during testing) More DBUG_print Fixed bug: When reopening table during recovery, don't set file length from file sizes as file is not flushed.
* | | MergeIgor Babaev2010-09-127-17/+49
|\ \ \
| * | | Fixed bug #49600.Igor Babaev2010-09-117-17/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem could be demonstrated with an outer join of two single-row tables where the values of the join attributes were null. Any query with such a join could return a wrong result set if the where condition of the query was not empty. For queries with empty where conditions the result sets were correct. This was the consequence of two bugs in the code: - Item_equal objects for on conditions of outer joins were not built if the processed query had no where condition - the check for null values in the code that evaluated constant Item_equal objects was incorrect. Fixed both above problems. Added a test case for the bug and adjusted results for some other test cases.
* | | | MergeIgor Babaev2010-09-123-1/+103
|\ \ \ \ | |_|/ / |/| | |
| * | | Pulled in the latest changes in 5.1.Igor Babaev2010-09-1211-41/+79
| |\ \ \ | |/ / / |/| | |
* | | | Fix for LP#634943 "marked as crashed", "zerofilling" and "wrong data in ↵Michael Widenius2010-09-108-32/+57
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitmap" when recovering Aria tables This was an interaction of several bugs: - Tables marked as opened was not properly unmarked on recovery if there was not changes since checkpoint - zerofill of tables put wrong data in bitmap if directory for page was full - Tables was thought as 'moved' during recovery if they had a create_lsn bigger than the lsn in the control file. storage/maria/ha_maria.cc: If table is moved and crashed, threat it as crashed. (Not a related to this bug, but still good to have fixed) storage/maria/ma_blockrec.c: Make enough_free_entries_on_page() global storage/maria/ma_blockrec.h: Make enough_free_entries_on_page() global storage/maria/ma_check.c: If directory is full, mark page full. Fixes bug in zerofill storage/maria/ma_open.c: Don't marke files as MOVED during recovery if create_trid > trnman_max_trid, as this fails for tables created after checkpoint. storage/maria/ma_recovery.c: Reset open_count in file that was open during crash and was part of checkpoint. Fixed wrong warning of 'open count' after recovery of files that was not touched since checkpoint. storage/maria/maria_chk.c: Changed not documented option --log-dir to --logdir Document more of the options. Clean up output for --help storage/maria/trnman.c: Added DBUG_PRINT
* | | Fixed bug LP#605798 "wrong data in bitmap" after recovery.Michael Widenius2010-09-105-9/+22
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend remove_function_from_trace.pl to work with many threads (patch from Sergei) dbug/remove_function_from_trace.pl: Extend remove_function_from_trace.pl to work with many threads (patch from Sergei) storage/maria/ma_bitmap.c: Added marker that table had changed since last checkpoint. This ensures that we will flush all bitmap pages from cache at checkpoint. This fixes bug LP#605798 "wrong data in bitmap" after recovery. storage/maria/ma_check.c: Cleaned up error output storage/maria/ma_recovery.c: Cleaned up error output storage/maria/maria_def.h: Added changed_not_flushed
| * Fixed bug #49322.Igor Babaev2010-09-093-1/+103
|/ | | | | | | | | | When not-exists optimization was applied to a table that happened to be an inner table of two outer joins, one embedded into another, then setting the match flag for the embedding outer join on could be skipped. This caused generation of extra null complemented rows. Made sure that the match flags are set correctly in all cases when not-exists optimization is used.
* Updated failure text for maria_install_dbMichael Widenius2010-09-092-9/+9
| | | | | | | | | Don't give warning about block_insert if table is crashed. scripts/mysql_install_db.sh: Added link to KB. storage/maria/ma_recovery.c: Don't give warning about block_insert if table is crashed.
* Automatic merge with 5.1-release (5.1.50)Michael Widenius2010-09-09184-1436/+5448
|\
| * Give a more precise warning why something fails.Michael Widenius2010-09-082-3/+2
| | | | | | | | | | | | | | | | | | Fixed typo that caused warnings from mysql-test-run mysql-test/mysql-test-run.pl: Fixed typo sql/mysqld.cc: Give a more precise warning why something fails.
| * Automatic mergeMichael Widenius2010-09-0722-337/+570
| |\
| * | Added --skip-bdb as a compatibility option for old config filesMichael Widenius2010-09-073-3/+12
| | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.pl: Added suppression mysql-test/t/upgrade.test: Added missing path
| * | Fixed compiler warningsMichael Widenius2010-09-071-2/+2
| | |
| * | Fix compile failures and warnings on Windows from XtraDB "shm buffer pool" ↵unknown2010-09-067-43/+47
| | | | | | | | | | | | | | | | | | patch. (It is not legal C to do pointer arithmetics on void *).
| * | Added missing include file (to get rid of compiler warning)Michael Widenius2010-09-061-0/+1
| | |
| * | Fixed build failuresMichael Widenius2010-09-067-83/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up mysql_upgrade --help and mysqlcheck --help client/mysql_upgrade.c: Increased version number. Marked all options that are not used 'Not used'. Don't write 'Looking for tool' if not using --verbose client/mysqlcheck.c: Cleanup output for --help Reset not initialzed variable mysql-test/r/log_tables_upgrade.result: Updated results mysql-test/r/mysql_upgrade.result: Updated results mysql-test/r/mysqlcheck.result: Updated results mysql-test/t/log_tables_upgrade.test: mysql_upgrade is now run without --skip-verbose mysql-test/t/mysql_upgrade.test: mysql_upgrade is now run without --skip-verbose
| * | Fixed failing test cases after update of xtradbMichael Widenius2010-09-058-34/+913
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/not_partition.result: Test result changed after I fixed the error message for not existing engine mysql-test/suite/funcs_1/r/is_columns_is.result: Updated results mysql-test/suite/funcs_1/r/is_engines_innodb.result: Updated results mysql-test/suite/funcs_1/r/is_tables_is.result: Updated results mysql-test/suite/funcs_1/t/is_tables_is.test: Test requires innodb as results depends on innodb mysql-test/suite/innodb_plugin/t/disabled.def: Disable test as it shows errors in valgrind mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test: Test can't be run under valgrind as mysql-test-run resets the innodb_use_sys_malloc flag storage/xtradb/buf/buf0buf.c: Fixed compiler warning by adding casts
| * | Nicer output for mysql_upgradeMichael Widenius2010-09-052-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added --silent option to mysql_upgrade so that one can only get errors printed Don't write unnecessary warning about log tables during upgrade client/mysql_upgrade.c: Don't print connect arguments if not using --verbose --verbose Added option --silent to only print errors. This options is passed to mysqlcheck. Write out phase names The 'verbose' code is a bit strange as I wanted to keep compatibility with old mysql_upgrade client/mysqlcheck.c: Don't upgrade log tables (to avoid confusing warning message that they can't be locked)
| * | Result file update following XtraDB merge.unknown2010-09-041-2/+4
| | |
| * | Merge XtraDB from Percona Server 5.1.49-12 into MariaDB.unknown2010-09-04118-1154/+4904
| |\ \
| | * | Enable tests that were previously disabled waiting for XtraDB merge.unknown2010-09-032-9/+0
| | | |
| | * | Merge XtraDB from Percona server 5.1.49-12 into MariaDB.unknown2010-09-03116-1145/+4904
| | |\ \
| | | * | Updated with changes from lp:percona-server/release-5.1.49-12 as of ↵unknown2010-09-03116-1144/+4952
| | | | | | | | | | | | | | | | | | | | September 3, 2010
| * | | | Update test to use the shorter table namesMichael Widenius2010-09-031-3/+3
| | | | |
| * | | | Enable archive tables to work with mysql_upgrade / repairMichael Widenius2010-09-0313-15/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made long file names from previous patch shorter mysql-test/r/archive.result: Added testing of repair (for upgrade) of 5.0 tables. mysql-test/std_data/archive_5_0.ARM: Archive table created in MySQL 5.0 mysql-test/std_data/archive_5_0.ARZ: Archive table created in MySQL 5.0 mysql-test/std_data/archive_5_0.frm: Archive table created in MySQL 5.0 mysql-test/std_data/long_table_name.MYD: Made long file names shorter mysql-test/std_data/long_table_name.MYI: Made long file names shorter mysql-test/std_data/long_table_name.frm: Made long file names shorter mysql-test/t/archive.test: Added testing of repair (for upgrade) of 5.0 tables. sql/sql_table.cc: Allow recreate to open crashed tables. sql/table.cc: Fix error message if storage engine doesn't exists. storage/archive/azio.c: Reset status values in case archive is of old versions storage/archive/ha_archive.cc: Fix to allow one to open old versions of table during repair Reset status variables for old version tables If the the table is of old version, force upgrade with ALTER TABLE when doing repair storage/archive/ha_archive.h: Added variables to detect old versions
| * | | | Fix that one can run mysql_upgrade with long table namesMichael Widenius2010-09-0332-912/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fall back to use ALTER TABLE for engines that doesn't support REPAIR when doing repair for upgrade. Nicer output from mysql_upgrade and mysql_check Updated all arrays that used NAME_LEN to use SAFE_NAME_LEN to ensure that we don't break things accidently as names can now have a #mysql50# prefix. client/mysql_upgrade.c: If we are using verbose, also run mysqlcheck in verbose mode. client/mysqlcheck.c: Add more information if running in verbose mode Print 'Needs upgrade' instead of complex error if table needs to be upgraded Don't write connect information if verbose is not 2 or above mysql-test/r/drop.result: Updated test and results as we now support full table names mysql-test/r/grant.result: Now you get a correct error message if using #mysql with paths mysql-test/r/show_check.result: Update results as table names can temporarly be bigger than NAME_LEN (during upgrade) mysql-test/r/upgrade.result: Test upgrade for long table names. mysql-test/suite/funcs_1/r/is_tables_is.result: Updated old test result (had note been updated in a while) mysql-test/t/drop.test: Updated test and results as we now support full table names mysql-test/t/grant.test: Now you get a correct error message if using #mysql with paths mysql-test/t/upgrade.test: Test upgrade for long table names. sql/ha_partition.cc: NAME_LEN -> SAFE_NAME_LEN sql/item.cc: NAME_LEN -> SAFE_NAME_LEN sql/log_event.cc: NAME_LEN -> SAFE_NAME_LEN sql/mysql_priv.h: Added SAFE_NAME_LEN sql/rpl_filter.cc: NAME_LEN -> SAFE_NAME_LEN sql/sp.cc: NAME_LEN -> SAFE_NAME_LEN sql/sp_head.cc: NAME_LEN -> SAFE_NAME_LEN sql/sql_acl.cc: NAME_LEN -> SAFE_NAME_LEN sql/sql_base.cc: NAME_LEN -> SAFE_NAME_LEN sql/sql_connect.cc: NAME_LEN -> SAFE_NAME_LEN sql/sql_parse.cc: NAME_LEN -> SAFE_NAME_LEN sql/sql_prepare.cc: NAME_LEN -> SAFE_NAME_LEN sql/sql_select.cc: NAME_LEN -> SAFE_NAME_LEN sql/sql_show.cc: NAME_LEN -> SAFE_NAME_LEN Enlarge table names for SHOW TABLES to also include optional #mysql50# sql/sql_table.cc: Fall back to use ALTER TABLE for engines that doesn't support REPAIR when doing repair for upgrade. sql/sql_trigger.cc: NAME_LEN -> SAFE_NAME_LEN sql/sql_udf.cc: NAME_LEN -> SAFE_NAME_LEN sql/sql_view.cc: NAME_LEN -> SAFE_NAME_LEN sql/table.cc: Fixed check_table_name() to not count #mysql50# as part of name If #mysql50# is part of the name, don't allow path characters in name.
View Lorry Controller Status