mysql-test/r/group_by.result:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
support-files/mysql.server.sh:
Auto merged
Build-tools/Bootstrap:
Bypass a BK problem with "bk changes": It stopped delivering changeset comments when
1) it encountered a single, unbroken line with about 1k characters AND
2) it was applied not to the current directory but to a named BK root directory.
As 1) cannot be changed post-factum (and might happen again),
the "bk changes" command is now preceded by a "cd $REPO".
Do some renaming of variables used around the "bk changes" call to improve documentation.
support-files/mysql.server.sh:
Replace a non-portable "for" loop (bash style, fails on BSD) by an equivalent "while" loop.
Note that the "stop" method is still wrong, as it does not wait for file removal.
Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
different from the index join optimizer has choosen.
mysql-test/r/group_by.result:
Testcase for BUG#9213
mysql-test/t/group_by.test:
Testcase for BUG#9213
sql/table.h:
Added comments about TABLE::used_keys
sql/sql_select.cc:
A fix (bug #9401: type_timestamp segfaults mysqld).
1. create_tmp_field_from_field() is modified to take 'Item_ref *item' and 'char *name'
instead of 'bool modify_item' and 'Item *item'.
2. For Item_sum_min/max we should never modify item, so NULL is
passed as item to the create_tmp_field_from_field().
mysql-test/r/metadata.result:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
mysql-test/r/union.result:
SCCS merged
mysql-test/t/union.test:
SCCS merged
fixed bug in IN/ALL/ANY subqeries with HAVING clause (BUG#9350)
mysql-test/r/subselect.result:
added new subquery tests to make code covarage better
mysql-test/t/subselect.test:
added new subquery tests to make code covarage better
sql/item_subselect.cc:
fixed typo in comment
removed unused code
fixed bug with HAVING clause detectiuon (BUG#9350)
postreview changes
Incomplete, as the macro body must ne in the new file 'config/ac-macros/misc.m4'
which will follow in a separate changeset.
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Merge the 4.0 and 4.1 change of the new '--with-big-tables' flag.
configure.in:
Call the new macro to evaluate the '--with-big-tables' flag.
mysql-test/mysql-test-run.sh:
No change in 5.0, as 4.1 was a backport (Martin).
mysql-test/r/ps_7ndb.result:
Merge from 4.1 (Martin).
the current way of passing '-DBIG_TABLES' to the compilers.
This is needed even in 4.0, as 'Do-compile-all' must use this new approach for
all "max" builds in 4.0, 4.1, and up.
acinclude.m4:
Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option
and set the CPP symbol 'BIG_TABLES' accordingly.
configure.in:
Call the new 'MYSQL_CHECK_BIG_TABLES' macro.