(Patch from 4.0.5)
mysql-test/r/group_by.result:
Updated results
mysql-test/t/group_by.test:
Test for bug
sql/item_cmpfunc.cc:
Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/item_cmpfunc.h:
Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/opt_sum.cc:
Fixed bug in MAX() optimization when used with JOIN and ON expressions
doing it in sql_yacc.yy does not work
this commit contains fixes for other tests
there are fixes in subselect test which will have to be changed
once fix_fields is fixed to work with aliased derived tables
renamed tables to prevent droping real tables
mysql-test/r/group_by.result:
test of error message
mysql-test/r/subselect.result:
renamed tables to prevent droping real tables
mysql-test/t/group_by.test:
test of error message
mysql-test/t/subselect.test:
renamed tables to prevent droping real tables
sql/sql_base.cc:
moved thd->allow_sum_func assignment to upper level
sql/sql_select.cc:
fixed removed by previos patch thd->allow_sum_func "side effect" of setup_conds
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql_com.h:
Auto merged
include/mysql_version.h.in:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/configure.in:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/fsp/fsp0fsp.c:
Auto merged
innobase/include/buf0buf.ic:
Auto merged
innobase/include/dyn0dyn.ic:
Auto merged
innobase/include/ha0ha.ic:
Auto merged
innobase/include/sync0rw.ic:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/os/os0thread.c:
Auto merged
innobase/page/page0cur.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/sync/sync0rw.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
myisam/mi_create.c:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
strings/Makefile.am:
Auto merged
support-files/mysql.server.sh:
Auto merged
include/my_base.h:
merge with 3.23.52 (use local file)
include/sslopt-usage.h:
merge with 3.23.52 (use local file)
myisam/mi_search.c:
merge with 3.23.52 (use local file)
myisam/mi_write.c:
merge with 3.23.52 (use local file)
mysql-test/r/group_by.result:
merge with 3.23.52
(Need to be fixed before push)
mysys/my_pthread.c:
merge with 3.23.52 (use local file)
sql/gen_lex_hash.cc:
merge with 3.23.52 (use local file)
sql/ha_innodb.cc:
Total hand-merge with 3.23.52
sql/sql_yacc.yy:
merge with 3.23.52 (use local file)
support-files/mysql.spec.sh:
merge with 3.23.52 (use local file)
(Merge of code from 4.0)
Docs/manual.texi:
Changelog
include/my_base.h:
Fixed bug with GROUP BY on NULL fields.
include/mysql_com.h:
Fixed bug with GROUP BY on NULL fields.
myisam/mi_search.c:
Fixed bug with GROUP BY on NULL fields.
myisam/mi_write.c:
Fixed bug with GROUP BY on NULL fields.
mysql-test/r/group_by.result:
Fixed bug with GROUP BY on NULL fields.
mysql-test/t/group_by.test:
Fixed bug with GROUP BY on NULL fields.
sql/sql_base.cc:
Removed some not-needed comments in the trace file
sql/sql_select.cc:
Fixed bug with GROUP BY on NULL fields.
Fixed problem in access rights testing (from last patch)
mysql-test/r/group_by.result:
Condenced GROUP test case
mysql-test/t/group_by.test:
Condenced GROUP test case
sql/sql_parse.cc:
Fixed problem in access rights testing (from last patch)
sql/sql_select.cc:
Rollback Sinisa's GROUP BY patch and make a better one.
Fixed bug in multi-table-delete
Docs/manual.texi:
Changelog
include/mysql_com.h:
Define MAX_CHAR_WIDTH
myisam/mi_extra.c:
Cleanup
mysql-test/r/bdb.result:
Bug test
mysql-test/r/group_by.result:
Bug test
mysql-test/t/bdb.test:
Bug test
mysql-test/t/group_by.test:
Bug test
sql/ha_berkeley.cc:
More debug statements
sql/handler.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
sql/records.cc:
More DBUG statements
sql/sql_analyse.cc:
Cleanup
sql/sql_base.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
sql/sql_delete.cc:
Fixed bug in multi-table-delete
Cleanup
sql/sql_select.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
sql/sql_update.cc:
Move HA_EXTRA_NO_READCHECK to ha_open
Add ISAM to Windows version
Fix of test results
Fixes for NULL keys in HEAP tables.
Docs/manual.texi:
Changelog
heap/hp_open.c:
Add support for NULL=NULL in keys (for GROUP BY)
heap/hp_rkey.c:
Cleanup
heap/hp_write.c:
Cleanup
include/config-win.h:
Add ISAM to Windows version
include/my_base.h:
Add support for NULL=NULL in keys (for GROUP BY)
libmysqld/Makefile.am:
Rename of innobase to innodb
myisam/mi_write.c:
Add support for NULL=NULL in keys (for GROUP BY)
BitKeeper/etc/ignore:
Added libmysqld/ha_innodb.cc to the ignore list
mysql-test/r/group_by.result:
Test of NULL keys in HEAP tables
mysql-test/r/heap.result:
Test of NULL keys in HEAP tables
mysql-test/r/null.result:
Cleanup
mysql-test/r/order_by.result:
Fix for result of new ORDER BY optimization
mysql-test/t/group_by.test:
Test of NULL keys in HEAP tables
mysql-test/t/heap.test:
Test of NULL keys in HEAP tables
mysql-test/t/null.test:
Cleanup
sql/ha_heap.cc:
Add support of NULL keys
sql/item_strfunc.h:
Fix for BINARY and CAST functions
sql/item_timefunc.h:
Fix for BINARY and CAST functions
sql/sql_parse.cc:
Cleanup
sql/sql_select.cc:
Add support for NULL=NULL in keys (for GROUP BY)
Docs/manual.texi:
Changelog
libmysql/libmysql.c:
Fixed bug with mysql_use_result() when mysql_query() is called before mysql_free_result().
mysql-test/r/group_by.result:
New tests
mysql-test/t/group_by.test:
New tests
sql/stacktrace.c:
Fix for SCO
Changed 'lib' to 'master-data'
Fix for slow slaves
Docs/manual.texi:
Changelog
include/mysql.h:
Fixes for Cygwin
libmysql/libmysql.c:
Fixes for Cygwin
mysql-test/Makefile.am:
Include missing test files
mysql-test/include/master-slave.inc:
Fixes for slow slaves
mysql-test/install_test_db.sh:
Change 'lib' to 'master-data'
mysql-test/mysql-test-run.sh:
Change 'lib' to 'master-data'
mysql-test/r/group_by.result:
Test case for count(*) problem
mysql-test/t/group_by.test:
Test case for count(*) problem
mysql-test/t/rpl000018-master.sh:
Change 'lib' to 'master-data'
sql/sql_select.cc:
Fix for count(*) problem