summaryrefslogtreecommitdiff
path: root/mysql-test/t
Commit message (Collapse)AuthorAgeFilesLines
* merged bug 39920 and 5.1-main to 5.1-bugteamGeorgi Kodinov2008-12-011-0/+12
|\
| * merged bug 39920 to 5.0-bugteamGeorgi Kodinov2008-12-011-0/+12
| |\
| | * Bug #39920: MySQL cannot deal with Leap Second expression in string literal.Georgi Kodinov2008-12-011-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated MySQL time handling code to react correctly on UTC leap second additions. MySQL functions that return the OS current time, like e.g. CURDATE(), NOW() etc will return :59:59 instead of :59:60 or 59:61. As a result the reader will receive :59:59 for 2 or 3 consecutive seconds during the leap second. This fix will not affect the values returned by UNIX_TIMESTAMP() for leap seconds. But note that when converting the value returned by UNIX_TIMESTAMP() to broken down time the correction of leap seconds will still be applied. Note that this fix will make a difference *only* if the OS is specially configured to return leap seconds from the OS time calls or when using a MySQL time zone defintion that has leap seconds. Even after this change date/time literals (or other broken down time representations) with leap seconds (ending on :59:60 or 59:61) will still be considered illegal and discarded by the server with an error or a warning depending on the sql mode. Added a test case to demonstrate the effect of the fix. mysql-test/r/timezone3.result: Bug #39920: test case mysql-test/std_data/Moscow_leap: Bug #39920: updated the Moscow time zone to Dr. Olson's tzdata 2008i to accomodate for the 2008 leap second mysql-test/t/timezone3.test: Bug #39920: test case sql/tztime.cc: Bug #39920: adjust leap seconds (:60 or :61) to :59 sql/tztime.h: Bug #39920: adjust leap seconds (:60 or :61) to :59
* | | merge of the addenum for bug 37339 to 5.1-bugteamGeorgi Kodinov2008-12-012-1/+2
|\ \ \ | |/ /
| * | Addendum to bug #37339 : make the test case portable to windowsGeorgi Kodinov2008-12-012-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by using and taking out a full path. mysql-test/r/ctype_filesystem.result: Bug #37399: use MYSQL_TEST_DIR rooted test mysql-test/t/ctype_filesystem-master.opt: Bug #37399: use MYSQL_TEST_DIR rooted test mysql-test/t/ctype_filesystem.test: Bug #37399: use MYSQL_TEST_DIR rooted test
| * | Merge of last pushes into GCA tree, no conflictsMatthias Leich2008-11-287-4/+114
| |\ \ | | | | | | | | | | | | Diff to actual 5.0-bugteam is revno: 2725 only
* | \ \ auto-mergeIngo Struewing2008-11-284-4/+58
|\ \ \ \
| * \ \ \ manual merge 5.0-bugteam --> 5.1-bugteam (bug 33461)Gleb Shchepa2008-11-281-4/+30
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug #33461: SELECT ... FROM <view> USE INDEX (...) throwsGleb Shchepa2008-11-281-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an error Even after the fix for bug 28701 visible behaviors of SELECT FROM a view and SELECT FROM a regular table are little bit different: 1. "SELECT FROM regular table USE/FORCE/IGNORE(non existent index)" fails with a "ERROR 1176 (HY000): Key '...' doesn't exist in table '...'" 2. "SELECT FROM view USING/FORCE/IGNORE(any index)" fails with a "ERROR 1221 (HY000): Incorrect usage of USE/IGNORE INDEX and VIEW". OTOH "SHOW INDEX FROM view" always returns empty result set, so from the point of same behaviour view we trying to use/ignore non existent index. To harmonize the behaviour of USE/FORCE/IGNORE(index) clauses in SELECT from a view and from a regular table the "ERROR 1221 (HY000): Incorrect usage of USE/IGNORE INDEX and VIEW" message has been replaced with the "ERROR 1176 (HY000): Key '...' doesn't exist in table '...'" message like for tables and non existent keys. mysql-test/r/view.result: Added test case for bug #33461. Updated test case for bug 28701. mysql-test/t/view.test: Added test case for bug #33461. Updated test case for bug 28701. sql/sql_view.cc: Bug #33461: SELECT ... FROM <view> USE INDEX (...) throws an error To harmonize the behaviour of USE/FORCE/IGNORE(index) clauses in SELECT from a view and from a regular table the "ERROR 1221 (HY000): Incorrect usage of USE/IGNORE INDEX and VIEW" message has been replaced with the "ERROR 1176 (HY000): Key '...' doesn't exist in table '...'" message like for tables and non existent keys.
| * | | | Bug #40745: Error during WHERE clause calculation in UPDATEGleb Shchepa2008-11-281-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leads to an assertion failure Any run-time error in stored function (like recursive function call or update of table that is already updating by statement which invoked this stored function etc.) that was used in some expression of the single-table UPDATE statement caused an assertion failure. Multiple-table UPDATE (as well as INSERT and both single- and multiple-table DELETE) are not affected. mysql-test/r/update.result: Added test case for bug #40745. mysql-test/t/update.test: Added test case for bug #40745. sql/sql_update.cc: Bug #40745: Error during WHERE clause calculation in UPDATE leads to an assertion failure The mysql_update function has been updated to take into account the status of invoked stored functions before setting the status of whole UPDATE query to OK.
| * | | | merged bug 37339 to 5.1-bugteamGeorgi Kodinov2008-11-282-0/+7
| |\ \ \ \ | | |/ / /
| | * | | merged bug 37339 to 5.0-bugteamGeorgi Kodinov2008-11-282-0/+7
| | |\ \ \
| | | * | | Bug #37339: SHOW VARIABLES not working properly with multi-byte datadirGeorgi Kodinov2008-11-282-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SHOW VARIABLES LIKE .../SELECT @@/SELECT ... FROM INFORMATION_SCHEMA.VARIABLES were assuming that all the system variables are in system charset (UTF-8). However the variables that are settable through command line will have a different character set (character_set_filesystem). Fixed the server to remember the correct character set of basedir, datadir, tmpdir, ssl, plugin_dir, slave_load_tmpdir, innodb variables; init_connect and init_slave variables and use it when processing data. mysql-test/r/ctype_filesystem.result: Bug #37339: test case (should be in utf-8) mysql-test/t/ctype_filesystem-master.opt: Bug #37339: test case (should be in ISO-8859-1) mysql-test/t/ctype_filesystem.test: Bug #37339: test case sql/mysqld.cc: Bug #37339: remember the correct character set for init_slave and init_connect sql/set_var.cc: Bug #37339: - remember the character set of the relevant variables - implement storing and using the correct character set sql/set_var.h: Bug #37339: implement storing and using the correct character set sql/sql_show.cc: Bug #37339: implement storing and using the correct character set
* | | | | | mergeIngo Struewing2008-11-281-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | .bzrignore: Added autom4te.cache and language directories in sql/share to ignorefile.
| * | | | | automergeSergey Glukhov2008-11-281-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | error code is changed to satisfy Win NTSergey Glukhov2008-11-281-1/+1
| | | | | |
* | | | | | mergeIngo Struewing2008-11-281-3/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-11-281-3/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | sql/slave.cc: compiler warning fix
| | * | | | pushbuild failure fixes Sergey Glukhov2008-11-281-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/perror-win.result: pushbuild failure fix mysql-test/t/perror-win.test: pushbuild failure fix sql/item_func.cc: pushbuild failure fix
| | * | | | auto-mergeTatiana A. Nurnberg2008-11-272-0/+46
| | |\ \ \ \
| | * \ \ \ \ auto-mergeTatiana A. Nurnberg2008-11-271-0/+11
| | |\ \ \ \ \
* | | \ \ \ \ \ mergeIngo Struewing2008-11-271-0/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | auto-mergeTatiana A. Nurnberg2008-11-273-31/+90
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ auto-mergeTatiana A. Nurnberg2008-11-271-0/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ auto-mergeTatiana A. Nurnberg2008-11-2713-173/+652
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ auto-mergeTatiana A. Nurnberg2008-11-271-0/+17
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Bug#37553: MySql Error Compare TimeDiff & TimeTatiana A. Nurnberg2008-11-261-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We pretended that TIMEDIFF() would always return positive results; this gave strange results in comparisons of the TIMEDIFF(low,hi)<TIME(0) type that rendered a negative result, but still gave false in comparison. We also inadvertantly dropped the sign when converting times to decimal. CAST(time AS DECIMAL) handles signs of the times correctly. TIMEDIFF() marked up as signed. Time/date comparison code switched to signed for clarity. mysql-test/r/func_sapdb.result: show that time-related comparisons work with negative time values now. show that converting time to DECIMAL no longer drops sign. mysql-test/t/func_sapdb.test: show that time-related comparisons work with negative time values now. show that converting time to DECIMAL no longer drops sign. sql/item_cmpfunc.cc: signed returns sql/item_cmpfunc.h: signed now (time/date < > =) sql/item_func.cc: signed now sql/item_timefunc.h: Functions such as TIMEDIFF() return signed results! The file-comments pretended we were doing that all along, anyway... sql/my_decimal.cc: heed sign when converting time to my_decimal; times may actually be negative! Needed for SELECT CAST(time('-73:42:12') AS DECIMAL); sql/mysql_priv.h: using signed for dates and times now
* | | | | | | | | | | (no commit message)Ingo Struewing2008-11-271-31/+44
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | due to merge.Horst Hunger2008-11-273-0/+57
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix for Bug#37766: Inserted review results.Horst Hunger2008-11-271-31/+44
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason for the failing test was that "SELECT count(*) from mysql.general_log;" was not always the same number. That was fixed by "...count(*)>4..." as the minimal fulfilled condition. As Bug 35371 was fixed the testcase with "log_output = 'FILE'" was enabled and changed to have always the same result.
* | | | | | | | | | | mergeIngo Struewing2008-11-273-0/+57
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-11-271-0/+10
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Bug#37284 Crash in Field_string::type()Sergey Glukhov2008-11-271-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug is repeatable with latest(1.0.1) InnoDB plugin on Linux, Win, If MySQL is compiled with valgrind there are errors about using of uninitialized variable(orig_table). The fix is to set field->orig_table correct value. mysql-test/r/innodb_mysql.result: test result mysql-test/t/innodb_mysql.test: test case sql/sql_base.cc: set field->orig_table to 'table' value because it may be bogus and it leads to crash on Field_string::type() function.
| * | | | | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-11-271-0/+36
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | / / / / / | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Bug#37460 Assertion failed: !table->file || table->file->inited == handler::NONESergey Glukhov2008-11-271-0/+35
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable uncacheable flag if we update a view with check option and check option has a subselect, otherwise, the check option can be evaluated after the subselect was freed as independent (See full_local in JOIN::join_free()) mysql-test/r/subselect.result: test result mysql-test/t/subselect.test: test case sql/mysql_priv.h: added UNCACHEABLE_CHECKOPTION flag sql/sql_update.cc: enable uncacheable flag if we update a view with check option and check option has a subselect, otherwise, the check option can be evaluated after the subselect was freed as independent (See full_local in JOIN::join_free())
| * | | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-11-271-0/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | |
| | * | | | | | Bug#34825 perror on windows doesn't know about win32 error codesSergey Glukhov2008-11-271-0/+11
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extended perror to enable printing of Win32 system errors extra/perror.c: extended perror to enable printing of Win32 system errors mysql-test/r/perror-win.result: test result mysql-test/t/perror-win.test: test case
* | | | | | | Bug#28234 - global/session scope - documentation vs implementationIngo Struewing2008-11-271-12/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post-pushbuild fix. - Windows does not have 'socket' system variable. - Compiler warning in sql/slave.cc mysql-test/r/variables.result: Bug#28234 - global/session scope - documentation vs implementation Updated test result. mysql-test/t/variables.test: Bug#28234 - global/session scope - documentation vs implementation Removed test for 'socket' variable. Windows doesn't have it. sql/slave.cc: Bug#28234 - global/session scope - documentation vs implementation Changed type of constant to avoid a compiler warning.
* | | | | | mergePatrick Crews2008-11-267-123/+208
|\ \ \ \ \ \
| * \ \ \ \ \ mergeIngo Struewing2008-11-266-119/+181
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge latest Pushes into the GCA treeMatthias Leich2008-11-265-49/+444
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | (no conflicts)
| | * \ \ \ \ \ \ Merge fix for bug 39854 into GCA treeMatthias Leich2008-11-251-11/+22
| | |\ \ \ \ \ \ \
| | | * | | | | | | - Fix for Bug#39854 events_scheduling fails sporadically on pushbuildMatthias Leich2008-11-211-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - restore original state of event_scheduler at the end of the test - minor fixes around comments, formatting
| | * | | | | | | | Merge of fix for bug 40644 into GCA treeMatthias Leich2008-11-251-37/+46
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Fix for Bug#40644 main.group_concat_max_len_func random failuresMatthias Leich2008-11-141-37/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + minor improvements
| | * | | | | | | | Merge of fix for bug 39979 into GCA treeMatthias Leich2008-11-251-25/+58
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Fix for Bug#39979 main.events_time_zone does not clean upMatthias Leich2008-11-141-25/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + minor improvements.
| | * | | | | | | | Merge 5.0 -> 51. of fix for bug 26890Matthias Leich2008-11-253-46/+55
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | / / | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Merge of fix for Bug 26890 into GCA treeMatthias Leich2008-11-253-46/+55
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | | * | | | | Fix for Bug#26890 main.multi_update times outMatthias Leich2008-11-193-46/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test itself is not faulty. The testcase timeout problem happens if this IMHO mid size resource (space in vardir, virtual memory, amount of disk I/O) consuming test meets a weak (excessive disk I/O caused by parallel applications or paging) testing box. The modifications: - Move the most time and disk I/O consuming subtest for Bug 1820 into its own script (multi_update2) This will reduce the likelihood that we exceed the testcase timeout. - Replace error numbers with error names - Minor improvements of the formatting -