Docs/manual.texi:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
SCCS merged
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
(For glibc 2.2)
client/thread_test.c:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
dbug/dbug.c:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
heap/hp_open.c:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
isam/open.c:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
myisam/mi_open.c:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
mysys/thr_alarm.c:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
mysys/thr_lock.c:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
mysys/thr_rwlock.c:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/ha_berkeley.cc:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/ha_innobase.cc:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/hash_filo.h:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/hostname.cc:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/item_func.cc:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/log.cc:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/mysqld.cc:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/slave.h:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_class.cc:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_class.h:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_insert.cc:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_udf.cc:
Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
Fix bug when read return error
acconfig.h:
Add Gemini to configure
acinclude.m4:
Add Gemini to configure
include/my_base.h:
Add error codes for tables handlers
mysql-test/t/select.test:
Force temporary tables to MyISAM
sql-bench/server-cfg.sh:
Allow Gemini to run sql-bench
sql/Makefile.am:
Add Gemini to configure
sql/handler.cc:
Add support for Gemini table handler
sql/handler.h:
Add support for Gemini table handler
sql/lex.h:
Add support for Gemini table handler
sql/mysqld.cc:
Add support for Gemini table handler
sql/opt_range.cc:
Fix bug when read return error
sql/records.cc:
Fix bug when read return error
sql/sql_class.cc:
Add support for Gemini table handler
sql/sql_class.h:
Add support for Gemini table handler
sql/sql_lex.h:
Add support for Gemini table handler
sql/sql_rename.cc:
Add commit for table rename
sql/sql_table.cc:
Add commit for table rename
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Added SELECT .. FOR UPDATE and SELECT .. IN SHARE MODE
Docs/manual.texi:
Updated information about SET TRANSACTION ISOLATION LEVEL
configure.in:
Upgraded version number
isam/_dbug.c:
Fixed wrong fprintf
isam/isamchk.c:
Added new error message
myisam/mi_check.c:
Added new error message
mysql-test/mysql-test-run.sh:
Don't wait too long for server start
mysys/mf_keycache.c:
Cleaned up some error messages
scripts/mysqlhotcopy.sh:
Applied patch for --resetmaster --resetslave
sql-bench/bench-init.pl.sh:
Fix for windows
sql/handler.cc:
Added isolation levels and gemini spinlocks
sql/handler.h:
Added isolation levels
sql/item_strfunc.cc:
Cleanup of CONCAT_WS()
sql/lex.h:
Added isolation levels
sql/mysql_priv.h:
Added isolation levels
sql/mysqld.cc:
Added isolation levels
sql/sql_class.cc:
Added isolation levels
Moved variable initialization to different code segments
sql/sql_class.h:
Added isolation levels
sql/sql_lex.h:
Added isolation levels
sql/sql_parse.cc:
Added isolation levels
sql/sql_update.cc:
cleanup
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Docs/manual.texi:
Updated info about some common problems.
mysql-test/r/user_var.result:
Added tests of using user variables.
mysql-test/t/user_var.test:
Added tests of using user variables.
added support for kill expr
fixed coredump in set @a := foo;
added testcase for user_var
added testcase for kill
sql/slave.cc:
fd -> vio
sql/sql_class.cc:
fd->vio, fixed coredump on set @a := foo;
sql/sql_class.h:
fd -> vio
sql/sql_repl.cc:
fd -> vio
sql/sql_yacc.yy:
added support for kill expr - needed this for a clean test case of kill
interrupt I/O after thr_alarm_kill()
test case for order by desc coredump
mysql-test/t/order_by.test:
added test case for order by desc bug
sql/slave.cc:
close socket on slave stop
sql/slave.h:
close socket on slave stop
sql/sql_class.cc:
close socket on slave stop
sql/sql_class.h:
close socket on slave stop
sql/sql_parse.cc:
changed kill_one_thread to use prepare_to_die()
sql/sql_repl.cc:
close socket on slave stop
Docs/manual.texi:
Added News section for 3.23.35, and change notes for SQL_ANSI_MODE.
sql/gen_lex_hash.cc:
Fixed typo.
Updated the values, so the parser can be created.
sql/mysql_priv.h:
Added ``global_state_map'' from sql_lex.cc.
sql/sql_class.h:
Added ``state_map'' to THD. This is a per-thread state map for lex.
sql/sql_lex.cc:
Renamed ``state_map'' to ``global_state_map''.
Changed yylex() to use the new per-thread state map.
sql/sql_parse.cc:
Copy global_state_map into thd->state_map on thread start.
sql/sql_yacc.yy:
Added SQL_ANSI_MODE.
Cleaned up some.
Docs/manual.texi:
Changed TCX -> MySQL AB
configure.in:
New version
include/my_sys.h:
Fixes for OS2
ltconfig:
Fixes for OS2
ltmain.sh:
Fixes for OS2
mit-pthreads/net/net_internal.h:
Fixes for OPENBSD
mit-pthreads/net/proto_internal.h:
Fixes for OPENBSD
mit-pthreads/net/res_internal.h:
Fixes for OPENBSD
mit-pthreads/net/serv_internal.h:
Fixes for OPENBSD
myisammrg/myrg_open.c:
MERGE didn't work on Windows
mysys/my_getwd.c:
Fixes for OS2
sql/field.cc:
cleanup
sql/field.h:
Fix for new SCO compiler
sql/ha_berkeley.cc:
Cleanup
sql/ha_berkeley.h:
Portability fix
sql/item_sum.h:
Fix for new SCO compiler
sql/log.cc:
Fixes for OS2
sql/log_event.h:
Fixes for OS2
sql/mysqld.cc:
Fixes for OS2
sql/net_serv.cc:
Fixes for OS2
sql/sql_analyse.h:
Fix for new SCO compiler
sql/sql_class.h:
Fix for new SCO compiler
sql/sql_map.h:
Fix for new SCO compiler
sql/sql_repl.cc:
cleanup
sql/sql_string.h:
Fix for new SCO compiler
sql/sql_table.cc:
cleanup
strings/longlong2str-x86.s:
Fixes for openbsd
rpl000014.test fixed bug in testcase
rename.test fixed cleanup problem
handler.cc added a comment
sql_class.h fixed bug in active_transaction() when MySQL was not compiled with transaction support
mysql-test/t/rename.test:
fixed cleanup problem
mysql-test/t/rpl000014.test:
fixed bug in testcase
mysql-test/t/show_check.test:
fixed cleanup problem
sql/handler.cc:
added a comment
sql/sql_class.h:
fixed bug in active_transaction() when MySQL was not compiled with transaction support
rpl000014.test fixed bug in testcase
rename.test fixed cleanup problem
handler.cc added a comment
sql_class.h fixed bug in active_transaction() when MySQL was not compiled with transaction support
Fixed test results.
Added mysqld variable 'have_isam'
BitKeeper/deleted/.del-master-slave.inc~556fd038c3a3d54:
Delete: mysql-test/t/include/master-slave.inc
BitKeeper/deleted/.del-README~f9fd36f3c3711305:
Delete: mysql-test/r/3.23/README
Docs/manual.texi:
Fixed typos
client/mysqltest.c:
Changed internal commands to accept -- before them.
Added command 'require' to make it possible to skip tests if the
mysqld server lacks some capabilites.
Removed extra \t at end of lines
configure.in:
Update
myisam/myisamlog.c:
cleanup
mysql-test/mysql-test-run.sh:
Added support for 'not supported' tests
mysql-test/r/alt000001.result:
Removed end tab
mysql-test/r/bdb.result:
Removed end tab
mysql-test/r/crypt.result:
Removed end tab
mysql-test/r/equal.result:
Removed end tab
mysql-test/r/ft0000001.a.result:
Removed end tab
mysql-test/r/ft0000001.b.result:
Removed end tab
mysql-test/r/ft0000001.c.result:
Removed end tab
mysql-test/r/ft0000001.d.result:
Removed end tab
mysql-test/r/ft0000001.e.result:
Removed end tab
mysql-test/r/ft0000002.a.result:
Removed end tab
mysql-test/r/ft0000002.b.result:
Removed end tab
mysql-test/r/ft0000002.c.result:
Removed end tab
mysql-test/r/ins000001.result:
Removed end tab
mysql-test/r/mrg000001.dummy.result:
Removed end tab
mysql-test/r/mrg000001.result:
Removed end tab
mysql-test/r/mrg000002.result:
Removed end tab
mysql-test/r/rpl000001.a.result:
Removed end tab
mysql-test/r/rpl000001.b.result:
Removed end tab
mysql-test/r/rpl000002.result:
Removed end tab
mysql-test/r/rpl000003.result:
Removed end tab
mysql-test/r/rpl000004.a.result:
Removed end tab
mysql-test/r/rpl000004.b.result:
Removed end tab
mysql-test/r/rpl000005.result:
Removed end tab
mysql-test/r/rpl000006.result:
Removed end tab
mysql-test/r/rpl000007.result:
Removed end tab
mysql-test/r/rpl000008.result:
Removed end tab
mysql-test/r/rpl000009.result:
Removed end tab
mysql-test/r/rpl000010.result:
Removed end tab
mysql-test/r/rpl000011.result:
Removed end tab
mysql-test/r/rpl000012.result:
Removed end tab
mysql-test/r/rpl000012.status.result:
Removed end tab
mysql-test/r/rpl000013.result:
Removed end tab
mysql-test/r/rpl000013.status.result:
Removed end tab
mysql-test/r/rpl000014.result:
Removed end tab
mysql-test/r/rpl000015.result:
Removed end tab
mysql-test/r/rpl000016.result:
Removed end tab
mysql-test/r/sel000001.result:
Removed end tab
mysql-test/r/sel000002.result:
Removed end tab
mysql-test/r/sel000003.result:
Removed end tab
mysql-test/r/sel000004.result:
Removed end tab
mysql-test/r/sel000005.result:
Removed end tab
mysql-test/r/sel000006.result:
Removed end tab
mysql-test/r/sel000007.result:
Removed end tab
mysql-test/r/sel000008.result:
Removed end tab
mysql-test/r/sel000009.result:
Removed end tab
mysql-test/r/sel000010.result:
Removed end tab
mysql-test/r/sel000011.result:
Removed end tab
mysql-test/r/sel000012.result:
Removed end tab
mysql-test/r/sel000013.result:
Removed end tab
mysql-test/r/sel000014.result:
Removed end tab
mysql-test/r/sel000015.result:
Removed end tab
mysql-test/r/sel000016.result:
Removed end tab
mysql-test/r/sel000017.result:
Removed end tab
mysql-test/r/sel000018.result:
Removed end tab
mysql-test/r/sel000019.result:
Removed end tab
mysql-test/r/sel000020.result:
Removed end tab
mysql-test/r/sel000021.result:
Removed end tab
mysql-test/r/sel000022.result:
Removed end tab
mysql-test/r/sel000023.result:
Removed end tab
mysql-test/r/sel000024.result:
Removed end tab
mysql-test/r/sel000025.result:
Removed end tab
mysql-test/r/sel000026.result:
Removed end tab
mysql-test/r/sel000027.result:
Removed end tab
mysql-test/r/sel000028.result:
Removed end tab
mysql-test/r/sel000029.result:
Removed end tab
mysql-test/r/sel000030.result:
Removed end tab
mysql-test/r/sel000031.result:
Removed end tab
mysql-test/r/sel000032.result:
Removed end tab
mysql-test/r/sel000033.result:
Removed end tab
mysql-test/r/sel000100.result:
Removed end tab
mysql-test/r/shw000001.result:
Removed end tab
mysql-test/r/slave-running.result:
Removed end tab
mysql-test/r/slave-stopped.result:
Removed end tab
mysql-test/t/bdb.test:
Check that we have BDB support
mysql-test/t/replace.test:
Check if we support ISAM tables
sql/gen_lex_hash.cc:
Fixed bug in last output
sql/ha_berkeley.cc:
Bug fix
sql/ha_berkeley.h:
Initialize using_ignore
sql/handler.h:
Fixed typo
sql/mysqld.cc:
Fixed typos; Added variable 'have_isam'
sql/sql_class.h:
Fixed typo
BitKeeper/etc/ignore:
Added sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686 to the ignore list