mysql-test/r/create.result:
A test case for foreign key bug that is resolved
mysql-test/r/select_found.result:
test case for new select ... limit 0 behaviour
mysql-test/t/create.test:
test case for foreign key bug that is fixed
mysql-test/t/select_found.test:
test case for new behaviour of SELECT ... LIMIT 0
sql/sql_select.cc:
SELECT ... LIMIT 0
sql/sql_union.cc:
replacing my dirty hack with Sanja's "proper" fix
mysql-test/r/subselect.result:
test of subselect explain bug
mysql-test/t/subselect.test:
test of subselect explain bug
sql/sql_select.cc:
remuved difference between optimization for execution and optimization for description
mysql-test/r/derived.result:
A test for derived table which requires creation on temporary MyISAM
table ...
mysql-test/r/select_found.result:
A test for LIMIT )
mysql-test/t/derived.test:
A test for derived table which requires creation on temporary MyISAM
table ...
mysql-test/t/select_found.test:
A test for LIMIT 0
mysql-test/r/subselect.result:
test of cyclic reference
mysql-test/t/subselect.test:
test of cyclic reference
sql/sql_parse.cc:
fixed layout
fixed bug in cyclic reference refinition
mysql-test/r/subselect.result:
test of cyclic reference
mysql-test/t/subselect.test:
test of cyclic reference
sql/share/czech/errmsg.txt:
new error message
sql/share/danish/errmsg.txt:
new error message
sql/share/dutch/errmsg.txt:
new error message
sql/share/english/errmsg.txt:
new error message
sql/share/estonian/errmsg.txt:
new error message
sql/share/french/errmsg.txt:
new error message
sql/share/german/errmsg.txt:
new error message
sql/share/greek/errmsg.txt:
new error message
sql/share/hungarian/errmsg.txt:
new error message
sql/share/italian/errmsg.txt:
new error message
sql/share/japanese/errmsg.txt:
new error message
sql/share/korean/errmsg.txt:
new error message
sql/share/norwegian-ny/errmsg.txt:
new error message
sql/share/norwegian/errmsg.txt:
new error message
sql/share/polish/errmsg.txt:
new error message
sql/share/portuguese/errmsg.txt:
new error message
sql/share/romanian/errmsg.txt:
new error message
sql/share/russian/errmsg.txt:
new error message
sql/share/serbian/errmsg.txt:
new error message
sql/share/slovak/errmsg.txt:
new error message
sql/share/spanish/errmsg.txt:
new error message
sql/share/swedish/errmsg.txt:
new error message
sql/share/ukrainian/errmsg.txt:
new error message
fixed bug in error handling
mysql-test/r/subselect.result:
test of error handling
test of derived tables inside subselect
mysql-test/t/subselect.test:
test of error handling
test of derived tables inside subselect
sql/sql_class.cc:
fixed error handling error
sql/sql_lex.h:
fifex layout
sql/sql_parse.cc:
fixed processing of derived tables
sql/sql_select.cc:
more quick abort on error
fixed subselects in ORDER bug
mysql-test/r/subselect.result:
test of subselects in ORDER clause
test of error handling bug
mysql-test/t/subselect.test:
test of subselects in ORDER clause
test of error handling bug
sql/item_subselect.cc:
fixed subselects in ORDER bug
sql/item_subselect.h:
fixed subselects in ORDER bug
sql/sql_select.cc:
fixed error handling
mysql-test/r/subselect.result:
test of derived table external field bug
mysql-test/t/subselect.test:
test of derived table external field bug
sql/sql_derived.cc:
lex->current_select always should point on current SELECT_LEX_NODE during query execution
decreased number of check of "!join->select_lex->dependent"
mysql-test/r/subselect.result:
test of yet another join_free bug
mysql-test/t/subselect.test:
test of yet another join_free bug
mysql-test/Makefile.am:
Changed binlog.001 to be binlog.000001
mysql-test/r/rpl000015.result:
Changed binlog.001 to be binlog.000001
mysql-test/r/rpl000018.result:
Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_flush_log_loop.result:
Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_log.result:
Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_log_pos.result:
Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_rotate_logs.result:
Changed binlog.001 to be binlog.000001
mysql-test/t/rpl000017-slave.sh:
Changed binlog.001 to be binlog.000001
mysql-test/t/rpl_log.test:
Changed binlog.001 to be binlog.000001
mysql-test/t/rpl_rotate_logs.test:
Changed binlog.001 to be binlog.000001
sql/log.cc:
Changed binlog.001 to be binlog.000001
fixed subselect error handling bug
fixed subselect UNION ALL bug
fixed thd->lex.select restoring
explain UNION subselect bug
mysql-test/r/subselect.result:
test for:
subselect UNION ALL bug
subselect error handling bug
explain UNION subselect bug
mysql-test/t/subselect.test:
test for:
subselect UNION ALL bug
subselect error handling bug
explain UNION subselect bug
sql/sql_lex.cc:
fixed subselect UNION ALL bug
sql/sql_lex.h:
fixed subselect UNION ALL bug
sql/sql_parse.cc:
fixed subselect UNION ALL bug
sql/sql_select.cc:
fixed subselect error handling bug
fixed explain UNION subselect bug
sql/sql_union.cc:
fixed thd->lex.select restoring
code cleanup
fixed subselect error handling bug
fixed subselect UNION ALL bug
sql/sql_yacc.yy:
fixed subselect UNION ALL bug
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~888e38cf95239a33:
'Auto converge rename'
Docs/manual.texi:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/ft_nlq_search.c:
Auto merged
myisam/ft_parser.c:
Auto merged
myisam/ftdefs.h:
Auto merged
myisam/mi_create.c:
Auto merged
mysys/my_init.c:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb:
Delete: BitKeeper/etc/skipkeys
BitKeeper/etc/skipkeys:
Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys
Build-tools/Do-compile:
Auto merged
Docs/manual.texi:
Auto merged
innobase/pars/lexyy.c:
Auto merged
innobase/pars/pars0grm.c:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/nt_servc.cc:
Auto merged
sql/nt_servc.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/bdb-crash.test:
Auto merged
small Item_ref fix
mysql-test/r/subselect.result:
DISTINCT in subselect test
mysql-test/t/subselect.test:
DISTINCT in subselect test
sql/sql_class.cc:
fixed DISTINCT in subselect bug
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/null_key.result:
Auto merged
mysql-test/r/select.result:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
Ignore changed keyblocks when on does DELETE FROM table_name;
acinclude.m4:
Don't give warnings when using openssl installed in /usr/include with gcc 3.x
myisam/mi_delete_all.c:
Ignore changed keyblocks when on does DELETE FROM table_name;
mysql-test/r/null_key.result:
Fix null test
sql/ha_innodb.cc:
Fix bug in last merge
sql/sql_parse.cc:
Fix bug introduced with merge
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
Auto merged
BitKeeper/deleted/.del-MySQLEULA.txt:
Delete: Docs/MySQLEULA.txt
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Build-tools/mysql-copyright-2:
Auto merged
Build-tools/mysql-copyright:
Auto merged
heap/heapdef.h:
Auto merged
heap/hp_open.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/os/os0thread.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/null_key.test:
Auto merged
mysys/safemalloc.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
tests/grant.res:
Auto merged
Build-tools/Do-compile:
merge
Docs/manual.texi:
merge
configure.in:
merge
mysql-test/r/distinct.result:
merge
mysql-test/r/null_key.result:
merge
sql/ha_innodb.cc:
merge
sql/item.h:
merge
sql/log.cc:
merge
sql/mysqld.cc:
merge
support-files/mysql.spec.sh:
merge
Fixed the remaining join variations, (left, right, natural, etc).
(Previous fix only solved "," and "[cross] join".)
mysql-test/r/select.result:
Added more test case results for more braced join fixes.
mysql-test/t/select.test:
Added more tests for braced join fixes.
sql/sql_yacc.yy:
Changed the remaining join_table_list cases to handle braces.
Also added some precedence declaration to silence shift/reduce conflicts
warnings that turned up after these fixes.
