- 25 Jun, 2004 4 commits
-
-
unknown authored
sql/sql_select.cc: After merge fix sql/sql_yacc.yy: After merge fix
-
unknown authored
-
unknown authored
mysql-test/r/join_outer.result: Auto merged mysql-test/r/select.result: Auto merged sql/item_cmpfunc.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.h: Auto merged
-
unknown authored
Nested joins: review modifications. sql/sql_parse.cc: Nested joins: review modifications. sql/sql_select.cc: Nested joins: review modifications.
-
- 22 Jun, 2004 1 commit
-
-
unknown authored
If cost(full_scan_on_shortest_covering_index) < cost(best_range_scan) < cost(full_table_scan) use full_scan_on_shortest_covering_index (before this fix best_range_scan was used)
-
- 16 Jun, 2004 5 commits
-
-
unknown authored
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0 sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/serbian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged
-
unknown authored
-
unknown authored
-
unknown authored
fix up test result. mysql-test/r/sp-error.result: fix up test result. mysql-test/r/variables.result: fix up test result.
-
unknown authored
-
- 15 Jun, 2004 2 commits
-
-
unknown authored
Also added some related security tests and corrected related error messages. mysql-test/r/sp-error.result: New test case for BUG#3339, and updated results for other modified error messages. mysql-test/r/sp-security.result: Added tests for creating procedures in another database with and wihout access rights. mysql-test/t/sp-error.test: New test case for BUG#3339. mysql-test/t/sp-security.test: Added tests for creating procedures in another database with and wihout access rights. sql/sp.cc: Check existance (and access rights) for database when creating a stored routine. sql/sp.h: New error return value for sp_create_* functions, for non existing database. sql/sql_parse.cc: Check error return for create stored routine (non existing database), and corrected the error output for some other commands. (Use qualified name, not just name.)
-
unknown authored
mysql-test/r/sp.result: New test case for BUG#3368. mysql-test/t/sp.test: New test case for BUG#3368. sql/item.h: Corrected const_item() for item_splocal. (Confusing semantics here, but this makes group_concat() behave as expected, instead of crashing, and does not appear to affect anything else.)
-
- 14 Jun, 2004 4 commits
-
-
unknown authored
into mysql.com:/home/pem/work/mysql-5.0-merge
-
unknown authored
mysql-test/r/sp.result: New test case for BUG#3843. mysql-test/t/sp.test: New test case for BUG#3843. sql/sql_yacc.yy: Added another multi results special case for stored procedures (analyze).
-
unknown authored
-
unknown authored
include/my_base.h: Auto merged include/my_bitmap.h: Auto merged include/my_sys.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/row/row0sel.c: Auto merged mysys/my_bitmap.c: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_berkeley.h: Auto merged sql/ha_heap.h: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/handler.h: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/sql_select.h: Auto merged
-
- 11 Jun, 2004 2 commits
-
-
unknown authored
Correction for nested joins. sql/sql_yacc.yy: Correction for nested joins.
-
unknown authored
new file Many files: Nested joins added. sql/item_cmpfunc.h: Nested joins added. sql/item_func.h: Nested joins added. sql/sql_base.cc: Nested joins added. sql/sql_lex.cc: Nested joins added. sql/sql_lex.h: Nested joins added. sql/sql_parse.cc: Nested joins added. sql/sql_select.cc: Nested joins added. sql/sql_select.h: Nested joins added. sql/sql_yacc.yy: Nested joins added. sql/table.h: Nested joins added. mysql-test/r/join_outer.result: Nested joins added. mysql-test/r/select.result: Nested joins added.
-
- 10 Jun, 2004 1 commit
-
-
unknown authored
mysql-test/r/sp.result: Added testcase for BUG#3132. mysql-test/t/sp.test: Added testcase for BUG#3132. sql/item_func.cc: Set a useful max_length in Item_func_sp so field widths are correctly calculated.
-
- 09 Jun, 2004 4 commits
-
-
unknown authored
-
unknown authored
into mysql.com:/home/pem/work/mysql-5.0-merge sql/sp.cc: Auto merged
-
unknown authored
It's not possible to quote the definition according to the current sql_mode setting, so instead we use the setting stored with the SP (that's how it's parsed anyway), and show this setting in the SHOW CREATE output. mysql-test/r/sp.result: Modifed SHOW CREATE FUNCTION|PROCEDURE output. Show the sql_mode used at creation as well. New test case for BUG#2564: SHOW CREATE inconsistent W.R.T ANSI_QUOTES. mysql-test/t/sp.test: New test case for BUG#2564: SHOW CREATE inconsistent W.R.T ANSI_QUOTES. sql/sp.cc: Rewrote create_string to quote things correctly according to the sql_mode used at creation time. sql/sp_head.cc: Store sql_mode in sp_head and use it for SHOW CREATE. sql/sp_head.h: Store sql_mode in sp_head and use it for SHOW CREATE.
-
unknown authored
sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_lex.cc: Auto merged
-
- 08 Jun, 2004 2 commits
-
-
unknown authored
This fixes part of BUG#3229: Stored procedure comment causes packets out of order. sql/sp.cc: Fixed proper restoring of current db on errors. sql/sp.h: Fixed proper restoring of current db on errors. sql/sp_head.cc: Fixed proper restoring of current db on errors.
-
unknown authored
into mysql.com:/home/wax/mysql/mysql-5.0service sql/mysqld.cc: Auto merged
-
- 07 Jun, 2004 2 commits
-
-
unknown authored
into mysql.com:/home/pem/work/mysql-5.0-merge sql/sql_parse.cc: Auto merged sql/sql_union.cc: Auto merged
-
unknown authored
mysql-test/r/index_merge.result: Post-merge update of results. (Ok according to Sanja) sql/opt_range.cc: Post-merge fix provided by Sergey Petrunia. sql/sql_select.cc: Post-merge fix provided by Sergey Petrunia.
-
- 03 Jun, 2004 1 commit
-
-
unknown authored
Not finished, will not be pushed until additional fixes have been made. client/mysqlbinlog.cc: Post-merge fixes. mysql-test/r/func_time.result: Post-merge fixes. sql/opt_range.cc: Post-merge fixes. sql/sql_select.cc: Post-merge fixes.
-
- 01 Jun, 2004 1 commit
-
-
unknown authored
Fixed an incorrect optimizer choice for ror-intersect(key, clustered_primary) Typo bug fixed in multitable update sql/opt_range.cc: More code cleanup, debug prints removed Fixed an incorrect optimizer choice for ror-intersect(key, clustered_primary) sql/opt_range.h: More code cleanup, debug prints removed Fixed an incorrect optimizer choice for ror-intersect(key, clustered_primary) sql/sql_update.cc: Typo bug fixed
-
- 29 May, 2004 2 commits
-
-
unknown authored
include/my_base.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/row/row0sel.c: Auto merged mysql-test/r/index_merge.result: Auto merged mysql-test/r/index_merge_innodb.result: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_berkeley.h: Auto merged sql/ha_heap.h: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/handler.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_test.cc: Auto merged sql/sql_update.cc: Auto merged sql/opt_range.cc: Hand merged sql/opt_range.h: Hand merged
-
unknown authored
* Fixed test results. mysql-test/r/index_merge_ror.result: Typo fix mysql-test/r/rowid_order_bdb.result: new index_merge EXPLAIN output format changes mysql-test/r/rowid_order_innodb.result: new index_merge EXPLAIN output format changes sql/opt_range.cc: Undo of previous fix: If cost(full_scan_on_covering_index) < cost(best_range_scan) < cost(full_table_scan) use full_scan_on_covering_index, not best_range_scan. The fix affects read plan choice for more queries then initially anticipated, so I'm reverting it for now, will get back to this later
-
- 28 May, 2004 3 commits
-
-
unknown authored
* Fixed a problem with wrong query results for partially covering keys in ROR-index_merge * ROR-intersection retrieval plan choice algorithm now uses less disk IO - and properly processes clustered PK range scans * Fixed several minor range optimizer problems * Added more comments * Code cleanup mysql-test/r/index_merge.result: New index_merge EXPLAIN output format changes mysql-test/r/index_merge_innodb.result: New index_merge EXPLAIN output format changes mysql-test/r/index_merge_ror.result: New index_merge EXPLAIN output format changes Added test for scans on keys that cover fields partially Fixed a minor ROR optimizer problem mysql-test/r/index_merge_ror_cpk.result: More tests added mysql-test/t/index_merge_ror.test: New index_merge EXPLAIN output format changes Added test for scans on keys that cover fields partially Fixed a minor ROR optimizer problem mysql-test/t/index_merge_ror_cpk.test: More tests added mysys/my_bitmap.c: Comments added, code cleanup sql/opt_range.cc: Comments added, code cleanup Numerous fixes, see changeset description sql/opt_range.h: Comments added, code cleanup New index_merge EXPLAIN output format related changes sql/sql_select.cc: Comments added, code cleanup New index_merge EXPLAIN output
-
unknown authored
mysql-test/r/sp.result: Added test case for BUG#2460. mysql-test/t/sp.test: Added test case for BUG#2460. sql/sql_union.cc: When called from stored procedures, tabs might be reset already.
-
unknown authored
BUG#1863: CREATE TABLE in Stored Procedure sometimes crashes on repeated calls. BUG#2656: select with join in stored procedure: erroneous result on 2nd call. BUG#3426: IF x IS NULL in stored procedure fails on second call within connection. BUG#3448: Stored Procedures with inner joins possible bug. BUG#3734: Stored procedure returns wrong rows with fulltext parameter. BUG#3863: Stored procedure crash when incrementing variable in a loop. (And corrected the row count output to the client after CALL) mysql-test/r/sp.result: New test case results for fixed bugs. mysql-test/t/sp.test: New test cases for fixed bugs. sql/sql_parse.cc: Corrected the row_count output to the client.
-
- 26 May, 2004 4 commits
-
-
unknown authored
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union client/mysqltest.c: Auto merged configure.in: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/mi_check.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/null.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/rpl_server_id2.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/rpl000015.test: Auto merged mysql-test/t/rpl_error_ignored_table.test: Auto merged mysql-test/t/rpl_log.test: Auto merged mysql-test/t/rpl_log_pos.test: Auto merged mysql-test/t/rpl_max_relay_size.test: Auto merged mysql-test/t/rpl_relayrotate.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged mysql-test/t/rpl_server_id2.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/my_pthread.c: Auto merged netware/BUILD/compile-netware-all: Auto merged netware/BUILD/compile-netware-standard: Auto merged netware/BUILD/mwenv: Auto merged netware/Makefile.am: Auto merged netware/my_manage.c: Auto merged netware/my_manage.h: Auto merged netware/mysql_test_run.c: Auto merged scripts/mysql_install_db.sh: Auto merged sql/Makefile.am: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_berkeley.h: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_string.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/client_test.c: Auto merged
-
unknown authored
into sanja.is.com.ua:/home/bell/mysql/bk/work-sp2_bak-5.0 mysql-test/t/sp.test: Auto merged
-
unknown authored
sql/sp_head.h: removed blanks at line end cleunup items of instruction after every instruction execution
-
unknown authored
into mysql.com:/home/pem/work/mysql-5.0-merge
-
- 25 May, 2004 2 commits