into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
heap/_check.c:
Auto merged
heap/hp_create.c:
Auto merged
include/config-netware.h:
Auto merged
include/my_base.h:
Auto merged
include/my_handler.h:
Auto merged
include/myisam.h:
Auto merged
innobase/include/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_delete.c:
Auto merged
myisam/mi_rnext_same.c:
Auto merged
myisam/mi_search.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/update.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/update.test:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/my_handler.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/records.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/structs.h:
Auto merged
strings/conf_to_src.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
Makefile.am:
Merged from 4.1
myisam/myisamchk.c:
Merged from 4.1
mysql-test/mysql-test-run.pl:
Merged from 4.1
mysql-test/r/insert_select.result:
Merged from 4.1
mysql-test/r/myisam.result:
Merged from 4.1
mysql-test/r/select.result:
Merged from 4.1
mysql-test/t/insert_select.test:
Merged from 4.1
mysql-test/t/myisam.test:
Merged from 4.1
netware/mysql_test_run.c:
Merged from 4.1
sql/item.cc:
Merged from 4.1
sql/mysqld.cc:
Merged from 4.1
sql/sql_update.cc:
Merged from 4.1
tests/mysql_client_test.c:
Merged from 4.1
distribution when running "make dist"
innobase/include/Makefile.am:
- added file trx0xa.h which was missing from the source distribution when
running "make dist"
BitKeeper/deleted/.del-ib_odbc.h~6882a6fe66f9b3e:
Delete: innobase/include/ib_odbc.h
BitKeeper/deleted/.del-odbc0odbc.h~6cdf5ecedbf3b3f0:
Delete: innobase/include/odbc0odbc.h
innobase/include/Makefile.am:
Remove odbc0odbc.h and ib_odbc.h
innobase/srv/srv0srv.c:
Remove reference to odbc0odbc.h
innobase/include/pars0pars.h:
Remove unused functions related to ODBC and stored procedures
Made pars_print_lexed conditional [UNIV_SQL_DEBUG]
innobase/pars/pars0pars.c:
Remove unused functions related to ODBC and stored procedures
Made pars_print_lexed conditional [UNIV_SQL_DEBUG]
Output to stderr instead of stdout
BitKeeper/deleted/.del-Makefile.am~2b013aa835a140c4:
Delete: innobase/com/Makefile.am
BitKeeper/deleted/.del-com0com.c~473a1f0f440ce91b:
Delete: innobase/com/com0com.c
BitKeeper/deleted/.del-com0shm.c~6a16f0c3d81de1f:
Delete: innobase/com/com0shm.c
BitKeeper/deleted/.del-makefilewin~3e26f0df100887f2:
Delete: innobase/com/makefilewin
BitKeeper/deleted/.del-com0com.h~533a7eaa16ec585a:
Delete: innobase/include/com0com.h
BitKeeper/deleted/.del-com0com.ic~671e309916e285b:
Delete: innobase/include/com0com.ic
BitKeeper/deleted/.del-com0shm.h~5f3df7c04221b0fe:
Delete: innobase/include/com0shm.h
BitKeeper/deleted/.del-com0shm.ic~f827cfca1603fa6b:
Delete: innobase/include/com0shm.ic
innobase/configure.in:
Remove com/Makefile
innobase/include/Makefile.am:
Remove com*.h
innobase/include/usr0sess.h:
Remove unused communication functions
innobase/include/usr0sess.ic:
Remove unused communication functions
innobase/include/usr0types.h:
Remove sess_sys_t and sess_sig_t
innobase/usr/usr0sess.c:
Remove unused functions
innobase/dict/dict0crea.c:
Remove unneeded params of que_fork_start_command()
innobase/include/que0que.h:
Remove unneeded params of que_fork_start_command()
innobase/row/row0mysql.c:
Remove unneeded params of que_fork_start_command()
innobase/include/srv0srv.h:
Remove references to the com module
innobase/srv/srv0srv.c:
Remove references to the com module
Remove unused vars srv_n_{com,worker}_threads
Make some global vars static
innobase/que/que0que.c:
Remove references to odbc
Add #ifdef UNIV_SYNC_DEBUG around some ut_ad()
Remove unneeded params of que_fork_start_command()
Remove unreachable code
Output diagnostics to stderr, not stdout
innobase/include/trx0trx.h:
Remove unneeded params of trx_sig_send() and trx_sig_reply()
innobase/trx/trx0trx.c:
Remove unneeded params of trx_sig_send() and trx_sig_reply()
Remove params of sess_open()
innobase/srv/srv0start.c:
Remove reference to com0com.h
Remove call to sess_sys_init_at_db_start()
innobase/trx/trx0purge.c:
Remove references to the com module
Remove params of sess_open()
Remove unneeded params of que_fork_start_command()
innobase/trx/trx0roll.c:
Remove params of sess_open()
Remove unneeded params of que_fork_start_command()
Remove unneeded params of trx_sig_send() and trx_sig_reply()
Remove leading whitespace from lines containing preprocessor directives
Makefile.am:
Remove univold.i and univoldmysql.i
innobase/include/Makefile.am:
Remove univold.i and univoldmysql.i
innobase/buf/buf0buf.c:
Remove leading whitespace from lines containing preprocessor directives
innobase/include/mem0mem.ic:
Remove leading whitespace from lines containing preprocessor directives
innobase/include/sync0rw.ic:
Remove leading whitespace from lines containing preprocessor directives
innobase/include/sync0sync.ic:
Remove leading whitespace from lines containing preprocessor directives
innobase/include/ut0rnd.ic:
Remove leading whitespace from lines containing preprocessor directives
innobase/mem/mem0dbg.c:
Remove leading whitespace from lines containing preprocessor directives
innobase/mem/mem0mem.c:
Remove leading whitespace from lines containing preprocessor directives
innobase/sync/sync0rw.c:
Remove leading whitespace from lines containing preprocessor directives
innobase/sync/sync0sync.c:
Remove leading whitespace from lines containing preprocessor directives
Print full command name to log files
Convert table type to supported onces on ALTER TABLE
Docs/manual.texi:
Updates from user comments
bdb/log/log_rec.c:
Patch from sleepycat to fix problem with log files
innobase/ibuf/Makefile.am:
Don't let make do bk get
innobase/include/Makefile.am:
Don't let make do bk get
man/Makefile.am:
Don't let make do bk get
myisam/mi_dbug.c:
Print warning to debug log
mysql-test/mysql-test-run.sh:
Don't use innobase in replica
mysql-test/r/null_key.result:
Fix for new key lengths
sql/ha_innobase.cc:
Free hash cache at end
sql/log.cc:
Print full command name to log files
sql/sql_table.cc:
Convert table type to supported onces on ALTER TABLE
