- 24 Nov, 2007 8 commits
-
-
unknown authored
into mysql.com:/home/hf/work/30284/my51-30284 mysql-test/r/gis.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/t/gis.test: Auto merged mysql-test/t/subselect.test: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
into mysql.com:/home/hf/work/30284/my50-30284 mysql-test/r/gis.result: merging mysql-test/t/gis.test: merging
-
unknown authored
into mysql.com:/home/hf/work/30284/my50-30284 mysql-test/r/gis.result: merging mysql-test/t/gis.test: merging
-
unknown authored
into mysql.com:/home/hf/work/30284/my51-30284 mysql-test/r/gis.result: merging mysql-test/t/gis.test: merging
-
unknown authored
into mysql.com:/home/hf/work/30284/my41-30284 mysql-test/r/gis.result: merging mysql-test/t/gis.test: merging
-
unknown authored
into mysql.com:/home/hf/work/30284/my51-30284 mysql-test/r/gis.result: Auto merged mysql-test/t/gis.test: Auto merged storage/myisam/mi_check.c: Auto merged
-
unknown authored
mysql-test/r/gis.result: result fixed mysql-test/t/gis.test: test fixed
-
unknown authored
into mysql.com:/home/hf/work/30284/my50-30284 myisam/mi_check.c: Auto merged mysql-test/t/gis.test: Auto merged mysql-test/r/gis.result: SCCS merged
-
- 23 Nov, 2007 13 commits
-
-
unknown authored
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt sql/slave.cc: Auto merged
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
-
unknown authored
disable decoding of table name if the table is internal temporary table mysql-test/r/drop.result: test result mysql-test/t/drop.test: test case sql/sql_db.cc: check is the name is internal tmp table name sql/sql_table.cc: disable decoding of table name if the table is internal temporary table sql/table.h: added flag which is true when table name is the name of internal temporary table
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/autopush/B32400-5.0-opt tests/mysql_client_test.c: Auto merged mysql-test/r/subselect.result: SCCS merged mysql-test/t/subselect.test: SCCS merged
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/B32400-5.1-opt
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/B32400-5.1-opt BitKeeper/deleted/.del-ps_6bdb.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/suite/ndb/r/ps_7ndb.result: Auto merged sql/item.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/t/subselect.test: merge of bug 32400 to 5.1-opt
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
-
unknown authored
The crash happens because we change share->partition_info where 'share' is global struct (it affects other threads which use the same 'share'). It causes discrepancy between 'share' and handler data. The fix: Move share->partition_info update into WFRM_INSTALL_SHADOW part which is protected by OPEN_lock. sql/sql_partition.cc: fast_end_partition: added close_thread_tables() for the case when error occures fast_alter_partition_table: added close_thread_tables() for the case when error occures sql/sql_table.cc: The crash happens because we change share->partition_info where 'share' is global struct. It causes discrepancy between 'share' and handler data. The fix: Move share->partition_info update into WFRM_INSTALL_SHADOW part which is protected by OPEN_lock.
-
ssh://bk-internal.mysql.com//home/bk/mysql-5.1-optunknown authored
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
-
unknown authored
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt mysql-test/lib/mtr_report.pl: Auto merged
-
unknown authored
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt mysql-test/r/gis.result: Auto merged mysql-test/r/type_bit.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/t/gis.test: Auto merged mysql-test/t/type_bit.test: Auto merged mysql-test/t/type_blob.test: Auto merged sql/item.h: Auto merged sql/item_subselect.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_string.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/r/subselect.result: null merge. resolve latete. mysql-test/t/subselect.test: merge 5.0-opt -> 5.1-opt sql/key.cc: merge 5.0-opt -> 5.1-opt sql/sql_class.h: merge 5.0-opt -> 5.1-opt sql/sql_insert.cc: merge 5.0-opt -> 5.1-opt sql/sql_table.cc: merge 5.0-opt -> 5.1-opt
-
unknown authored
change the size of core files. Suppress the 'setrlimit could not change the size of the core files' warning in mysql-test-run. We do not want core files on some of the PushBuild hosts, and PushBuild itself does not set --core-files, so that warning is expected. mysql-test/lib/mtr_report.pl: Suppress the 'setrlimit could not change the size of the core files' warning in mysql-test-run. We do not want core files on some of the PushBuild machines, and PushBuild itself does not set --core-files, so that warning is expected.
-
- 22 Nov, 2007 13 commits
-
-
unknown authored
Fix for the bug#31048 for 64bit platforms. subselect.test, subselect.result: Corrected text case for the bug#31048. mysql-test/t/subselect.test: Corrected text case for the bug#31048. mysql-test/r/subselect.result: Corrected text case for the bug#31048. sql/opt_range.cc: Fix for the bug#31048 for 64bit platforms.
-
unknown authored
into gleb.loc:/work/bk/5.0-opt
-
unknown authored
Problem: The "Slave I/O thread couldn't register on master" error sporadically occurred in replication tests because the slave I/O thread got killed by STOP SLAVE before or while registering on master. Fixed by checking the state of the I/O thread, and issueing the error only if it was not explicitely killed by a user. sql/slave.cc: When the slave I/O thread fails to register on master, issue an error message only if it is not explicitely killed by a user with STOP SLAVE.
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/autopush/B31171-5.1-opt
-
unknown authored
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
-
unknown authored
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
-
unknown authored
into polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445 scripts/make_win_bin_dist: Manual merge.
-
unknown authored
We do not have any executables in libmysql/release/ anymore.
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/autopush/B31171-5.1-opt
-
unknown authored
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt tests/mysql_client_test.c: Auto merged
-
unknown authored
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt tests/mysql_client_test.c: Auto merged
-
unknown authored
into polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445 BitKeeper/deleted/.del-myTest.dsp~4a8c480769193952: Auto merged BitKeeper/deleted/.del-mytest.c~9a99338689e5de8: Auto merged BitKeeper/deleted/.del-mytest.dsw~2324698861155335: Auto merged libmysql/Makefile.am: Auto merged tests/bug25714.c: Auto merged tests/mysql_client_test.c: Auto merged BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9: Auto merged BitKeeper/deleted/.del-mytest_1.c: Merge rename: BitKeeper/deleted/.del-mytest.c -> BitKeeper/deleted/.del-mytest_1.c BitKeeper/deleted/.del-myTest-package.dsp~ec9faf3287cbe2b9: Auto merged BitKeeper/deleted/.del-myTest-package_ia64.dsp~e423b69f2c624850: Auto merged BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06: Auto merged BitKeeper/deleted/.del-myTest_ia64.dsp~b17572b217d092e6: Auto merged libmysql/CMakeLists.txt: Manual merge.
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/autopush/B31171-5.1-opt
-
- 21 Nov, 2007 6 commits
-
-
unknown authored
is_last_prefix <= 0, file .\opt_range.cc. SELECT ... GROUP BY bit field failed with an assertion if the bit length of that field was not divisible by 8. sql/key.cc: Fixed bug #32556. Copying of "uneven" bits of a bit field was duplicated in the key_copy() and in the Field_bit::get_key_image(). So, instead of copying of the rest of a bit field, Field_bit::get_key_image() copied "uneven" bits to key image again, and the lowest field byte was not copied to key at all. Duplicated code has been removed from the key_copy function. mysql-test/t/type_bit.test: Added test case for bug #32556. mysql-test/r/type_bit.result: Added test case for bug #32556.
-
unknown authored
"Table is already up to date" vs. "OK" On MacOSX 10.5 when you cast something to "bool" (the built in C type) it takes values 0 or 1 instead of 0-255 as it seems to be on older compilers. Fixed by removing the typecast (not needed). No test case needed : there are tests that test it. storage/myisam/mi_open.c: Bug #31171: don't typecast when not needed
-
unknown authored
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/B30788-5.1-opt mysql-test/r/subselect3.result: Auto merged sql/item.h: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/subselect.result: merge of bug 30788 to 5.1-opt mysql-test/t/subselect.test: merge of bug 30788 to 5.1-opt
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/autopush/B30788-5.0-opt sql/item.h: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/subselect.result: merge of 5.0-opt mysql-test/t/subselect.test: merge of 5.0-opt
-
unknown authored
Index lookup does not always guarantee that we can simply remove the relevant conditions from the WHERE clause. Reasons can be e.g. conversion errors, partial indexes etc. The optimizer was removing these parts of the WHERE condition without any further checking. This leads to "false positives" when using indexes. Fixed by checking the index reference conditions (using WHERE) when using indexes with sub-queries. mysql-test/r/subselect.result: Bug #30788: - using where - test case mysql-test/r/subselect3.result: Bug #30788: using where mysql-test/t/subselect.test: Bug #30788: test case sql/item.h: Bug #30788: - Declare eq() method of Item_cache descendants : this is used in test_if_ref() - preserve the field that is being cached for type comparisions sql/sql_select.cc: Bug #30788: Don't remove the WHERE when using index lookup with subqueries.
-