summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug#37627: addendum :Georgi Kodinov2008-07-074-28/+30
| | | | | | | | | | | | | - moved the test into a separate file to check for presence of the test variable mysql-test/r/subselect.result: Bug#37627: moved the test to a separate file mysql-test/r/subselect_debug.result: Bug#37627: moved the test to a separate file mysql-test/t/subselect.test: Bug#37627: moved the test to a separate file mysql-test/t/subselect_debug.test: Bug#37627: moved the test to a separate file
* Merge from 5.0. Add new 5.1 files. Drop bdb.Chad MILLER2008-07-0435-37/+37
|\
| * Merge bug.Chad MILLER2008-07-0430-31/+31
| |\
| | * Bug#30563: Is not possible to create rpl_ or innodb test if needed \Chad MILLER2008-07-0430-31/+31
| | | | | | | | | | | | | | | | | | | | | to use ANSI_QUOTES Make all have_* tests universally safe by using ANSI quotes.
* | | atutomatic merge of 5.1-bugteam into bug37627Georgi Kodinov2008-07-049-63/+111
|\ \ \
| * | | A fix for Konstantin Osipov2008-07-039-63/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#12093 "SP not found on second PS execution if another thread drops other SP in between" and Bug#21294 "executing a prepared statement that executes a stored function which was recreat" Stored functions are resolved at prepared statement prepare only. If someone flushes the stored functions cache between prepare and execute, execution fails. The fix is to detect the situation of the cache flush and automatically reprepare the prepared statement after it. mysql-test/r/ps_ddl.result: Update results (Bug#12093 and Bug#21294, the test cases are already in the source tree). mysql-test/r/ps_ddl1.result: Update results (Bug#12093 and Bug#21294, the test cases are already in the source tree). mysql-test/r/sp-error.result: Update results (Bug#12093 and Bug#21294, the test cases are already in the source tree). mysql-test/t/ps_ddl.test: Modify the test to not expect an error where there is no error any more (Bug#12093, Bug#21294). mysql-test/t/ps_ddl1.test: Modify the test to not expect an error where there is no error any more (Bug#12093, Bug#21294). mysql-test/t/sp-error.test: Modify the test to not expect an error where there is no error any more (Bug#12093, Bug#21294). sql/sp_cache.cc: Implement sp_cache_version() -- returns the current version of a stored routines cache. sql/sp_cache.h: Declare sp_cache_version(). sql/sql_prepare.cc: Keep track of stored functions cache version, and invalidate the statement if it changed between prepared statement prepare and execute (and the statement actually uses stored routines).
* | | | Bug#37627: Killing query with sum(exists()) or avg(exists()) reproducibly ↵Georgi Kodinov2008-07-043-6/+61
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crashes server When there is an error executing EXISTS predicates they return NULL as their string or decimal value but don't set the NULL value flag. Fixed by returning 0 (as a decimal or a string) on error exectuting the subquery. Note that we can't return NULL as EXISTS is not supposed to return NULL. mysql-test/r/subselect.result: Bug#37627: test case mysql-test/t/subselect.test: Bug#37627: test case sql/item_subselect.cc: Bug#37627: return decimal (or string) 0 isntead of a NULL pointer on error calculating an EXISTS predicate.
* | | mergeSven Sandberg2008-07-031-1/+3
|\ \ \
| * \ \ Up-merge syntax fix from 5.0-bugteam.Timothy Smith2008-07-021-1/+3
| |\ \ \ | | |/ /
| | * | Fix "C++ code in C file" syntax error in mysys/default.cTimothy Smith2008-07-021-1/+3
| | | |
* | | | BUG#37200: rpl_switch_stm_row_mixed fails sporadically in pushbuildSven Sandberg2008-07-031-5/+4
|/ / / | | | | | | | | | | | | | | | | | | This bug has been fixed in two slightly different ways in 6.0-rpl and {5.1,6.0}-bugteam. To avoid future merge problems, I'm now copying the 6.0-rpl fix to 5.1-bugteam.
* | | BUG#37200: rpl_switch_stm_row_mixed fails sporadically in pushbuildSven Sandberg2008-07-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | The previous fix for the bug was incomplete. The test failed because t2 did not exist on the slave (since the slave was lagging) when the wait_condition was executed. Fixed by inserting sync_slave_with_master just after t2 was created.
* | | upmerge into 5.1Patrick Crews2008-07-011-5/+0
|\ \ \ | |/ /
| * | Bug#37380 - Test funcs_1.is_columns_myisam_embedded fails on OS XPatrick Crews2008-07-011-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Test was failing due to the addition of a '\x05' character in result sets Latest builds of the server have shown this problem to have disappeared. Removing code within the test that disables the test on Mac OS X. Recommit due to tree error on earlier, approved patch.
* | | BUG#37200: rpl_switch_stm_row_mixed fails sporadically in pushbuildSven Sandberg2008-06-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: rpl_switch_stm_row_mixed did not wait until row events generated by INSERT DELAYED were written to the master binlog before it synchronized slave with master. This caused sporadic errors where these rows were missing on slave. Fix: wait until all rows appear on the slave. This is a backport, applying the same to 5.1-bugteam as was previously applied to 6.0-rpl
* | | Up-merge from 5.0: Merge from upstream (my:5.0-bugteam)Timothy Smith2008-06-270-0/+0
|\ \ \ | |/ /
| * | Merge from upstream (my:5.0-bugteam)Timothy Smith2008-06-27112-5745/+8914
| |\ \
* | \ \ Up-merge from 5.0: Fix for Bug#20748, Configuration files should not be read ↵Timothy Smith2008-06-271-136/+130
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | more than once Differences in 5.1: include "/etc/mysql/" in include directories; no OS/2 support.
| * | | Bug #20748: Configuration files should not be read more than onceTimothy Smith2008-06-241-155/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normalize directory names before adding them to default_directories. mysys/default.c: Normalize directory names with unpack_dirname() before adding them to default_directories. This way, /etc/ and /etc will not count as duplicates. Because this entails allocating memory to store the normalized names, add error handling and ensure that it doesn't leak memory in case both my_print_defaults() and load_defaults() are called. Clean up the Windows code that finds the exe's parent directory, and pull it out into a separate function. Reorganize the code into a single init_default_directories() function, with internal #ifdefs, instead of init_default_directories_<system>() functions which were accessed via a function pointer. This is more in line with normal MySQL coding style, and easier to read for some.
* | | | auto merge from local treeGleb Shchepa2008-06-273-0/+50
|\ \ \ \
| * | | | Fixed bug #36632: SELECT DISTINCT from a simple view on anGleb Shchepa2008-06-273-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InnoDB table, where all selected columns belong to the same unique index key, returns incorrect results Server executes some queries via QUICK_GROUP_MIN_MAX_SELECT (MIN/MAX optimization for queries with GROUP BY or DISTINCT clause) and that optimization implies loose index scan, so all grouping is done by the QUICK_GROUP_MIN_MAX_SELECT::get_next method. The server does not set the precomputed_group_by flag for some QUICK_GROUP_MIN_MAX_SELECT queries and duplicates grouping by call to the end_send_group function. Fix: when the test_if_skip_sort_order function selects loose index scan as a best way to satisfy an ORDER BY/GROUP BY type of query, the precomputed_group_by flag has been set to use end_send/end_write functions instead of end_send_group/ end_write_group functions. mysql-test/r/group_min_max_innodb.result: Fixed bug #36632: SELECT DISTINCT from a simple view on an InnoDB table, where all selected columns belong to the same unique index key, returns incorrect results mysql-test/t/group_min_max_innodb.test: Fixed bug #36632: SELECT DISTINCT from a simple view on an InnoDB table, where all selected columns belong to the same unique index key, returns incorrect results sql/sql_select.cc: Fixed bug #36632: SELECT DISTINCT from a simple view on an InnoDB table, where all selected columns belong to the same unique index key, returns incorrect results
* | | | | merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2008-06-270-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | backport from 6.0Gleb Shchepa2008-06-273-11/+77
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#35658 (An empty binary value leads to mysqld crash) Before this fix, the following token b'' caused the parser to crash when reading the binary value from the empty string. The crash was caused by: ptr+= max_length - 1; because max_length is unsigned and was 0, causing an overflow. With this fix, an empty binary literal b'' is parsed as a binary value 0, in Item_bin_string. mysql-test/r/varbinary.result: Bug#35658 (An empty binary value leads to mysqld crash) mysql-test/t/varbinary.test: Bug#35658 (An empty binary value leads to mysqld crash) sql/item.cc: Bug#35658 (An empty binary value leads to mysqld crash)
* | | | backport to 5.1 from 6.0Gleb Shchepa2008-06-273-11/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#35658 (An empty binary value leads to mysqld crash) Before this fix, the following token b'' caused the parser to crash when reading the binary value from the empty string. The crash was caused by: ptr+= max_length - 1; because max_length is unsigned and was 0, causing an overflow. With this fix, an empty binary literal b'' is parsed as a binary value 0, in Item_bin_string. mysql-test/r/varbinary.result: Bug#35658 (An empty binary value leads to mysqld crash) mysql-test/t/varbinary.test: Bug#35658 (An empty binary value leads to mysqld crash) sql/item.cc: Bug#35658 (An empty binary value leads to mysqld crash)
* | | | Upmerge 5.0 -> 5.1Matthias Leich2008-06-252-109/+181
|\ \ \ \ | |/ / /
| * | | Fix forMatthias Leich2008-06-252-108/+180
| | | | | | | | | | | | | | | | | | | | | | | | Bug#37492 timing bug in subselect.test + similar weaknesses found during testing + replace error numbers by error names
* | | | auto merge 5.1-main --> 5.1-bugteamGleb Shchepa2008-06-2514-243/+342
|\ \ \ \
| * \ \ \ auto mergeTatiana A. Nurnberg2008-06-216-26/+78
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: auto-merge mysql-test/suite/bugs/r/rpl_bug33029.result: auto-merge mysql-test/suite/bugs/t/rpl_bug33029.test: auto-merge sql/slave.cc: auto-merge sql/sql_class.cc: auto-merge sql/structs.h: auto-merge
| | * | | | Correct the version number, after cloning 5.1.26 the next one is 27Joerg Bruehe2008-06-201-1/+1
| | | | | |
| | * | | | Raise version number after cloning 5.1.26Joerg Bruehe2008-06-201-1/+1
| | | | | |
| | * | | | merging prior to push Bug #36443clone-5.1.26-buildAndrei Elkin2008-06-209-218/+265
| | |\ \ \ \
| | * | | | | Bug#36443 Server crashes when executing insert when insert trigger on tableAndrei Elkin2008-06-195-25/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash appeared to be a result of allocating an instance of Discrete_interval automatically that that was referred in out-of-declaration scope. Fixed with correcting backing up and restoring scheme of auto_inc_intervals_forced, introduced by bug#33029, by means of shallow copying; added simulation code that forces executing those fixes of the former bug that targeted at master-and-slave having incompatible bug#33029-prone versions. mysql-test/suite/bugs/r/rpl_bug33029.result: new results file mysql-test/suite/bugs/t/rpl_bug33029.test: test merely checks no crash happens on slave. sql/slave.cc: forcing to execute special logics implemented for bug#33029 if simulate_bug33029 the debug option is set. sql/sql_class.cc: swaps of backed and the actual auto_inc_intervals_forced basing on shallow coping. sql/structs.h: Removing the deep _copy() and methods associated with it; adding methods to Discrete_intervals_list: private `=', copy constructor to prevent using; private set_members(); public copy_shallow(), swap(), get_{head, tail, current}(); empty_no_free() through set_members().
| * | | | | | Bug#33812: mysql client incorrectly parsing DELIMITERTatiana A. Nurnberg2008-06-203-31/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary and incorrect code that tried to pull delimiter commands out of the middle of statements. client/mysql.cc: Remove unnecessary and incorrect code that tried to pull delimiter commands out of the middle of statements. mysql-test/r/mysql.result: show we no longer parse DELIMITER when we shouldn't. mysql-test/t/mysql_delimiter.sql: show we no longer parse DELIMITER when we shouldn't.
| * | | | | re 36818: rpl_server_id1 fails expecting slave has stoppedTatiana A. Nurnberg2008-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a slow environment like valgrind the test is vulnerable because it does not check if slave has stopped at time of the new session is requested `start slave;' -- disabling test till it is fixed. mysql-test/suite/rpl/t/disabled.def: disable rpl_server_id1 until test is fixed.
| * | | | | Bug#36434: ha_innodb.so is installed in the wrong directoryTatiana A. Nurnberg2008-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ha_innodb.so was incorrectly installed in the lib/mysql directory rather than in lib/mysql/plugin. Amending CS for 31736. storage/innobase/Makefile.am: Install innobase to plugin-dir, not lib-dir.
| * | | | | Bug#35480: BOM detection code crashes mysql CLI with zero-sized inputTatiana A. Nurnberg2008-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL client crashed if no input was passed to it. client/mysql.cc: Check if there's any data before reading it!
| * | | | | Fixed bug #37004.Tatiana A. Nurnberg2008-06-193-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value of JOIN::tables must be set to 0 when there is no matching min/max row. mysql-test/r/subselect.result: Added a test case for bug #37004. mysql-test/t/subselect.test: Added a test case for bug #37004.
| * | | | | Merge changes from mysql 5.1.25 release clone (BK), applied manually into bzr.Timothy Smith2008-06-173-216/+241
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix typomysql-5.1.25Timothy Smith2008-06-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was committed to the 5.1.25 release clone, but never made it to the mysql-5.1 BK tree. I'm committing it to mysql-5.1 bzr now.
| | * | | | Bug #37024: Wrong location of messagefilesTimothy Smith2008-06-171-214/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make_binary_distribution.sh got clobbered by the 5.0 version during a merge. This caused a few packaging problems, including message files put in the wrong place and some missing files. Fix is just to revert back to the 5.1 version from before the merge. Problem introduced in ChangeSet 1.2606.2.1 2008/05/13 15:56:07 kent@kent-amd64.(none) This change was made in the 5.1.25 release clone in BK, but never made it to the main mysql-5.1 BK tree. I am adding it to mysql-5.1 bzr.
* | | | | | auto merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2008-06-243-33/+24
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | back-port from 5.1.Gleb Shchepa2008-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#35480: BOM detection code crashes mysql CLI with zero-sized input MySQL client crashed if no input was passed to it.
| * | | | | back-port from 5.1.Gleb Shchepa2008-06-243-31/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#33812: mysql client incorrectly parsing DELIMITER Remove unnecessary and incorrect code that tried to pull delimiter commands out of the middle of statements.
| * | | | | Bug #36244: MySQL CLI doesn't recognize standalone -- Gleb Shchepa2008-06-242-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a commentary mysql client has been modified to interpret EOL after standalone -- commentary strings like whitespace character (according to http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html) mysql-test/t/mysql_delimiter.sql: Added test case for bug #36244.
* | | | | | Automatic mergeMatthias Leich mleich@mysql.com2008-06-20184-5657/+9737
|\ \ \ \ \ \
| * \ \ \ \ \ 1. Upmerge of fix for the bugsMatthias Leich mleich@mysql.com2008-06-18184-5657/+9737
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37167 funcs_1: Many tests fail if the embedded server is used. 37164 funcs_1: Some tests fail if an optional character set is missing. + some cleanup within the testsuite related to the fixes above + some adjustments to open bugs on Mac OS X 2. Skip tests which suffer from bug 37456 funcs_1: Several tests crash when used with embedded server 3. Minor cleanup in some tests
| | * | | | | Fix forMatthias Leich mleich@mysql.com2008-06-18104-5593/+8633
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#37167 funcs_1: Many tests fail if the embedded server is used. Bug#37164 funcs_1: Some tests fail if an optional character set is missing. + some cleanup within the testsuite related to the fixes above + some adjustments to open bugs on Mac OS X
| | | * | | | Fix forMatthias Leich mleich@mysql.com2008-06-16104-5593/+8633
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#37167 funcs_1: Many tests fail if the embedded server is used. Bug#37164 funcs_1: Some tests fail if an optional character set is missing. + some cleanup within the testsuite related to the fixes above + some adjustments to open bugs on Mac OS X Details: - Remove the initial loading of data from tests if these data are not somewhere retrieved - Remove any use of columns with attribute unicode (-> UCS2 is no more needed) from tests where unicode properties are not checked or somehow required - Create a separate branch of the Character maximum length test (CML). If UCS2 is available than this test gets applied to every available type of string column with attribute unicode This prevents any loss of coverage by the points above. - Disable the execution of is_tables_ndb which gives wrong results because of a bug. Correct the exepected results of this test. - In case of tests failing when applied to the embedded server 1) Create a variant of this test for the embedded server or 2) Skip the test in case of embedded server depending on purpose and complexity of test. - Skip the tests which could suffer from Bug 28309 First insert violates unique constraint - was "memory" table empty ? Bug 37380 Test funcs_1.is_columns_myisam_embedded fails on OS X (both bugs Mac OS X, embedded server, MySQL 5.0 only) - Minor improvements like remove typos
* | | | | | | Silence unused variable warning by printing the variables value.Davi Arnaut2008-06-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/stacktrace.c: Print stack bottom and thread stack values as they might be useful.
* | | | | | | auto mergeGleb Shchepa2008-06-195-60/+96
|\ \ \ \ \ \ \