- 11 Jun, 2009 1 commit
-
-
Mikael Ronstrom authored
-
- 10 Jun, 2009 1 commit
-
-
Mikael Ronstrom authored
-
- 03 Jun, 2009 1 commit
-
-
Alexey Botchkov authored
the problem is in the TIMESTAMP(14) fields of the access-control tables. The TIMESTAMP(14) syntax is marked as DEPRECATED since 5.2. Fixed by just changed the check to 6.0 as it's done in the 5.1 branch. per-file comments: sql/sql_parse.cc Bug#44394 Assertion Failure now it's deprecated since 6.0
-
- 26 May, 2009 1 commit
-
-
Kelly Long authored
-
- 22 May, 2009 2 commits
-
-
MySQL Build Team authored
-
MySQL Build Team authored
Update version number; also modify NDB's version.c for compatibility.
-
- 13 May, 2009 1 commit
-
-
Gleb Shchepa authored
SQL_SELECT::test_quick_select The crash was caused by an incomplete cleanup of JOIN_TAB::select during the filesort of rows for GROUP BY clause inside a subquery. Queries where a quick index access is replaced with filesort was was affected. For example: SELECT 1 FROM (SELECT COUNT(DISTINCT c1) FROM t1 WHERE c2 IN (1, 1) AND c3 = 2 GROUP BY c2) x Quick index access related data in the SQL_SELECT::test_quick_select function was inconsistent after an incomplete cleanup. This function has been completed to prevent crashes in the SQL_SELECT::test_quick_select function. mysql-test/include/mix1.inc: Add test case for bug #44290. mysql-test/r/innodb_mysql.result: Add test case for bug #44290. sql/sql_select.cc: Bug #44290: explain crashes for subquery with distinct in SQL_SELECT::test_quick_select Quick index access related data in the SQL_SELECT::test_quick_select function was inconsistent after an incomplete cleanup. This function has been completed to prevent crashes in the SQL_SELECT::test_quick_select function.
-
- 08 May, 2009 1 commit
-
-
Joerg Bruehe authored
165 changesets with 23 conflicts: Text conflict in mysql-test/r/lock_multi.result Text conflict in mysql-test/t/lock_multi.test Text conflict in mysql-test/t/mysqldump.test Text conflict in sql/item_strfunc.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/parse_file.cc Text conflict in sql/slave.cc Text conflict in sql/sp.cc Text conflict in sql/sp_head.cc Text conflict in sql/sql_acl.cc Text conflict in sql/sql_base.cc Text conflict in sql/sql_class.cc Text conflict in sql/sql_crypt.cc Text conflict in sql/sql_db.cc Text conflict in sql/sql_lex.cc Text conflict in sql/sql_parse.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_view.cc Text conflict in storage/innobase/handler/ha_innodb.cc Text conflict in storage/myisam/mi_packrec.c Text conflict in tests/mysql_client_test.c Updates to Innobase, taken from main 5.1: bzr: ERROR: Some change isn't sane: File mysql-test/r/innodb-semi-consistent.result is owned by Innobase and should not be updated. File mysql-test/t/innodb-semi-consistent.test is owned by Innobase and should not be updated. File storage/innobase/handler/ha_innodb.cc is owned by Innobase and should not be updated. File storage/innobase/ibuf/ibuf0ibuf.c is owned by Innobase and should not be updated. File storage/innobase/include/row0mysql.h is owned by Innobase and should not be updated. File storage/innobase/include/srv0srv.h is owned by Innobase and should not be updated. File storage/innobase/include/trx0trx.h is owned by Innobase and should not be updated. File storage/innobase/include/trx0trx.ic is owned by Innobase and should not be updated. File storage/innobase/lock/lock0lock.c is owned by Innobase and should not be updated. File storage/innobase/page/page0cur.c is owned by Innobase and should not be updated. File storage/innobase/row/row0mysql.c is owned by Innobase and should not be updated. File storage/innobase/row/row0sel.c is owned by Innobase and should not be updated. File storage/innobase/srv/srv0srv.c is owned by Innobase and should not be updated. File storage/innobase/trx/trx0trx.c is owned by Innobase and should not be updated. (Set env var 'ALLOW_UPDATE_INNOBASE_OWNED' to override.)
-
- 05 May, 2009 3 commits
-
-
Davi Arnaut authored
-
Davi Arnaut authored
-
unknown authored
-
- 04 May, 2009 1 commit
-
-
Satya B authored
table corruption Disabling the mysiam_debug.test in embedded mode because of BUG#43733 mysql-test/t/myisam_debug.test: Disable the test in embedded mode
-
- 30 Apr, 2009 23 commits
-
-
Georgi Kodinov authored
-
Sergey Vojtovich authored
-
Andrei Elkin authored
-
Andrei Elkin authored
-
Georgi Kodinov authored
-
Georgi Kodinov authored
-
Georgi Kodinov authored
-
Andrei Elkin authored
-
Andrei Elkin authored
-
Narayanan V authored
-
Andrei Elkin authored
-
Narayanan V authored
This patch adds corrections to the original patch submitted 2009-04-08 (http://lists.mysql.com/commits/71607): - fixed that the original patch didn't work because of an incorrect condition; - added a test case. mysql-test/r/upgrade.result: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 Result file for test case mysql-test/std_data/bug37631.MYD: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 table created in mysql 4.0 mysql-test/std_data/bug37631.MYI: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 table created in mysql 4.0 mysql-test/std_data/bug37631.frm: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 table created in mysql 4.0 mysql-test/t/upgrade.test: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 Adds test for checking that upgrade works on a table which is created by a mysql server version <= 4.0. storage/myisam/ha_myisam.cc: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 Fix the conformance checker to relax checking for the correct version of the tables (for tables created by mysql server version <= 4.0)
-
Andrei Elkin authored
-
Andrei Elkin authored
my_error() was invoked in reset_slave()'s with purge_relay_logs()-failing branch without passing sql_errno to it. Fixed with setting sql_errno= ER_RELAY_LOG_FAIL in the purge_relay_logs()-failing branch. sql/sql_repl.cc: set sql_errno= ER_RELAY_LOG_FAIL when purge_relay_logs() fails.
-
Matthias Leich authored
into actual tree
-
Sergey Glukhov authored
-
Satya B authored
-
Satya B authored
table corruption Moved the testcase from the file myisam.test to the new testfile mysiam_debug.test mysql-test/r/myisam.result: Removed result file for BUG#40827 mysql-test/r/myisam_debug.result: Result file for BUG#40827 mysql-test/t/myisam.test: Removed testcase for BUG#40827 mysql-test/t/myisam_debug.test: TestCase for BUG#40827
-
Matthias Leich authored
This is a "null" merge because the fix is already in 5.1
-
Sergey Glukhov authored
Error happens because sp_head::MULTI_RESULTS is not set for SP which has 'show table status' command. The fix is to add a SQLCOM_SHOW_TABLE_STATUS case into sp_get_flags_for_command() func. mysql-test/r/sp.result: test result mysql-test/t/sp.test: test case sql/sp_head.cc: Error happens because sp_head::MULTI_RESULTS is not set for SP which has 'show table status' command. The fix is to add a SQLCOM_SHOW_TABLE_STATUS case into sp_get_flags_for_command() func.
-
Alexey Botchkov authored
-
Alexey Botchkov authored
per-file comments: tests/mysql_client_test.c the test for bug 37956 isn't relevant anymore. The query there 'select point(?,?)' doesn't produce an error.
-
Satya B authored
Killing the insert-select statement corrupts the MyISAM table only when the destination table is empty and when it has indexes. When we bulk insert huge data and if the destination table is empty we disable the indexes for fast inserts, data is then inserted and indexes are re-enabled after bulk_insert operation Killing the query, aborts the repair table operation during enable indexes phase leading to table corruption. We now truncate the table when we detect that enable indexes is killed for bulk insert query.As we have an empty table before the operation, we can fix by truncating the table. mysql-test/r/myisam.result: Result file for BUG#40827 mysql-test/t/myisam.test: Testcase for BUG#40827 storage/myisam/ha_myisam.cc: Fixed end_bulk_insert() method to truncate the table when we detect enable index operation is killed.
-
- 29 Apr, 2009 5 commits
-
-
Martin Hansson authored
-
Vladislav Vaintroub authored
-
Martin Hansson authored
A bug in the initialization of key segment information made it point to the wrong bit, since a bit index was used when its int value was needed. This lead to misinterpretation of bit columns read from MyISAM record format when a NULL bit pushed them over a byte boundary. Fixed by using the int value of the bit instead. mysql-test/r/myisam.result: Bug#43737: Test result. mysql-test/t/myisam.test: Bug#43737: Test case. storage/myisam/mi_open.c: Bug#43737: fix.
-
Vladislav Vaintroub authored
key_buffer_size. The cause of corruption was number overflow when multiplying two ulong values, number of used keycache blocks with size of a single block. The result of multiplication exceeded ulong range (4G) and this lead to incorrectly calculated buffer offset in the key cache. The fix is to use size_t for multiplication result. This patch also fixes pointless cast in safemalloc (size of allocated block to uint), that creates lot of false alarm warnings when using big keycache (> 4GB) in debug mode.
-
Narayanan V authored
The storage engine was not correctly handling the case in which rnd_pos is executed for a handler without a preceding rnd_next or index read operation. As a result, an unitialized file handle was sometimes being passed to the QMY_READ API. The fix clears the rrnAssocHandle at the beginning of each read operation and then checks to see whether it has been set to a valid handle value before attempting to use it in rnd_pos. If rrnAssocHandle has not been set by a previous read operation, rnd_pos instead falls back to the use of the currently active handle. storage/ibmdb2i/ha_ibmdb2i.cc: Bug#44337 Select query using index merge fails with MCH3601 - clear the rrnAssocHandle at the beginning of each read operation - checks to see whether it has been set to a valid handle value before attempting to use it in rnd_pos
-