include/Makefile.am:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
client/Makefile.am:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/Makefile.am:
Auto merged
sql/sql_lex.h:
Auto merged
added set_exec_stdout and set_exec_stderr to mysqlmanager to be able
to redirect stdout and stderr
added support for MY_FULL_IO to my_read, so we can tell it to read
a number of bytes in as many chunks as it takes instead of one try
BitKeeper/etc/ignore:
Added client/mysqlmanager-pwgen to the ignore list
client/Makefile.am:
mysqlmanager-pwgen
client/mysqlmanagerc.c:
clean-up
include/my_sys.h:
added MY_FULL_IO
mysql-test/mysql-test-run.sh:
started on changes to use mysqlmanager
mysys/my_read.c:
added support for MY_FULL_IO
tools/managertest1.nc:
updated test case
tools/mysqlmanager.c:
added set_exec_stdout and set_exec_stderr
Fixed bug in UNION
client/mysqlbinlog.cc:
Added error message handling to read_log_event()
heap/hp_write.c:
More debug info
myisam/myisampack.c:
Cleanup
mysql-test/mysql-test-run.sh:
Portability fixes.
mysql-test/r/union.result:
More tests cases for UNION
mysql-test/t/union.test:
More tests cases for UNION
sql/Makefile.am:
Added mysql_embed.h
sql/item.cc:
Fixed bug when using the same table multiple times in union.
sql/log_event.cc:
Removed use of ## construct (Portability problem)
sql/log_event.h:
Added error message handling to read_log_event()
sql/mysql_priv.h:
Added mysql_embed.h
sql/opt_sum.cc:
Cleanup
sql/slave.cc:
cleanup
sql/sql_base.cc:
Integrated table->ref_primary_key into table->part_of_key
sql/sql_union.cc:
Cleanup
sql/table.cc:
Integrated table->ref_primary_key into table->part_of_key
sql/table.h:
Integrated table->ref_primary_key into table->part_of_key
into work.mysql.com:/home/bk/mysql-4.0
Docs/manual.texi:
Auto merged
extra/perror.c:
Auto merged
include/myisam.h:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/rpl000017-slave.sh:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/slave.cc:
Auto merged
Fixed some wrong test cases
Docs/manual.texi:
Changelog
extra/perror.c:
Added BDB table errors
include/myisam.h:
Fix for LOAD DATA FROM MASTER when using tables with checksum
myisam/mi_check.c:
Fix for LOAD DATA FROM MASTER when using tables with checksum
mysql-test/mysql-test-run.sh:
Better logging
mysql-test/r/join.result:
Fixed missing results
mysql-test/r/rpl000006.result:
Updated result
mysql-test/t/join.test:
Fixed wrong test
mysql-test/t/rpl000001.test:
Fixed wrong test
mysql-test/t/rpl000006.test:
Cleanup
mysql-test/t/rpl000017-slave.sh:
Fixed too long password
mysql-test/t/rpl000017.test:
Fixed too long password
sql/ha_myisam.cc:
Fix for LOAD DATA FROM MASTER when using tables with checksum
sql/handler.cc:
Unique error for DEADLOCK
sql/slave.cc:
Fix for LOAD DATA FROM MASTER when using tables with checksum
updated mysql-test-run with features from 4.0
added a test case for broken load data from master for MyISAM tables
with checksum
client/mysqltest.c:
fixed parser bug
mysql-test/mysql-test-run.sh:
backported changes from 4.0 ( needed to be able to run client in gdb)
mysql-test/t/rpl000006.test:
updated test case for a bug
Fixed problem with LIKE with latin1_de
Added parsing support of UNSIGNED LONG LONG
Docs/manual.texi:
Changelog
client/client_priv.h:
Changed to use my_global.h
client/completion_hash.cc:
Changed to use my_global.h
client/errmsg.c:
Changed to use my_global.h
client/get_password.c:
Changed to use my_global.h
client/mysqldump.c:
Changed to use my_global.h
client/mysqlshow.c:
Changed to use my_global.h
client/mysqltest.c:
Changed to use my_global.h
client/password.c:
Changed to use my_global.h
client/readline.cc:
Changed to use my_global.h
client/sql_string.cc:
Changed to use my_global.h
client/thimble.cc:
Changed to use my_global.h
client/thread_test.c:
Changed to use my_global.h
dbug/dbug.c:
Changed to use my_global.h
dbug/dbug_analyze.c:
Changed to use my_global.h
dbug/example1.c:
Changed to use my_global.h
dbug/example2.c:
Changed to use my_global.h
dbug/example3.c:
Changed to use my_global.h
dbug/factorial.c:
Changed to use my_global.h
dbug/main.c:
Changed to use my_global.h
dbug/sanity.c:
Changed to use my_global.h
extra/comp_err.c:
Changed to use my_global.h
extra/my_print_defaults.c:
Changed to use my_global.h
extra/perror.c:
Changed to use my_global.h
extra/replace.c:
Changed to use my_global.h
extra/resolve_stack_dump.c:
Changed to use my_global.h
extra/resolveip.c:
Changed to use my_global.h
fs/libmysqlfs.h:
Changed to use my_global.h
fs/mysqlcorbafs.h:
Changed to use my_global.h
heap/hp_test1.c:
Changed to use my_global.h
include/Makefile.am:
Changed to use my_global.h
include/m_ctype.h:
Changed to use my_global.h
include/my_base.h:
Changed to use my_global.h
innobase/include/univ.i:
Changed to use my_global.h
libmysql/dll.c:
Changed to use my_global.h
libmysql/errmsg.c:
Changed to use my_global.h
libmysql/get_password.c:
Changed to use my_global.h
libmysql/libmysql.c:
Changed to use my_global.h
libmysql/net.c:
Changed to use my_global.h
libmysql/password.c:
Changed to use my_global.h
libmysqld/lib_sql.cc:
Changed to use my_global.h
libmysqld/lib_vio.c:
Changed to use my_global.h
libmysqld/libmysqld.c:
Changed to use my_global.h
mysql-test/mysql-test-run.sh:
Changed to use latin1 as default character set
mysql-test/r/ctype_latin1_de.result:
Changed to use my_global.h
mysql-test/r/func_like.result:
New test
mysql-test/t/ctype_latin1_de.test:
Added test of part keys
mysql-test/t/func_like.test:
New test
mysys/checksum.c:
Changed to use my_global.h
mysys/getopt.c:
Changed to use my_global.h
mysys/getopt1.c:
Changed to use my_global.h
mysys/make-conf.c:
Changed to use my_global.h
mysys/my_alloc.c:
Changed to use my_global.h
mysys/my_clock.c:
Changed to use my_global.h
mysys/my_compress.c:
Changed to use my_global.h
mysys/mysys_priv.h:
Changed to use my_global.h
mysys/test_charset.c:
Changed to use my_global.h
mysys/testhash.c:
Changed to use my_global.h
mysys/thr_alarm.c:
Changed to use my_global.h
mysys/thr_mutex.c:
Changed to use my_global.h
regex/debug.c:
Changed to use my_global.h
regex/main.c:
Changed to use my_global.h
regex/regcomp.c:
Changed to use my_global.h
regex/regerror.c:
Changed to use my_global.h
regex/regexec.c:
Changed to use my_global.h
regex/regexp.c:
Changed to use my_global.h
regex/regfree.c:
Changed to use my_global.h
regex/reginit.c:
Changed to use my_global.h
sql/cache_manager.cc:
Changed to use my_global.h
sql/gen_lex_hash.cc:
Changed to use my_global.h
sql/ha_berkeley.cc:
Fixed problem with UNIQUE keys that could contain NULL
sql/ha_gemini.h:
Changed to use my_global.h
sql/handler.cc:
Fixed problem after merge
sql/item.cc:
Added Item_unit
sql/item.h:
Added Item_uint
sql/matherr.c:
Changed to use my_global.h
sql/md5.c:
Changed to use my_global.h
sql/mini_client.cc:
Changed to use my_global.h
sql/my_lock.c:
Changed to use my_global.h
sql/mysql_priv.h:
Changed to use my_global.h
sql/net_serv.cc:
Changed to use my_global.h
sql/password.c:
Changed to use my_global.h
sql/sql_lex.cc:
Added parsing support of UNSIGNED LONG LONG
sql/sql_show.cc:
Changed to use my_global.h
sql/sql_string.cc:
Changed to use my_global.h
sql/sql_yacc.yy:
Added usage of Int_uint
sql/stacktrace.c:
Changed to use my_global.h
sql/udf_example.cc:
Changed to use my_global.h
strings/atof.c:
Changed to use my_global.h
strings/bchange.c:
Changed to use my_global.h
strings/bcmp.c:
Changed to use my_global.h
strings/bfill.c:
Changed to use my_global.h
strings/bmove.c:
Changed to use my_global.h
strings/bmove512.c:
Changed to use my_global.h
strings/bmove_upp.c:
Changed to use my_global.h
strings/ctype-big5.c:
Changed to use my_global.h
strings/ctype-czech.c:
Changed to use my_global.h
strings/ctype-euc_kr.c:
Changed to use my_global.h
strings/ctype-gb2312.c:
Changed to use my_global.h
strings/ctype-gbk.c:
Changed to use my_global.h
strings/ctype-latin1_de.c:
Fixed problem with LIKE
strings/ctype-sjis.c:
Changed to use my_global.h
strings/ctype-tis620.c:
Changed to use my_global.h
strings/ctype-ujis.c:
Changed to use my_global.h
strings/ctype.c:
Changed to use my_global.h
strings/do_ctype.c:
Changed to use my_global.h
strings/int2str.c:
Changed to use my_global.h
strings/is_prefix.c:
Changed to use my_global.h
strings/llstr.c:
Changed to use my_global.h
strings/longlong2str.c:
Changed to use my_global.h
strings/r_strinstr.c:
Changed to use my_global.h
strings/str2int.c:
Changed to use my_global.h
strings/str_test.c:
Changed to use my_global.h
strings/strappend.c:
Changed to use my_global.h
strings/strcend.c:
Changed to use my_global.h
strings/strcont.c:
Changed to use my_global.h
strings/strend.c:
Changed to use my_global.h
strings/strfill.c:
Changed to use my_global.h
strings/strings-not-used.h:
Changed to use my_global.h
strings/strinstr.c:
Changed to use my_global.h
strings/strmake.c:
Changed to use my_global.h
strings/strmov.c:
Changed to use my_global.h
strings/strnlen.c:
Changed to use my_global.h
strings/strnmov.c:
Changed to use my_global.h
strings/strstr.c:
Changed to use my_global.h
strings/strto.c:
Changed to use my_global.h
strings/strtol.c:
Changed to use my_global.h
strings/strtoll.c:
Changed to use my_global.h
strings/strtoul.c:
Changed to use my_global.h
strings/strtoull.c:
Changed to use my_global.h
strings/strxmov.c:
Changed to use my_global.h
strings/strxnmov.c:
Changed to use my_global.h
strings/udiv.c:
Changed to use my_global.h
tools/mysqlmanager.c:
Changed to use my_global.h
vio/test-ssl.c:
Changed to use my_global.h
vio/test-sslclient.c:
Changed to use my_global.h
vio/test-sslserver.c:
Changed to use my_global.h
vio/test-ssl:
Changed to use my_global.h
vio/vio.c:
Changed to use my_global.h
vio/viosocket.c:
Changed to use my_global.h
vio/viossl.c:
Changed to use my_global.h
vio/viosslfactories.c:
Changed to use my_global.h
vio/viotest-ssl.c:
Changed to use my_global.h
mysql-test/mysql-test-run.sh:
Make it work even if the character set used isn't compiled in to
mysqld.
Change the character set from latin1 to latin1_de.
Create innodb table space if configuring with InnoDB and not using --skip-innodb
Fixes for TRUNCATE TABLE and DROP DATABASE.
Docs/manual.texi:
Update of manual with 4.0 changes.
mysql-test/mysql-test-run.sh:
Fixed option --mysqld
mysql-test/r/innodb.result:
More test cases
mysql-test/r/truncate.result:
More test cases
mysql-test/t/drop.test:
More test cases
mysql-test/t/innodb.test:
More test cases
mysql-test/t/truncate.test:
More test cases
sql/gen_lex_hash.cc:
Smaller array
sql/ha_innobase.cc:
Create innodb table space if not using --skip-innodb
sql/lock.cc:
Fixed wrong mutex handling in global read lock.
sql/md5.c:
Fixed bug from merge
sql/sql_base.cc:
cleanup
sql/sql_db.cc:
Use new global lock functions.
Fixed new bug that database wasn't always dropped.
sql/sql_delete.cc:
Fixed problem with mysql_truncate() when called from restore_table
sql/sql_parse.cc:
Fixed error message handling.
sql/sql_table.cc:
cleanup
libmysqld/Makefile.am:
sql_unions -> sql_union
BitKeeper/etc/ignore:
Added libmysqld/sql_union.cc to the ignore list
mysql-test/mysql-test-run.sh:
fix to get path-independent logging
mysql-test/r/rpl_log.result:
fix for path-independent logging
sql/log.cc:
fixed compile error with USING_TRANSACTIONS
sql/log_event.h:
fixed compile error with USING_TRANSACTIONS
fixes for rpl_log test to make it config-independent
BitKeeper/etc/ignore:
Added mysql-test/r/rpl_log.eval to the ignore list
client/mysqltest.c:
support for eval_result and let $var = `query` syntax
mysql-test/Makefile.am:
import more variables into mysql-test-run
mysql-test/mysql-test-run.sh:
if we got wrong result on eval_result test case, diff against the
expanded result, not the template
mysql-test/r/rpl_log.result:
change config-dependent parts of the result to dynamic variables
mysql-test/t/rpl_log.test:
get server version from the server
remove obsoleted replace hack to solve port problem - use eval_result
instead
order directly from the index instead of using a filesort.
mysql-test/mysql-test-run.sh:
[ -n $SKIP_TEST ] --> [ -n "$SKIP_TEST" ]; portability fix
mysql-test/r/order_by.result:
Added test for ORDER BY DESC optimization
mysql-test/t/order_by.test:
Added test for ORDER BY DESC optimization
sql/opt_range.cc:
Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/opt_range.h:
Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/sql_select.cc:
Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
BitKeeper/etc/ignore:
Added .gdbinit .vimrc to the ignore list
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
updated rotate event to set new position along with the new log
mysql-test/mysql-test-run.sh:
added --do-test
mysql-test/r/rpl_log.result:
update for new rotate event format
sql/log_event.cc:
rotate event now supports forcing a new position, not just the log
sql/log_event.h:
clean-up of rotate event, support for position force with rotate event
sql/slave.cc:
accept position setting from rotate event
sql/sql_repl.cc:
updates to fake_rotate_event() for the new format
Changed mysql-test to use --language
Cleaned up parameters to filesort()
configure.in:
Fixed typo
mysql-test/install_test_db.sh:
Changed test case to use --language
mysql-test/mysql-test-run.sh:
Changed test case to use --language
Fixed that test names are not 'cut'-ed.
mysql-test/r/select_found.result:
Fixed test case to make it repeatable
mysql-test/t/insert.test:
Added test of unique key handling
mysql-test/t/order_fill_sortbuf.test:
Cleaned up test
mysql-test/t/select_found.test:
Fixed test case to make it repeatable
sql/filesort.cc:
Fixed bug when sorting big files (introduced with multi-table-delete)
cleaned up parameters.
sql/mysql_priv.h:
Cleaned up parameters to filesort()
sql/mysqld.cc:
Fixed typo on enum
sql/sql_delete.cc:
Cleanup
sql/sql_select.cc:
Cleanup
sql/sql_table.cc:
Cleanup
sql/sql_test.cc:
Cleanup
sql/sql_update.cc:
Cleanup
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
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
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:
Changelog
mysql-test/mysql-test-run.sh:
Added --skip-stack when using gdb
sql/mysqld.cc:
Changed reference to bugs@lists.mysql.com to manual reference.
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
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
Cleaned up error messages.
mysql-test/mysql-test-run.sh:
Added option --mysqld to send arguments to mysqld.
sql/ha_innobase.cc:
Shortended messages a bit to correspond to the rest of MySQL.
sql/mysqld.cc:
Changed innodb_unix_file_flush_method -> innodb_flush_method
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
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
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.
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
include/myisam.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Auto merged
client/mysqltest.c:
Auto merged
sql/lex.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
Docs/manual.texi:
merged
client/errmsg.c:
merged
configure.in:
merged
sql/mysqld.cc:
merged
sql/sql_select.cc:
merged, needs manual fixing
sql/sql_yacc.yy:
merged, needs manual fixing
Docs/manual.texi:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/log.cc:
Auto merged
sql/mysqlbinlog.cc:
Auto merged
sql/sql_class.h:
Auto merged
DROP DATABASE in mysqladmin asks for confirmation (again)
Added examined_rows to slow query log
SHOW CREATE for TEMPORARY table
BitKeeper/deleted/.del-shw000001.result~8b20b03d8319b9a5:
Delete: mysql-test/r/shw000001.result
BitKeeper/deleted/.del-shw000001.test~770d96a2c1c65b20:
Delete: mysql-test/t/shw000001.test
Docs/manual.texi:
Added information about InnoDB and TEMPORARY tables
acinclude.m4:
Portability fixes
client/errmsg.c:
merge with libmysqd/errmsg.c
client/mysqladmin.c:
DROP DATABASE asks for confirmation (again)
client/mysqltest.c:
Portability fixes
configure.in:
Portability fixes for SGI compiler on Ia64
extra/resolve_stack_dump.c:
Portability fixes
include/global.h:
Portability fixes
isam/_dbug.c:
Portability fixes
mysql-test/mysql-test-run.sh:
Portability fixes
mysql-test/r/show_check.result:
New test for SHOW CREATE
mysql-test/t/show_check.test:
New test for SHOW CREATE
scripts/make_binary_distribution.sh:
Added missing files
sql/filesort.cc:
Added examined_rows to slow query log
sql/log.cc:
Added examined_rows to slow query log
sql/mysql_priv.h:
Added examined_rows to slow query log
sql/mysqlbinlog.cc:
Fixed core dump when using wrong option
sql/mysqld.cc:
Removed not used argument
sql/sql_base.cc:
Fixed name problem with SHOW CREATE for TEMPORARY table
sql/sql_class.h:
Added examined_rows to slow query log
sql/sql_parse.cc:
Added examined_rows to slow query log
sql/sql_select.cc:
Added examined_rows to slow query log
sql/sql_select.h:
Added examined_rows to slow query log
sql/sql_show.cc:
Fixed SHOW CREATE for TEMPORARY table
sql/sql_table.cc:
Added examined_rows to slow query log
added support for virtual master ( replicating from a directory with binlogs)
test case for backup/restore with virtual master
client/mysqltest.c:
fix to accomodate for new test case
mysql-test/mysql-test-run.sh:
do not automagically start slave
sql/log.cc:
support for virtual master
sql/log_event.cc:
fix for mysqlbinlog
sql/log_event.h:
fix for mysqlbinlog
sql/mysqlbinlog.cc:
fix for mysqlbinlog
sql/slave.cc:
virtual master
sql/slave.h:
virtual master
sql/sql_class.h:
clean-up/fixes for virtual master
sql/sql_repl.cc:
cleanup/fixes for virtual master
sql/sql_repl.h:
virtual master
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
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
SCCS merged
sql/Makefile.am:
SCCS merged
added support for alphanumeric variables - import MASTER_MYPORT and
SLAVE_MYPORT from the environment
mysql-test/mysql-test-run.sh
export MASTER_MYPORT and SLAVE_MYPORT for mysqltest
mysql-test/t/rpl000015.test
use MASTER_MYPORT
mysql-test/t/rpl000016.test
use MASTER_MYPORT
client/mysqltest.c:
added support for alphanumeric variables - import MASTER_MYPORT and
SLAVE_MYPORT from the environment
mysql-test/mysql-test-run.sh:
export MASTER_MYPORT and SLAVE_MYPORT for mysqltest
mysql-test/t/rpl000015.test:
use MASTER_MYPORT
mysql-test/t/rpl000016.test:
use MASTER_MYPORT
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_delete.cc:
Auto merged
