BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
Auto merged
Build-tools/Bootstrap:
Auto merged
Build-tools/mysql-copyright:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
client/mysql.cc:
Auto merged
include/my_global.h:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/mtr0log.h:
Auto merged
innobase/include/mtr0log.ic:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/ut0dbg.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/ut/ut0dbg.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/conf_to_src.c:
Auto merged
libmysql/dll.c:
Auto merged
libmysql/errmsg.c:
Auto merged
libmysql/manager.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
myisam/mi_key.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/having.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/having.test:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/type_date.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/type_uint.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.h:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.
mysql-test/Makefile.am:
The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.
Putting a * before 001 so that it works for 6-digit extensions of 4.1.
configure.in:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/lex.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
dded init of variable to fix core dump on startup errors
mysql-test/Makefile.am:
Added transformation of socket address for mysql-test-run
mysql-test/mysql-test-run.sh:
Added option --socket
sql/derror.cc:
Removed compiler warning
sql/mysql_priv.h:
Moved assert up to be able to use asserts in other header files
sql/mysqld.cc:
Fixed comment
sql/sql_bitmap.h:
Added copyright notice
Removed not needed header files
sql/sql_class.cc:
Added init of variable to fix core dump on startup errors
sql/sql_test.cc:
Fixed compiler errors (from key_map code)
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
Honoring this parameters during connection to master.
Introduced new format of master.info file
include/mysqld_error.h:
Added error code for "slave without SSL ignored SSL params warning"
mysql-test/Makefile.am:
Copy files required for rpl_openssl test during the make process
mysql-test/r/rpl000015.result:
Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_empty_master_crash.result:
Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_flush_log_loop.result:
Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_log.result:
Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_log_pos.result:
Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_redirect.result:
Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_replicate_do.result:
Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_rotate_logs.result:
Added fields to SHOW SLAVE STATUS for replication over SSL
sql/lex.h:
Added MASTER_SSL lexems for CHANGE MASTER
sql/mysqld.cc:
Added --master-ssl-ca parameter. Fixed description of other master-ssl parameters
sql/repl_failsafe.cc:
Added SSL support to connect_to_master()
sql/share/czech/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/danish/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/dutch/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/english/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/estonian/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/french/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/german/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/greek/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/hungarian/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/italian/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/japanese/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/korean/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/norwegian-ny/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/norwegian/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/polish/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/portuguese/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/romanian/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/russian/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/serbian/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/slovak/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/spanish/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/swedish/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/share/ukrainian/errmsg.txt:
Added "slave without SSL ignored SSL params" warning
sql/slave.cc:
Introduced new format of master.info file
Added support of SSL params in master.info and SHOW SLAVE STATUS
Added support of SSL connections
sql/slave.h:
Added SSL parameters to MASTER_INFO
sql/sql_lex.h:
Added SSL parameters for CHANGE MASTER TO
sql/sql_repl.cc:
Added SSL parameters for CHANGE MASTER TO
sql/sql_yacc.yy:
Added SSL parameters for CHANGE MASTER TO
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/thr_lock.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/log_event.cc:
merge
sql/mysqld.cc:
merge
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
myisam/mi_open.c:
Fixed problem with wrongly calculated max_data_file_length
mysql-test/Makefile.am:
Added missing .require test files
scripts/mysqlhotcopy.sh:
Remove end / from directory names (portability fix)
tests/grant.res:
Update of test results
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
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
mysql.server is a script, not data.
Docs/Makefile.am:
Use INSTALL_DATA instead of cp
libmysql/Makefile.am:
Use INSTALL_DATA instead of cp
mysql-test/Makefile.am:
Use INSTALL_DATA instead of cp
sql-bench/Makefile.am:
Use INSTALL_DATA instead of cp
support-files/Makefile.am:
mysql.server is a script, not data.
Clean up $(INSTALL_DATA) use in sql/share.
mysql-test/Makefile.am:
Use $(INSTALL_DATA) instead of cp -p.
sql-bench/Makefile.am:
Use $(INSTALL_DATA) instead of cp -p.
sql/share/Makefile.am:
Use $(INSTALL_DATA), instead of for loop + basename.
Fixed mutex bug in logging (crash on windows when doing SET PASSWORD=)
Changed MERGE tables to not use FILE
BitKeeper/deleted/.del-m.MRG~3f5632c37af00f18:
Delete: mysql-test/std_data/m.MRG
BitKeeper/deleted/.del-m.frm~e351dfe0b6824c0c:
Delete: mysql-test/std_data/m.frm
Docs/manual.texi:
Added DNS section
configure.in:
Update to 3.23.32
include/Makefile.am:
Added my_config.h
include/mysql_com.h:
Changes for --with-server-suffix
include/mysql_version.h.in:
cleanup
merge/open.c:
Don't use FILE
mysql-test/Makefile.am:
removed not needed data files
mysql-test/r/merge.result:
generate merge file
mysql-test/t/merge.test:
generate merge file
sql-bench/Results/ATIS-mysql-NT_4.0:
New benchmark results
sql-bench/Results/RUN-mysql-NT_4.0:
New benchmark results
sql-bench/Results/alter-table-mysql-NT_4.0:
New benchmark results
sql-bench/Results/big-tables-mysql-NT_4.0:
New benchmark results
sql-bench/Results/connect-mysql-NT_4.0:
New benchmark results
sql-bench/Results/create-mysql-NT_4.0:
New benchmark results
sql-bench/Results/insert-mysql-NT_4.0:
New benchmark results
sql-bench/Results/select-mysql-NT_4.0:
New benchmark results
sql-bench/Results/wisconsin-mysql-NT_4.0:
New benchmark results
sql/log.cc:
Ensure that mutex are initialized before used
sql/log_event.h:
Changes for --with-server-suffix
sql/mysql_priv.h:
Changes for --with-server-suffix
sql/mysqlbinlog.cc:
Changes for --with-server-suffix
sql/mysqld.cc:
changed strnmov -> strmake
sql/net_pkg.cc:
Prepare for adding char-set conversion to SHOW commands
client/mysqldump.c:
Fixed to not use strncasecmp
client/mysqlimport.c:
Fixed to not use strncasecmp
mysql-test/Makefile.am:
Changes needed for RPM
mysql-test/mysql-test-run.sh:
Changes to work with binary installations
scripts/make_binary_distribution.sh:
Added missing mysql-test files
sql-bench/Makefile.am:
Changes needed for RPM
sql/mysqld.cc:
Portability fix
support-files/mysql.spec.sh:
Added mysql-test to sql-bench
mysql-test-run.sh fixes for distribution
Makefile.am Fixes for distribution
mysql-test/Makefile.am:
Fixes for distribution
mysql-test/mysql-test-run.sh:
fixes for distribution
mysql-test/install_test_db.sh:
fixes for distribution
BitKeeper/deleted/.del-README~b8e00a1b57b91f69:
***MISSING WEAVE***
BitKeeper/deleted/.del-README~2bddc2706d0834d0:
***MISSING WEAVE***
mysql-test/r/alt000001.result:
mvdir
mysql-test/r/ins000001.result:
mvdir
mysql-test/r/rpl000001.a.result:
mvdir
mysql-test/r/rpl000001.b.result:
mvdir
mysql-test/r/rpl000002.result:
mvdir
mysql-test/r/rpl000003.result:
mvdir
mysql-test/r/rpl000004.a.result:
mvdir
mysql-test/r/rpl000004.b.result:
mvdir
mysql-test/r/rpl000005.result:
mvdir
mysql-test/r/rpl000006.result:
mvdir
mysql-test/r/rpl000007.result:
mvdir
mysql-test/r/rpl000008.result:
mvdir
mysql-test/r/rpl000009.result:
mvdir
mysql-test/r/rpl000010.result:
mvdir
mysql-test/r/rpl000011.result:
mvdir
mysql-test/r/rpl000012.result:
mvdir
mysql-test/r/rpl000012.status.result:
mvdir
mysql-test/r/rpl000013.result:
mvdir
mysql-test/r/rpl000013.status.result:
mvdir
mysql-test/r/sel000001.result:
mvdir
mysql-test/r/sel000002.result:
mvdir
mysql-test/r/sel000003.result:
mvdir
mysql-test/r/sel000004.result:
mvdir
mysql-test/r/sel000005.result:
mvdir
mysql-test/r/sel000006.result:
mvdir
mysql-test/r/sel000007.result:
mvdir
mysql-test/r/sel000008.result:
mvdir
mysql-test/r/sel000009.result:
mvdir
mysql-test/r/sel000010.result:
mvdir
mysql-test/r/sel000011.result:
mvdir
mysql-test/r/sel000012.result:
mvdir
mysql-test/r/sel000013.result:
mvdir
mysql-test/r/sel000014.result:
mvdir
mysql-test/r/sel000015.result:
mvdir
mysql-test/r/sel000016.result:
mvdir
mysql-test/r/sel000017.result:
mvdir
mysql-test/r/sel000018.result:
mvdir
mysql-test/r/sel000019.result:
mvdir
mysql-test/r/sel000020.result:
mvdir
mysql-test/r/sel000021.result:
mvdir
mysql-test/r/sel000022.result:
mvdir
mysql-test/r/sel000023.result:
mvdir
mysql-test/r/sel000024.result:
mvdir
mysql-test/r/sel000025.result:
mvdir
mysql-test/r/sel000026.result:
mvdir
mysql-test/r/sel000027.result:
mvdir
mysql-test/r/sel000028.result:
mvdir
mysql-test/r/sel000029.result:
mvdir
mysql-test/r/sel000030.result:
mvdir
mysql-test/r/sel000100.result:
mvdir
mysql-test/r/shw000001.result:
mvdir
mysql-test/t/README:
mvdir
mysql-test/t/err000001.test:
mvdir
mysql-test/t/rpl000007-slave.opt:
mvdir
mysql-test/t/rpl000008-slave.opt:
mvdir
mysql-test/t/rpl000009-slave.opt:
mvdir
mysql-test/t/rpl000010-slave.opt:
mvdir
mysql-test/t/rpl000013-slave.opt:
mvdir
BitKeeper/deleted/.del-start-mysqld~9c8f21a7ab97793a:
***MISSING WEAVE***
BitKeeper/deleted/.del-stop-mysqld~89a1194045f05d1c:
***MISSING WEAVE***
BitKeeper/deleted/.del-translate-tests~3869c1fdf0a5ea1a:
***MISSING WEAVE***
BitKeeper/deleted/.del-README~108667adaeabe3f5:
***MISSING WEAVE***
BitKeeper/deleted/.del-README~c5aaceda4c2b1a8:
***MISSING WEAVE***
BitKeeper/deleted/.del-select-key.master~e6b83af25df0ce5:
***MISSING WEAVE***
mysql-test/std_data/words.dat:
Rename: mysql-test/std_data/words -> mysql-test/std_data/words.dat
BitKeeper/deleted/.del-simple-select.master~6f3eb98812926caf:
***MISSING WEAVE***
Makefile.am:
add mysql-test to distribution
configure.in:
added mysql-test
libmysql/Makefile.am:
include hash.h
libmysql/Makefile.shared:
add hash to libmysqlclient
mysql-test/Makefile.am:
mysql-test is now in source dist also
mysql-test/chew_on_this/select.res:
***MISSING WEAVE***
mysql-test/install_test_db:
renamed file, moved to different directory, and fixed up to work on binary dist
mysql-test/mysql-test-run:
clean-up of test suite, make it work on binary dist
mysql-test/t/alt000001.test:
moved directory
mysql-test/t/ins000001.test:
moved directory
mysql-test/t/rpl000001.test:
moved dir
mysql-test/t/rpl000002.test:
moved dir
mysql-test/t/rpl000003.test:
moved dir
mysql-test/t/rpl000004.test:
moved dir
mysql-test/t/rpl000005.test:
moved dir
mysql-test/t/rpl000006.test:
moved dir
mysql-test/t/rpl000007.test:
moved dir
mysql-test/t/rpl000008.test:
moved dir
mysql-test/t/rpl000009.test:
moved dir
mysql-test/t/rpl000010.test:
moved dir
mysql-test/t/rpl000011.test:
moved dir
mysql-test/t/rpl000012.test:
moved dir
mysql-test/t/rpl000013.test:
moved dir
mysql-test/t/sel000001.test:
moved dir
mysql-test/t/sel000002.test:
moved dir
BitKeeper/etc/ignore:
Added libmysql_r/hash.c scripts/mysql-3.23.29-gamma-pc-linux-gnu-i686.tar.gz to the ignore list
mysql-test/t/sel000003.test:
moved dir
mysql-test/t/sel000004.test:
moved dir
mysql-test/t/sel000005.test:
moved dir
mysql-test/t/sel000100.test:
moved dir
mysql-test/t/shw000001.test:
moved dir
scripts/make_binary_distribution.sh:
fixes to include mysql-test
added -debug option to exit after building temp dir before tar.gz
removed a bunch of SCCS files
