client/mysqltest.c:
Added --big-test argument
libmysqld/lib_sql.cc:
Reset error messages before new query.
libmysqld/lib_vio.c:
Fixed reading of results.
mysql-test/mysql-test-run.sh:
Added option --big
mysql-test/r/multi_update.result:
More multi-delete tests
mysql-test/t/bdb-crash.test:
Added missing test if BDB is supported
mysql-test/t/multi_update.test:
More multi-delete tests
mark a master-forced rotate with a special flag
mysql-test/r/rpl000014.result:
updated result
mysql-test/r/rpl000015.result:
updated result
mysql-test/r/rpl000016.result:
updated result
mysql-test/r/rpl_log.result:
updated result
mysql-test/t/rpl000017-slave.sh:
fix for change in master.info format
mysql-test/t/rpl_log.test:
test for correct last_log_seq in show slave status
sql/log.cc:
mark a master-forced rotate with a special flag
sql/log_event.cc:
show master forced rotate info in SHOW BINLOG EVENTS
sql/log_event.h:
master forced rotation flag
sql/slave.cc:
keep trace of last log sequences in MASTER_INFO
do not rotate on slave, if the rotation on master was forced by its master
sql/slave.h:
keep track of last log sequence number in MASTER_INFO
fixed bugs in log seq - now starting to look good
fixes for SHOW BINLOG EVENTS
will push this one
include/mysqld_error.h:
merged errors from 3.23
mysql-test/mysql-test-run.sh:
wrong quotes in --skip-test
mysql-test/r/drop.result:
updated test
mysql-test/r/rpl_log.result:
updated test
mysql-test/t/drop.test:
updated test
mysql-test/t/rpl_log.test:
fixed bugs in test case
sql/item_sum.h:
remove compiler warning about re-ordered initialization
sql/log.cc:
fixed a bunch of loq_seq bugs
sql/log_event.cc:
fixed log seq bugs, added info for Slave event in SHOW BINLOG EVENTS
sql/share/czech/errmsg.txt:
merged errors from 3.23
sql/share/danish/errmsg.txt:
merged errors from 3.23
sql/share/dutch/errmsg.txt:
merged errors from 3.23
sql/share/english/errmsg.txt:
merged errors from 3.23
sql/share/estonian/errmsg.txt:
merged errors from 3.23
sql/share/french/errmsg.txt:
merged errors from 3.23
sql/share/german/errmsg.txt:
merged errors from 3.23
sql/share/greek/errmsg.txt:
merged errors from 3.23
sql/share/hungarian/errmsg.txt:
merged errors from 3.23
sql/share/italian/errmsg.txt:
merged errors from 3.23
sql/share/japanese/errmsg.txt:
merged errors from 3.23
sql/share/korean/errmsg.txt:
merged errors from 3.23
sql/share/norwegian-ny/errmsg.txt:
merged errors from 3.23
sql/share/norwegian/errmsg.txt:
merged errors from 3.23
sql/share/polish/errmsg.txt:
merged errors from 3.23
sql/share/portuguese/errmsg.txt:
merged errors from 3.23
sql/share/romanian/errmsg.txt:
merged errors from 3.23
sql/share/russian/errmsg.txt:
merged errors from 3.23
sql/share/slovak/errmsg.txt:
merged errors from 3.23
sql/share/spanish/errmsg.txt:
merged errors from 3.23
sql/share/swedish/errmsg.txt:
merged errors from 3.23
sql/slave.cc:
fixed log_seq bugs
preserve originating server id in Intvar events to avoid inifinite loops
include/mysqld_error.h:
new error messages
mysql-test/r/drop.result:
updated result
mysql-test/r/flush.result:
updated result
mysql-test/t/drop.test:
test for proper handling of drop/create database when holding
global read lock
mysql-test/t/flush.test:
test to see if other thread would block on drop database if we
are holding global read lock
sql/log.cc:
preserve originating server id in Intvar log event
sql/share/czech/errmsg.txt:
new error messages
sql/share/danish/errmsg.txt:
new error messages
sql/share/dutch/errmsg.txt:
new error messages
sql/share/english/errmsg.txt:
new error messages
sql/share/estonian/errmsg.txt:
new error messages
sql/share/french/errmsg.txt:
new error messages
sql/share/german/errmsg.txt:
new error messages
sql/share/greek/errmsg.txt:
new error messages
sql/share/hungarian/errmsg.txt:
new error messages
sql/share/italian/errmsg.txt:
new error messages
sql/share/japanese/errmsg.txt:
new error messages
sql/share/korean/errmsg.txt:
new error messages
sql/share/norwegian-ny/errmsg.txt:
new error messages
sql/share/norwegian/errmsg.txt:
new error messages
sql/share/polish/errmsg.txt:
new error messages
sql/share/portuguese/errmsg.txt:
new error messages
sql/share/romanian/errmsg.txt:
new error messages
sql/share/russian/errmsg.txt:
new error messages
sql/share/slovak/errmsg.txt:
new error messages
sql/share/spanish/errmsg.txt:
new error messages
sql/share/swedish/errmsg.txt:
new error messages
sql/slave.cc:
fixed typo in comment
sql/sql_db.cc:
global read lock should block drop/create database
fixed log sequence bugs
fixed bugs in handling Slave event
added test case with SHOW BINLOG EVENTS
have not fixed all the bugs - found some that are also in 3.23,
will fix them there first, then do pull and cleanup
will not push this changeset
include/mysqld_error.h:
new error
mysql-test/mysql-test-run.sh:
use quotes in expr
sql/lex.h:
SHOW BINLOG EVENTS
sql/log.cc:
fixed log sequence bugs
sql/log_event.cc:
SHOW BINLOG EVENTS
fixed bugs Slave event handling
sql/log_event.h:
SHOW BINLOG EVENTS
sql/share/english/errmsg.txt:
SHOW BINLOG EVENTS
sql/sql_lex.h:
SHOW BINLOG EVENTS
sql/sql_parse.cc:
SHOW BINLOG EVENTS
sql/sql_repl.cc:
SHOW BINLOG EVENTS
sql/sql_repl.h:
SHOW BINLOG EVENTS
sql/sql_yacc.yy:
SHOW BINLOG EVENTS
Docs/manual.texi:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Docs/manual.texi:
Changelog
mysql-test/r/show_check.result:
Added test for SHOW CREATE
mysql-test/t/show_check.test:
Added test for SHOW CREATE
sql/mysqld.cc:
Fixed messages
Documented/cleaned up log event code
Updated tests
mysql-test/r/rpl000014.result:
new binlog format
mysql-test/r/rpl000015.result:
new binlog format
mysql-test/r/rpl000016.result:
new binlog format
mysql-test/std_data/master-bin.001:
new binlog format
mysql-test/t/rpl000014.test:
new binlog format
sql/log.cc:
new binlog format
sql/log_event.cc:
new binlog format
sql/log_event.h:
new binlog format
sql/sql_class.cc:
new binlog format
sql/sql_class.h:
new binlog format
sql/sql_repl.cc:
new binlog format
Fixed problem when converting bigint to double.
Fixed bug in count(distinct null)
Fixed bug with empty BDB tables.
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~dd306b2e583ebde4:
Delete: sql-bench/Results/ATIS-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-RUN-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~11038a44f73070e7:
Delete: sql-bench/Results/RUN-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~662b96bc66bc91b6:
Delete: sql-bench/Results/alter-table-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~788ad492867b1226:
Delete: sql-bench/Results/big-tables-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-connect-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~5316add301edb60:
Delete: sql-bench/Results/connect-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-create-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~26e09af61f88d8c9:
Delete: sql-bench/Results/create-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-insert-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~fd2699adb3190d07:
Delete: sql-bench/Results/insert-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-select-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~b01175ad38fd12b6:
Delete: sql-bench/Results/select-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~8ba598d217450157:
Delete: sql-bench/Results/wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
Docs/manual.texi:
Changelog + update to Linux section
client/mysqlcheck.c:
Fixed bug when using --fast
--check --auto-repair --fast will not anymore repair tables that
had warnings but where ok.
mysql-test/r/bdb.result:
New test case
mysql-test/r/bigint.result:
New test case
mysql-test/r/count_distinct.result:
New test case
mysql-test/t/bdb.test:
New test case
mysql-test/t/bigint.test:
New test case
mysql-test/t/count_distinct.test:
New test case
sql-bench/Comments/postgres.benchmark:
Update for PostgreSQL 7.1.2
sql-bench/graph-compare-results.sh:
Fixed colors for mysql --fast tests
sql/field.cc:
Fixed problem when converting bigint to double.
sql/item_sum.cc:
Fixed bug in count(distinct null)
sql/item_sum.h:
Fixed bug in count(distinct null)
sql/mysqlbinlog.cc:
Fixed typo
sql/sql_base.cc:
cleanup
sql/sql_select.cc:
Fixed bug with empty BDB tables.
sql/time.cc:
Removed warning when reading timestamps with sub seconds.
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
sql-bench/server-cfg.sh:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Fixes for making distribution
Build-tools/Do-compile:
Added --no-strip option
Docs/manual.texi:
Changelog and some fixes to comparison section
client/mysqlshow.c:
Added --verbose option
mysql-test/r/create.result:
Test of CREATE ... SELECT with keys
mysql-test/t/create.test:
Test of CREATE ... SELECT with keys
scripts/make_binary_distribution.sh:
Changed to use long options
sql-bench/Comments/postgres.benchmark:
update
sql-bench/server-cfg.sh:
update to use 'vacuum analyze'
added a test for check table
BitKeeper/triggers/post-commit:
send a separate commit message to internals
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Fixed that @VAR shows all decimals
Fixed problem with FLUSH TABLES and LOCK TABLE
CREATE ... SELECT now creates keys later
Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key
Docs/manual.texi:
Added MySQL/PostgreSQL comparison
isam/_dynrec.c:
Fixed wrong compare (not used in MySQL)
myisam/mi_dynrec.c:
Fixed wrong compare (not used in MySQL).
Changed compare to use my_pread()
myisam/mi_packrec.c:
cleanup
mysql-test/r/alter_table.result:
Added test for ALTER TABLE
mysql-test/r/variables.result:
Added test for variables with REAL values.
mysql-test/t/alter_table.test:
Added test for ALTER TABLE
mysql-test/t/variables.test:
Added test for variables with REAL values.
mysys/my_pread.c:
Cleanup
sql-bench/Makefile.am:
removed extra \
sql-bench/README:
Fixed typo.
sql/item_func.cc:
Fixed that @VAR shows all decimals
sql/share/swedish/errmsg.OLD:
update
sql/sql_base.cc:
Fixed problem with FLUSH TABLES and LOCK TABLE
sql/sql_insert.cc:
CREATE ... SELECT now creates keys later
sql/sql_table.cc:
Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key.
BitKeeper/etc/ignore:
Added sql-bench/graph-compare-results to the ignore list
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
compiles, passes test suite, does magic, has bugs, but none that I know
at this point. Have not tested everything yet, though. Changed
a lot of code in the client, but normal stuff appears to be working.
BUILD/SETUP.sh:
make sure client link statically
client/mysqltest.c:
new commands to test replication probe/parse
include/errmsg.h:
new error messages
include/mysql.h:
support for replication auto-magic
libmysql/errmsg.c:
new error messages
libmysql/libmysql.c:
replication probe/parse auto-magic
mysql-test/mysql-test-run.sh:
--client-gdb to run the client in debugger
Fixed error number handling bug in mysqltest.
Fixed that error number from insert delayed is reported correctly.
merged new vio code with old violite code.
client/mysqltest.c:
Fixed bug that error numbers wasn't tested properly.
myisam/mi_check.c:
Moved initialization of variables to avoid a bug.
myisam/mi_create.c:
Fixed bug in symlink handling.
myisam/mi_test_all.sh:
Fixed script so that it works.
myisam/myisamchk.c:
Removed --no-symlinks option
mysql-test/mysql-test-run.sh:
Cleaned up error message
mysql-test/t/bdb.test:
Fixed wrong error numbers
mysql-test/t/err000001.test:
Fixed wrong error numbers
mysql-test/t/innodb.test:
Fixed wrong error numbers
mysql-test/t/overflow.test:
Fixed wrong error numbers
mysql-test/t/status.test:
Ensure that we are using myisam tables for the lock test.
mysys/my_delete.c:
cleanup
mysys/my_symlink2.c:
Added option to not overwrite files when using symlinks.
sql/Makefile.am:
Moved vio to avoid link error.
sql/ha_myisam.cc:
Fixed symlink handling.
sql/mysqld.cc:
Changed --skip-symlinks to --skip-symlink
sql/sql_insert.cc:
Fixed that error number from insert delayed is reported correctly
sql/sql_parse.cc:
Fixed symlink handling.
sql/sql_table.cc:
Fixed symlink handling.
vio/vio.c:
cleanup
vio/viosocket.c:
c
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysys/tree.c:
Auto merged
sql-bench/bench-init.pl.sh:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql/mysqld.cc:
Auto merged
row0sel.c CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.c CHECK TABLE now also for InnoDB, a join speed optimization
rem0cmp.c CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.c CHECK TABLE now also for InnoDB, a join speed optimization
page0page.c CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.h CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.ic CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.c CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.c CHECK TABLE now also for InnoDB, a join speed optimization
btr0sea.c CHECK TABLE now also for InnoDB, a join speed optimization
innodb.result CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.cc CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.h CHECK TABLE now also for InnoDB, a join speed optimization
sql/ha_innobase.cc:
CHECK TABLE now also for InnoDB, a join speed optimization
sql/ha_innobase.h:
CHECK TABLE now also for InnoDB, a join speed optimization
mysql-test/r/innodb.result:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0btr.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0cur.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0sea.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0btr.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0cur.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.ic:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/row0mysql.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/trx0trx.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/page/page0page.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/rem/rem0cmp.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0mysql.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0sel.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/trx/trx0trx.c:
CHECK TABLE now also for InnoDB, a join speed optimization
Docs/manual.texi:
website address change
cleanup of register_slave_on_master()
mysql-test/r/rpl000002.result:
new output of show slave hosts
sql/mysqld.cc:
user and password are shown in show slave hosts only if show-slave-auth-info option is on
sql/slave.cc:
cleanup of register_slave_on_master()
sql/sql_repl.cc:
do not show user/pass for slave unless running with show-slave-auth-info
sql/sql_repl.h:
show-slave-auth-info
test case included ( drop) - currently fails, along with rpl000009
mysql-test/r/drop.result:
new test
mysql-test/t/drop.test:
expose a bug in the new symlink table code
sql/slave.cc:
turn off symlink bit to avoid a bug
sql/sql_repl.cc:
turn off symlink bit to avoid a bug
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
info on how to connect to the slave for the clients that connect to
the master, but would like to know where the slaves are
include/mysql_com.h:
register slaves
mysql-test/mysql-test-run.sh:
parameters to test slave registration
mysql-test/r/rpl000002.result:
test of slave registration
mysql-test/t/rpl000002.test:
test slave registration
sql/mysql_priv.h:
slave registration
sql/mysqld.cc:
slave registration
sql/slave.cc:
slave registration
sql/slave.h:
slave registration
sql/sql_lex.h:
slave registration
sql/sql_parse.cc:
slave registration
sql/sql_repl.cc:
slave registration
sql/sql_repl.h:
slave registration
sql/sql_yacc.yy:
slave registration
Force add of FN_LIBCHAR to symlinks on windows
Docs/manual.texi:
Cleanup & Changelog
client/mysqladmin.c:
Added quoting for 'drop database'
client/mysqlcheck.c:
Fixed wrong comment syntax
libmysql/net.c:
Cleanup
mysql-test/mysql-test-run.sh:
Better error message.
mysql-test/r/func_test.result:
test for if()
mysql-test/t/func_test.test:
test for if()
mysys/mf_pack.c:
Force add of FN_LIBCHAR to symlinks on windows.
sql/item_cmpfunc.cc:
Fixed problems with decimals withing IF()
sql/mysqlbinlog.cc:
Better error messages.
sql/sql_repl.cc:
Better error messages.
include/mysqld_error.h:
new errors
mysql-test/r/rpl000009.result:
test load data from master
mysql-test/t/rpl000009.test:
test load data from master
sql/mini_client.cc:
extra functionality needed for load data from master and other things
sql/mini_client.h:
addition to API
sql/mysql_priv.h:
mysql_create_db()/mysql_rm_db() now return a value
sql/share/english/errmsg.txt:
more error messages
sql/slave.cc:
cleanup of fetch_nx_table()
sql/slave.h:
cleanup of fetch_nx_table()
sql/sql_base.cc:
remove unused code originally written for retrieving a non-existent table in slave thread
sql/sql_class.cc:
remove unused replication variables
sql/sql_class.h:
remove unused replication variabled
sql/sql_db.cc:
make mysql_create_db()/mysql_rm_db() work with thd == 0
(do not write messages to the net) and instead return success/error
sql/sql_lex.h:
added SQLCOM_LOAD_MASTER_DATA
sql/sql_parse.cc:
LOAD MASTER DATA, cleanup of LOAD TABLE FROM MASTER
sql/sql_repl.cc:
LOAD DATA FROM MASTER
sql/sql_repl.h:
LOAD DATA FROM MASTER
sql/sql_yacc.yy:
LOAD DATA FROM MASTER
test heap table/tree overflow in count(distinct)
mysql-test/r/count_distinct2.result:
added test for tree/heap table overflow
mysql-test/t/count_distinct2.test:
test tree/heap table overflow
sql/item_sum.cc:
handle tree overflow in count(distinct)
sql/item_sum.h:
t
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
Don't read MyISAM header when running without locking
include/myisam.h:
Don't read header when running without locking.
myisam/mi_locking.c:
Don't update changed flag for temporary files.
myisam/mi_open.c:
Don't read header when running without locking.
myisam/mi_static.c:
Don't read header when running without locking.
sql/item_sum.cc:
Don't write rows in MyISAM tables when using count(distinct)
sql/mysqld.cc:
Don't read MyISAM header when running without locking.
Remove -Sg option.
sql/sql_analyse.h:
Remove duplicate header.
sql/sql_select.cc:
Cleaned up prototypes.
Don't write rows to count(DISTINCT) MyISAM tables.
sql/sql_select.h:
Cleaned up prototypes.
sql/table.h:
A
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Fixed problem with fuzzy dates.
mysql-test/r/func_time.result:
Added test of fuzzy dates
mysql-test/t/func_time.test:
Added test of fuzzy dates
sql/item.cc:
Fixed bug with fuzzy dates
sql/sql_parse.cc:
Remove wrong access check for locks.
(This has to be delayed for 4.0 because there is currently now way
to check for "any of the following privileges"
Docs/manual.texi:
Changelog
Small cleanups
Docs/manual.texi:
Updated how to add new native functions
mysql-test/r/func_crypt.result:
Fix for crypt on FreeBSD
mysql-test/t/func_crypt.test:
Fix for crypt on FreeBSD
mysys/thr_lock.c:
Changed to use statistics_increment macro for statistic variables.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
myisam/myisamdef.h:
Added missing declaration
mysql-test/r/innodb.result:
Changed test based on result from changed optimizer
sql/mysql_priv.h:
Fixed wrong prototype
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
myisam/mi_search.c:
Auto merged
sql/sql_select.cc:
Auto merged
fixed bug/updated count_distinct2 test
changed reset in count distinct to avoid calls to my_free()
include/my_sys.h:
option to free_root() not to do my_free()
include/my_tree.h:
reset_tree()
mysql-test/r/count_distinct2.result:
added group by test
mysql-test/t/count_distinct2.test:
group by test + fixed bug - need to drop table
mysys/my_alloc.c:
mark_blocks_free()
mysys/tree.c:
reset_tree()
sql/item_sum.cc:
in count distinct reset_tree instead of delete_tree
