summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* Fix bug in ndbcluster.sh on Solaris (now that line is the same as in 5.1)unknown2006-04-261-1/+1
| | | | | mysql-test/ndb/ndbcluster.sh: redirect to /dev/null to avoid grep -q
* Remove obsolete testunknown2006-04-262-5/+0
| | | | | | | mysql-test/r/user_var.result: Update results mysql-test/t/user_var.test: Remove unnecessary test
* Merge bk-internal:/home/bk/mysql-5.0unknown2006-04-264-65/+148
|\ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * Merge mysql.com:/home/jimw/my/mysql-5.0-12792unknown2006-04-262-2/+27
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean sql/item_func.cc: Auto merged sql/set_var.cc: Auto merged mysql-test/r/variables.result: Resolve conflict mysql-test/t/variables.test: Resolve conflict
| | * Bug #12792: @@system_time_zone is not SELECTableunknown2006-04-202-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #15684: @@version_* are not all SELECTable Added the appropriate information as read-only system variables, and also removed some special-case handling of @@version along the way. @@version_bdb was added, but isn't included in the test because it depends on the presence of BDB. mysql-test/r/variables.result: Update results mysql-test/t/variables.test: Fix error from setting @@version, reset sql_select_limit to avoid confusion in later tests, and add new regression tests. sql/item_func.cc: Remove special-case handling of VERSION, it's just a read-only server variable like the others now. sql/set_var.cc: Add system_time_zone and various version-related system variables
| * | Merge mysql.com:/home/jimw/my/mysql-5.0-18617unknown2006-04-261-24/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/mysql-test-run.pl: Resolve conflict
| | * | Bug #18617: mysql-test-run.pl, partially wrong handling of option "start-dirty"unknown2006-04-201-23/+10
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a case of too much code. The --start-dirty option should act just like --start-and-exit, except it skips the database initialization step. Now it does, which means it picks up the options from the specified test case. mysql-test/mysql-test-run.pl: Fix handle of --start-dirty to be like --start-and-exit, without the database initialization, as it was (sort of) documented.
| * | Merge mysql.com:/home/jimw/my/mysql-5.0-16195unknown2006-04-262-0/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean sql/set_var.cc: Auto merged mysql-test/r/variables.result: Resolve conflict mysql-test/t/variables.test: Resolve conflict
| | * | Bug #16195: SHOW VARIABLES doesn't report correctly sql_warnings and ↵unknown2006-04-202-1/+27
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql_notes values SQL_WARNINGS and SQL_NOTES were being displayed with SHOW_BOOL, but they are system variables that need SHOW_SYS to be used. mysql-test/r/variables.result: Add new results mysql-test/t/variables.test: Add new regression test sql/set_var.cc: Fix display of sql_notes and sql_warnings in SHOW VARIABLES.
| * | Merge mysql.com:/home/jimw/my/mysql-5.0-19083unknown2006-04-262-40/+71
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/mysql-test-run.pl: Auto merged mysql-test/ndb/ndbcluster.sh: Auto merged
| | * | Bug #19083 ./mysql-test-run.pl starts NDB when it is not neededunknown2006-04-212-40/+71
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now NDB is only initialized and started when the tests that are being run will make use of it. The same thing is also done for the slave databases and the instance manager. After review from Magnus: Only take a snapshot of the data directories that are in use. mysql-test/mysql-test-run.pl: Only initialize (and start) NDB, the instance manager, and the slaves when we have tests that require them. Also, only snapshot the data directories that we are going to use. mysql-test/ndb/ndbcluster.sh: Fix text message that has always annoyed me
| * | Bug #17849: sql_big_selects not shown in SHOW VARIABLES outputunknown2006-04-262-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simply adds sql_big_selects to the list of variables output by SHOW VARIABLES. mysql-test/r/variables.result: Update results mysql-test/t/variables.test: Add new regression test (and make end-of-tests marker add output) sql/set_var.cc: Add sql_big_selects to SHOW VARIABLES output
* | | Mergeunknown2006-04-266-3/+215
|\ \ \ | |/ / | | | | | | | | | | | | | | | sql/item.cc: Auto merged sql/share/errmsg.txt: SCCS merged
| * | fixed error message textunknown2006-04-261-1/+1
| | |
| * | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-04-263-0/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb/mysql-5.0-ss492
| | * \ Merge mysql.com:/home/alexi/mysql-5.0unknown2006-04-263-0/+19
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb/mysql-5.0-ss492
| | | * \ Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-workunknown2006-04-262-1/+5
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
| | | | * | Make innodb_mysql produce a non-empty output.unknown2006-04-262-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/innodb_mysql.result: Fix result.
| | | * | | Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-workunknown2006-04-263-0/+15
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work mysql-test/t/innodb.test: Auto merged
| | | | * | Files innodb.[test|result] are to be used by Innobase only.unknown2006-04-263-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use files innodb_mysql.[test|result] instead. mysql-test/t/innodb.test: This file is to be used by Innobase only. mysql-test/r/innodb_mysql.result: New BitKeeper file ``mysql-test/r/innodb_mysql.result'' Use this file instead of innodb.result. mysql-test/t/innodb_mysql.test: New BitKeeper file ``mysql-test/t/innodb_mysql.test'' Use this file instead of innodb.test.
| * | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-04-262-2/+195
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-5.0-bug15827-r2
| | * | | | | BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., ↵unknown2006-04-252-2/+195
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | )", as that consumes too much memory. Instead, either create the equvalent SEL_TREE manually, or create only two ranges that strictly include the area to scan (Note: just to re-iterate: increasing NOT_IN_IGNORE_THRESHOLD will make optimization run slower for big IN-lists, but the server will not run out of memory. O(N^2) memory use has been eliminated) mysql-test/r/func_in.result: Testcase for BUG#15872 mysql-test/t/func_in.test: Testcase for BUG#15872 sql/item.cc: BUG#15872: Added Item_decimal::set_decimal_value() sql/item.h: UG#15872: Added Item_decimal::set_decimal_value() sql/item_cmpfunc.h: BUG#15872: Added in_vector::create_item(), in_vector::value_to_item() and their implementations in concrete classes. sql/opt_range.cc: BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes too much memory. Instead, either A) create the equivalent SEL_TREE manually, making use of the fact that item_not_in->array has an ordered IN-list, or B) create only two ranges: (-inf|NULL) < X < min_value_from_in_list, max_value_from_in_list < X (Choose #B if the IN-list has > 10K elements)
* | | | | | Merge epotemkin@lsmy3:/data/users/bk/mysql-5.0-opt-bugsunknown2006-04-253-1/+20
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/18739-bug-5.0-mysql
| * | | | | Merge mysql.com:/usr/local/mysql/mysql-4.1unknown2006-04-243-1/+20
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/case.test: Auto merged sql/item_cmpfunc.cc: Auto merged mysql-test/r/case.result: SCCS merged
| | * | | | Fix typo in mysql-test-run.pl (not caught by aotupush since it uses ↵unknown2006-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test-run.sh). mysql-test/mysql-test-run.pl: Fix typo.
| | * | | | Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-4.1-mtr-fixunknown2006-04-2420-26/+364
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/data0/knielsen/mysql-4.1-mtr-fix
| | | * \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-04-242-0/+19
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into production.mysql.com:/usersnfs/rkalimullin/4.1.b17896
| | | | * | | | Fix for bug #17896: MIN of CASE WHEN returns non-minimum value!unknown2006-03-062-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_cmpfunc.cc: Fix for bug #17896: MIN of CASE WHEN returns non-minimum value! - NULL items should not affect the result type.
| | * | | | | | Fix broken --valgrind-options option.unknown2006-04-121-1/+1
| | | | | | | |
* | | | | | | | having.test:unknown2006-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merge fix for bug#18739 mysql-test/t/having.test: After merge fix for bug#18739
* | | | | | | | Manually mergedunknown2006-04-242-0/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item.cc: Auto merged sql/sql_select.cc: Auto merged
| * | | | | | | Fixed bug#18739: non-standard HAVING extension was allowed in strict ANSI ↵unknown2006-04-212-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql mode. The SQL standard doesn't allow to use in HAVING clause fields that are not present in GROUP BY clause and not under any aggregate function in the HAVING clause. However, mysql allows using such fields. This extension assume that the non-grouping fields will have the same group-wise values. Otherwise, the result will be unpredictable. This extension allowed in strict MODE_ONLY_FULL_GROUP_BY sql mode results in misunderstanding of HAVING capabilities. The new error message ER_NON_GROUPING_FIELD_USED message is added. It says "non-grouping field '%-.64s' is used in %-.64s clause". This message is supposed to be used for reporting errors when some field is not found in the GROUP BY clause but have to be present there. Use cases for this message are this bug and when a field is present in a SELECT item list not under any aggregate function and there is GROUP BY clause present which doesn't mention that field. It renders the ER_WRONG_FIELD_WITH_GROUP error message obsolete as being more descriptive. The resolve_ref_in_select_and_group() function now reports the ER_NON_GROUPING_FIELD_FOUND error if the strict mode is set and the field for HAVING clause is found in the SELECT item list only. sql/share/errmsg.txt: Added the new ER_NON_GROUPING_FIELD_USED error message for the bug#14169. mysql-test/t/having.test: Added test case for the bug#18739: non-standard HAVING extension was allowed in strict ANSI sql mode. mysql-test/r/having.result: Added test case for the bug#18739: non-standard HAVING extension was allowed in strict ANSI sql mode. sql/sql_select.cc: Added TODO comment to change the ER_WRONG_FIELD_WITH_GROUP to more detailed ER_NON_GROUPING_FIELD_USED message. sql/item.cc: Fixed bug#18739: non-standard HAVING extension was allowed in strict ANSI sql mode. The resolve_ref_in_select_and_group() function now reports the ER_NON_GROUPING_FIELD_FOUND error if the strict MODE_ONLY_FULL_GROUP_BY mode is set and the field for HAVING clause is found in the SELECT item list only.
* | | | | | | | Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/5.0-bug17263-temp_dropunknown2006-04-232-1/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 mysql-test/r/rpl_temporary.result: Auto merged mysql-test/t/rpl_temporary.test: Auto merged sql/sql_base.cc: Auto merged
| * | | | | | | | Bug#17263 temporary tables and replicationunknown2006-04-232-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix refines the algorithm of generating DROPs for binlog. Temp tables with common pseudo_thread_id are clustered into one query. Consequently one replication event per pseudo_thread_id is generated. mysql-test/r/rpl_temporary.result: results mysql-test/t/rpl_temporary.test: Creating temp tables associated with a set of pseudo_thread_id values within a connection. The aim is to see that slave digest master's binlog consisting of DROP temprorary tables. sql/sql_base.cc: close_temporary_tables is rewritten to generate sequence of DROP temprorary tables with common preudo_thread_id stored in temp table definition.
* | | | | | | | | manual merge use localunknown2006-04-231-23/+23
| | | | | | | | |
* | | | | | | | | Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1unknown2006-04-231-23/+23
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 mysql-test/r/rpl_temporary.result: manual merge use local
| * | | | | | | | Bug#17263 temporary tables and replicationunknown2006-04-232-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backporting a changeset made for 5.0. Comments from there: The fix refines the algorithm of generating DROPs for binlog. Temp tables with common pseudo_thread_id are clustered into one query. Consequently one replication event per pseudo_thread_id is generated. mysql-test/r/rpl_temporary.result: results changed mysql-test/t/rpl_temporary.test: test to generate problematic drop in binlog to feed it to restarting slave to see no stop. sql/sql_base.cc: change in drop temprorary tables alg in close_temporary_tables.
* | | | | | | | | Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1unknown2006-04-232-0/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 mysql-test/t/func_compress.test: Auto merged sql/item_strfunc.cc: Auto merged
| * | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-04-212-0/+16
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/mysql-4.1
| | * | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-04-212-0/+16
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into production.mysql.com:/usersnfs/rkalimullin/4.1.b18643
| | | * | | | | | Fix for bug #18643: crazy UNCOMPRESS().unknown2006-04-132-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_compress.result: Fix for bug #18643: crazy UNCOMPRESS(). - test-case mysql-test/t/func_compress.test: Fix for bug #18643: crazy UNCOMPRESS(). - test-case sql/item_strfunc.cc: Fix for bug #18643: crazy UNCOMPRESS(). - set null_value.
* | | | | | | | | Merge mysql.com:/opt/local/work/mysql-5.0-rootunknown2006-04-2313-446/+419
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-runtime-merge sql/item_func.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2006-04-224-0/+101
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/mysql-5.0-bg15153-2
| | * | | | | | | | | Fix for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs".unknown2006-04-224-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error was emitted when one tried to select information from view which used merge algorithm and which also had CONVERT_TZ() function in its select list. This bug was caused by wrong assumption that global table list for view which is handled using merge algorithm begins from tables belonging to the main select of this view. Nowadays the above assumption is not true only when one uses convert_tz() function in view's select list, but in future other cases may be added (for example we may support merging of views with subqueries in select list one day). Relying on this false assumption led to the usage of wrong table list for field lookups and therefor errors. With this fix we explicitly use pointer to the beginning of main select's table list. mysql-test/r/timezone_grant.result: Added additional test case for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs" that checks that usage of CONVERT_TZ() function in view does not require additional privileges. mysql-test/r/view.result: Added test case for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs". mysql-test/t/timezone_grant.test: Added additional test case for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs" that checks that usage of CONVERT_TZ() function in view does not require additional privileges. mysql-test/t/view.test: Added test case for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs". sql/sql_view.cc: mysql_make_view(): We should not assume that global table list for view which is handled using merge algorithm begins from tables belonging to the main select of this view. Nowadays the above assumption is not true only when one uses convert_tz() function in view's select list, but in future other cases may be added (for example we may support merging of views with subqueries in select list one day). So let us instead explicitly use pointer to the beginning of main select's table list.
| * | | | | | | | | | Bug#15728: LAST_INSERT_ID function inside a stored function returns 0unknown2006-04-214-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not reset value of LAST_INSERT_ID() in sub-statement. mysql-test/r/rpl_insert_id.result: Add result for bug#15728. mysql-test/r/sp.result: Add result for bug#15728. mysql-test/t/rpl_insert_id.test: Add test case for bug#15728. mysql-test/t/sp.test: Add test case for bug#15728. sql/sql_class.cc: Do not reset value of LAST_INSERT_ID() in sub-statement.
| * | | | | | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtimeunknown2006-04-212-0/+61
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/5.0/bug18344/mysql-5.0-runtime
| | * | | | | | | | | | Fixed BUG#18344: DROP DATABASE does not drop associated routinesunknown2006-04-182-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must use the db key length in sp_drop_db_routines (and not the number of characters), or long db names will be truncated in the key. mysql-test/r/sp.result: Updated results for new test case (BUG#18344) mysql-test/t/sp.test: Added new test case for BUG#18344. sql/sp.cc: In sp_drop_db_routines(), give the key field's ("db") key length instead of the number of characters to index_read(), or the key packing will truncate long db names.
| * | | | | | | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtimeunknown2006-04-203-444/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/5.0/bug18949/mysql-5.0-runtime sql/sql_yacc.yy: Auto merged
| | * | | | | | | | | | | Fixed BUG#18949: Test case sp-goto is disabledunknown2006-04-183-444/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed sp-goto.test, sp-goto.result and all (disabled) GOTO code. Also removed some related code that's not needed any more (no possible unresolved label references any more, so no need to check for them). NB: Keeping the ER_SP_GOTO_IN_HNDLR in errmsg.txt; it might become useful in the future, and removing it (and thus re-enumerating error codes) might upset things. (Anything referring to explicit error codes.) BitKeeper/deleted/.del-sp-goto.result~f343103c63f64b7a: Delete: mysql-test/r/sp-goto.result BitKeeper/deleted/.del-sp-goto.test~5054d3f729692d3d: Delete: mysql-test/t/sp-goto.test mysql-test/t/disabled.def: sp-goto.test no longer exists. sql/lex.h: Removed (disabled) GOTO definitions. sql/sp_head.cc: Removed sp_head::check_backpatch() and simplified sp_head::backpatch(). Without GOTO, unresolved label references are not possible, so no need to check for them. sql/sp_head.h: Removed sp_head::check_backpatch(). (Not needed with no GOTO) sql/sp_pcontext.cc: SP_LAB_GOTO was renamed to SP_LAB_IMPL sql/sp_pcontext.h: Removed SP_LAB_REF (no longer needed) and renamed SP_LAB_GOTO to SP_LAB_IMPL, since it's only used for implicit labels now. sql/sql_yacc.yy: Removed GOTO symbols and (disabled) code, and the no longer needed sp_head::check_backpatch() calls.
| * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2006-04-192-0/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/mysql-5.0-bg16021 sql/item_func.cc: Auto merged