summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* Fixed BUG#16303: erroneus stored procedures and functions should be droppableunknown2006-01-262-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a special lookup function for DROP, which doesn't attempt to parse the definition. mysql-test/r/sp-destruct.result: Updated test result for BUG#16303. mysql-test/t/sp-destruct.test: Added test case for BUG#16303. sql/sp.cc: New function sp_routine_exists_in_table() for DROP PROCEDURE/FUNCTION; which doesn't want to parse the definition, only know if it exists. Renamed sp_exists_routine to sp_exist_routines and added comment, and changed the misnamed parameter/variable 'tables'/'table' to 'routines'/'routine'. sql/sp.h: New function sp_routine_exists_in_table() for DROP PROCEDURE/FUNCTION. Renamed sp_exists_routine to sp_exist_routines, and changed the misnamed parameter 'tables' to 'routines'. sql/sql_acl.cc: Call to sp_exists_routine() renamed to sp_exist_routines(). sql/sql_parse.cc: Use the new sp_routine_exists_in_table() instead of sp_find_routine(), since we don't want the routine definition parsed when doing DROP PROCEDURE/FUNCTION.
* Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0unknown2006-01-253-0/+45
|\ | | | | | | | | | | | | into mysql.com:/users/lthalmann/bk/mysql-5.0-bug16487
| * BUG#16487: New test for ignored table and multi-updateunknown2006-01-253-0/+45
| | | | | | | | | | | | | | | | | | mysql-test/r/rpl_ignore_table.result: New result file mysql-test/t/rpl_ignore_table-slave.opt: New option file mysql-test/t/rpl_ignore_table.test: New test for ignored table and multi-update
* | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-252-314/+486
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/M50/bug16730-5.0
| * | Fix for the following bugs:unknown2006-01-242-314/+486
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - BUG#15166: Wrong update permissions required to execute triggers - BUG#15196: Wrong select permission required to execute triggers The idea of the fix is to check necessary privileges in Item_trigger_field::fix_fields(), instead of having "special variables" technique. To achieve this, we should pass to an Item_trigger_field instance a flag, which will indicate the usage/access type of this trigger variable. mysql-test/r/trigger-grant.result: Update the result file. mysql-test/t/trigger-grant.test: Add test cases for BUG#15166 and BUG#15196 sql/item.cc: Item_trigger_field: check appropriate (SELECT/UPDATE) privilege in fix_fields(). sql/item.h: Add a flag to specify access type for trigger field. sql/sql_trigger.cc: "Special variable" technique of checking privileges for NEW/OLD variables was replaced by checking table- and column-level privileges in Item_trigger_field::fix_fields(). sql/sql_trigger.h: "Special variable" technique of checking privileges for NEW/OLD variables was replaced by checking table- and column-level privileges in Item_trigger_field::fix_fields(). sql/sql_yacc.yy: Specify access type for trigger fields.
* | | Merge mysql.com:/M41/bug16730-4.1 into mysql.com:/M50/bug16730-5.0unknown2006-01-241-0/+2
|\ \ \ | |/ / |/| | | | | | | | mysql-test/t/ctype_ucs.test: Auto merged
| * | Test "ctype_ucs": Disable warnings if "InnoDB" is not configured ("classic" ↵unknown2006-01-241-0/+2
| | | | | | | | | | | | | | | | | | | | | build) (bug#16730). mysql-test/t/ctype_ucs.test: Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).
* | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-242-0/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
| * | | Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on ↵unknown2006-01-242-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information_schema(2nd ver) Fill schema tables with data before filesort if it's necessary mysql-test/r/information_schema.result: Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver) test result mysql-test/t/information_schema.test: Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver) test case
| * | | Fix for bug#15851 Unlistable directories yield no info from information_schemaunknown2006-01-242-0/+15
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to skip directories which are not allowed for read mysql-test/r/information_schema.result: Fix for bug#15851 Unlistable directories yield no info from information_schema test result mysql-test/t/information_schema.test: Fix for bug#15851 Unlistable directories yield no info from information_schema test case
* | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-232-0/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
| * | Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1unknown2006-01-232-0/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0 myisam/ft_update.c: Auto merged mysql-test/r/fulltext2.result: Auto merged
| | * | BUG#16489 - utf8 + fulltext leads to corrupt index file.unknown2006-01-232-0/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed that UPDATE statement crashes multi-byte charset fulltext index. myisam/ft_update.c: Fixed that UPDATE statement crashes multi-byte charset fulltext index. While updating, always rewrite multi-byte charset fulltext index. mysql-test/r/fulltext2.result: Added a testcase for BUG#16489. mysql-test/t/fulltext2.test: Added a testcase for BUG#16489.
* | | BUG#15699, failure to apply ignore rule for unexisting table.unknown2006-01-233-0/+70
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since replication rules execute after `mysql_multi_update_prepare' returns we delay to `break' in case this functions returns non-zero (some tables are not found) for to examine if there is an ignore rule for a not-found table. By doing that it is guaranteed do/ignore replication rules logically preceed opening table routine. sql/sql_parse.cc: BUG#15699. We delay to `break' in case of unexisted tables for multi-update. First it is checked whether an ignore rule for such a table exists. More to the fix: if (opt_readonly && ...' in two places got be idented because it were enclosed explicitly into corresponding `else' groups. For that the preceding lines with `else' were changed in to be `else {'. This grouping is necessary to avoid any inattentive insertion in between of `else' and belonging to the else `if (opt_readonly && ...' statement. mysql-test/r/rpl_multi_update4.result: New BitKeeper file ``mysql-test/r/rpl_multi_update4.result'' mysql-test/t/rpl_multi_update4-slave.opt: New BitKeeper file ``mysql-test/t/rpl_multi_update4-slave.opt'' mysql-test/t/rpl_multi_update4.test: New BitKeeper file ``mysql-test/t/rpl_multi_update4.test''
* | Mergingunknown2006-01-212-7/+7
| | | | | | | | | | | | | | mysql-test/r/func_gconcat.result: merging mysql-test/r/type_float.result: merging
* | Mergingunknown2006-01-216-7/+48
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/ndb/ndbcluster.sh: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/t/func_math.test: Auto merged mysql-test/t/type_float.test: Auto merged sql/spatial.h: Auto merged mysql-test/r/type_float.result: merging sql/item_func.cc: merging
| * Merge hf@192.168.21.12:work/mysql-4.1.15429unknown2006-01-211-0/+2
| |\ | | | | | | | | | | | | | | | | | | into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
| | * bug #15429 (Test 'func_math' not prepared for 'classic' build)unknown2005-12-191-0/+2
| | | | | | | | | | | | | | | mysql-test/t/func_math.test: warnings disabled on CREATE TABLE INNODB
| * | Merge hf@192.168.21.12:work/mysql-4.1.9855unknown2006-01-21100-140/+2332
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg sql/item_func.cc: Auto merged
| | * | reintroduce --no-defaults to ndb_mgmdunknown2006-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | mysql-test/ndb/ndbcluster.sh: have made a real fix for mgmd not starting with --no-defaults. re-introduce it to the test suite
| * | | Fix for bug #9855 (Inconsistend column type in create select)unknown2005-10-154-6/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_gconcat.result: result fixed mysql-test/r/subselect.result: result fixed mysql-test/r/type_float.result: result fixed mysql-test/t/type_float.test: testcase added sql/item_func.cc: Now we set decimals to NOT_FIXED_DEC if the max_length is longer than maximum possible double length
* | | | Test case for BUG#16621: INSERTs in Stored Procedures causes data corruptionunknown2006-01-202-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the Binary Log. mysql-test/r/rpl_sp.result: Update result file. mysql-test/t/rpl_sp.test: Add test case for BUG#16621: INSERTs in Stored Procedures causes data corruption in the Binary Log.
* | | | Fix for BUG#15588: String overrun during sp-vars.testunknown2006-01-202-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug appears after implementation of WL#2984 (Make stored routine variables work according to the standard). mysql-test/r/type_varchar.result: Update result file. mysql-test/t/type_varchar.test: Add a test for BUG#15588. sql/field.cc: - use memmove() instead of memcpy() -- after implementation of WL#2984 (Make stored routine variables work according to the standard) it is possible to store in the field the value from this field. For instance, this can happen for the following statement: SET sp_var = SUBSTR(sp_var, 1, 3); sql/sp_head.cc: - Work correctly with String: - String length has to be be reset before use; - qs_append() does not allocate memory, so the memory should be reserved beforehand. sql/sql_select.cc: Polishing: should have been done in WL#2984.
* | | | Fix of fix for BUG#15866. (Actually change the fib() call in sp.test)unknown2006-01-202-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/sp.result: Updated results. mysql-test/t/sp.test: Actually change the fib(20) into fib(10). (Doh!)
* | | | Fixed BUG#15866: Thread stack limit insufficient for recursive call "fib(20)"unknown2006-01-194-48/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lowered the parameter to 10, and also renamed non-standard table names to t3. mysql-test/r/sp.result: Updated results. mysql-test/r/sp_trans.result: Updated results. mysql-test/t/sp.test: Renamed fac, primes and fib tables to t3. Lowered fib() test parameter to 10 (20 hit the stack overrun check on some machines). mysql-test/t/sp_trans.test: Added drop of t3 for safety. (Might be left from sp.test after certain test failures.)
* | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/work/bug15658/mysql-5.0
| * \ \ \ Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2006-01-191-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root mysql-test/ndb/ndbcluster.sh: Auto merged
| | * | | small typo fixesunknown2006-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/ndb/ndbcluster.sh: small fix to make ndb_mgmd run ndb/tools/ndb_size.pl: small typo
* | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-192-0/+46
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/work/bug15658/mysql-5.0 mysql-test/r/sp-error.result: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_yacc.yy: Auto merged sql/share/errmsg.txt: Auto merged
| * | | | Fixing BUG#15658: Server crashes after creating function as empty stringunknown2006-01-112-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empty strings (and names with trailing spaces) should not be allowed. mysql-test/r/sp-error.result: New testcase for BUG#15658 mysql-test/t/sp-error.test: New testcase for BUG#15658 sql/share/errmsg.txt: New error message for bad stored routine names. sql/sp_head.cc: Added function for checking SP names. (Mustn't be empty or contain trailing spaces.) sql/sp_head.h: Added function for checking SP names. sql/sql_yacc.yy: Check db and name for stored routines.
* | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-182-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/work/bug14834/mysql-5.0
| * | | | | Applied patch recieved from Marko:unknown2006-01-182-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make innodb_thread_concurrency 0 by default, and extend the usable range from 0 to 1000 (0 disables the thread throttling). innobase/include/srv0srv.h: Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on. innobase/srv/srv0srv.c: Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on. mysql-test/r/innodb.result: innodb_thread_concurrency is 0..1000 now, and the default is 0. mysql-test/t/innodb.test: innodb_thread_concurrency is 0..1000 now. sql/ha_innodb.cc: Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on. sql/mysqld.cc: innodb_thread_concurrency is 0..1000 now, and 0 (the default) disables the thread throttling.
* | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-18104-320/+2805
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/work/bug14834/mysql-5.0 sql/sql_acl.cc: Auto merged
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-176-40/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| | * | | | | Bug#15206: "Misleading message "No data to FETCH":unknown2006-01-176-40/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reword the misleading message. mysql-test/r/sp-error.result: Test results fixed (Bug#15206) mysql-test/r/sp.result: Test results fixed (Bug#15206) mysql-test/r/type_decimal.result: Disable an unportable test case (Bug#7670) mysql-test/r/variables.result: Test results fixed (Bug#15206) mysql-test/r/view_grant.result: Test results fixed (Bug#15206) mysql-test/t/type_decimal.test: Remove an unportable (QNX) test case (Bug#7670). The test output depends on system-specific sprintf() implementation. The original complain was about erroneous conversion to long long, which was applied prior to conversion to double: but the expected behaviour can't be achieved until we have an own string -> double conversion function.
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-172-1/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| | * | | | | Fix for connection not being added to connection pool if ↵unknown2006-01-172-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "disable_abort_on_error" was used. client/mysqltest.c: If connection suceeded don't close it, just call handle_no_error which will check if an error was expected mysql-test/r/mysqltest.result: Update test result mysql-test/t/mysqltest.test: Add test for connection not being added to connection pool if "disable_abort_on_error" was used
| * | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-172-40/+116
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/work/bug15231/mysql-5.0 mysql-test/r/sp.result: Manual merge. mysql-test/t/sp.test: Manual merge.
| | * | | | | | Added bug synopsis in comment for sp.test case BUG#15231.unknown2005-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/sp.test: Added bug synopsis in comment for test case BUG#15231.
| | * | | | | | Fixed BUG#15231: Stored procedure bug with not found condition handlerunknown2005-12-132-40/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the distinction between "exception conditions" and "completion conditions" (warning and "no data") as defined by the standard. The latter should not terminate a routine if no handler is found in the lexical scope. mysql-test/r/sp.result: New test case for BUG#15231. Moved part of the test for BUG#7049 to the new testcase (since it was actually an example of 15231). mysql-test/t/sp.test: New test case for BUG#15231. Moved part of the test for BUG#7049 to the new testcase (since it was actually an example of 15231). sql/sp_rcontext.cc: Only search for matching condition handlers in caller's contexts if it's an exception conditition.
| * | | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-173-2/+174
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/work/bug14498/mysql-5.0
| | * | | | | | | Post-merge fixes (BUG#14498)unknown2006-01-162-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/sp-code.result: Post-merge fix; updated result. mysql-test/t/sp.test: Post-merge fix; added comment (still can't call bug14498_4 test)
| | * | | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-01-162-1/+171
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/work/bug14498/mysql-5.0 sql/sp_head.h: Auto merged sql/sp_pcontext.h: Auto merged mysql-test/r/sp.result: Manual merge. mysql-test/t/sp.test: Manual merge. sql/sp_head.cc: Manual merge. sql/sql_yacc.yy: Manual merge.
| | | * | | | | | Fixed BUG#14498: Stored procedures: hang if undefined variable and exceptionunknown2005-11-042-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was to continue at the right place in the code after the test expression in a flow control statement fails with an exception (internally, the test in sp_instr_jump_if_not), and the exception is caught by a continue handler. Execution must then be resumed after the the entire flow control statement (END IF, END WHILE, etc). mysql-test/r/sp.result: New test case for BUG#14498. mysql-test/t/sp.test: New test case for BUG#14498. (Note that one call is disabled at the moment. Depends on BUG#14643.) sql/sp_head.cc: Added a continuation destination for sp_instr_jump_if_not, for the case when an error in the test expression causes a continue handler to catch. This includes new members in sp_instr_jump_if_not, adjustment of the optmizer (mark and move methods), and separate backpatching code (since we can't use the normal one for this). Also removed the class sp_instr_jump, since it's never used. ...and added some comments to the optimizer. sql/sp_head.h: Added a continuation destination for sp_instr_jump_if_not, for the case when an error in the test expression causes a continue handler to catch. This includes new members in sp_instr_jump_if_not, adjustment of the optmizer (mark and move methods), and separate backpatching code (since we can't use the normal one for this). Also removed the class sp_instr_jump, since it's never used. sql/sql_yacc.yy: Added backpatching of the continue destination for all conditional statements (using sp_instr_jump_if_not).
| * | | | | | | | A post-merge fix.unknown2006-01-171-14/+0
| | | | | | | | |
| * | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2006-01-171-0/+14
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/r/ps.result: SCCS merged mysql-test/t/ps.test: SCCS merged
| | * | | | | | | A fix for Bug#13337 "ps test fails if configure wo/ usc2"unknown2006-01-174-32/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ctype_ucs.result: Test results changed (Bug#13337) mysql-test/r/ps.result: Test results changed (Bug#13337) mysql-test/t/ctype_ucs.test: Fix Bug#13337 (move the test that uses UCS character set to ctype_ucs) mysql-test/t/ps.test: Fix Bug#13337 (move the test that uses UCS character set to ctype_ucs)
| * | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2006-01-172-0/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root mysql-test/r/create.result: Auto merged mysql-test/t/create.test: Auto merged sql/sql_table.cc: Auto merged
| | * | | | | | | Mergeunknown2006-01-162-0/+12
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/create.result: Auto merged mysql-test/t/create.test: Auto merged sql/sql_table.cc: SCCS merged
| | | * \ \ \ \ \ \ Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-202-0/+12
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy004.:/work/mysql-4.1-bug12913 mysql-test/r/create.result: Auto merged mysql-test/t/create.test: Auto merged sql/sql_table.cc: Auto merged
View Lorry Controller Status