Fixes after last merge from 4.0.
(Code not yet complete, need anoter merge from 4.0)
heap/hp_write.c:
cleanup
myisam/ft_boolean_search.c:
Fixed tree handling to new format
mysql-test/r/alter_table.result:
SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/r/func_math.result:
Updated results
mysql-test/r/heap_btree.result:
Portability fix
mysql-test/r/isam.result:
SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/r/show_check.result:
SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/t/heap_btree.test:
Portability fix
mysql-test/t/show_check.test:
SHOW FULL COLUMN FROM TABLE now returns comment
sql/field.cc:
Fix for comment handling
sql/field.h:
Added CHARSET_INFO to field structure
sql/item_cmpfunc.cc:
Fixed like to use system charset (need to be updated)
sql/item_func.cc:
Update to new charset handling
sql/mysql_priv.h:
cleanup
sql/sql_base.cc:
Added charset to HA_CREATE_INFO
sql/sql_delete.cc:
Added charset to HA_CREATE_INFO
sql/sql_parse.cc:
Added charset to HA_CREATE_INFO
sql/sql_select.cc:
cleanup
sql/sql_show.cc:
charset change
sql/sql_string.h:
cleanup
sql/sql_table.cc:
cleanup
sql/sql_yacc.yy:
Go back to old code for ALTER table ... MODIFY
sql/table.cc:
fixed comment handling
sql/unireg.cc:
new field format
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
BUILD/compile-pentium-debug:
Auto merged
BitKeeper/triggers/post-commit:
Auto merged
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/mysql_install.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
extra/resolveip.c:
Auto merged
include/my_sys.h:
Auto merged
include/mysqld_error.h:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/ft_dump.c:
Auto merged
myisam/ft_test1.c:
Auto merged
myisam/ftdefs.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysys/charset.c:
Auto merged
mysys/default.c:
Auto merged
mysys/hash.c:
Auto merged
sql/field.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/hostname.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.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/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/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/sql_update.cc:
Auto merged
sql/structs.h:
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
strings/Makefile.am:
Auto merged
strings/ctype-ujis.c:
Auto merged
tools/mysqlmanager.c:
Auto merged
BitKeeper/deleted/.del-rpl_empty_master_crash.result:
Delete: mysql-test/r/rpl_empty_master_crash.result
BitKeeper/deleted/.del-rpl_empty_master_crash.test:
Delete: mysql-test/t/rpl_empty_master_crash.test
configure.in:
Auto merged
include/my_net.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysys/my_gethostbyname.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
Change TRUNCATE(number) to truncate towards zero for negative numbers
Fix NULL handling for DESCRIBE table_name
Docs/manual.texi:
Update of TRUNCATE() information
configure.in:
Fix for HPUX
extra/resolveip.c:
Fix for SCO
include/my_net.h:
Fix for HPUX
libmysql/libmysql.c:
Removed warning on HPUX 10.20
mysql-test/r/func_math.result:
Test of new TRUNCATE handling
mysql-test/t/func_math.test:
Test of new TRUNCATE handling
mysys/my_gethostbyname.c:
Portability fix
sql/item_func.cc:
Change TRUNCATE(number) to truncate towards zero for negative numbers
sql/sql_show.cc:
Fix NULL handling for DESCRIBE table_name
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-identity.result~e41453a364242503:
Auto merged
BitKeeper/deleted/.del-identity.test~326f469b59105404:
Auto merged
include/my_pthread.h:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/pars/pars0opt.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/func_test.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/my_pthread.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/sql_show.cc:
Auto merged
sql/share/italian/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
Cleanup of LIBWRAP handling
Docs/manual.texi:
Changelog
include/my_pthread.h:
Fixed pthread_cond_timedwait() for HPUX and DCE threads
mysys/my_pthread.c:
Fixed pthread_cond_timedwait() for HPUX and DCE threads
sql/item_func.cc:
Fixed the GET_LOCK() works with HPUX and DCE threads
sql/mysqld.cc:
Cleanup of LIBWRAP handling
sql/sql_parse.cc:
Safety fix
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/FINISH.sh:
Auto merged
BUILD/SETUP.sh:
Auto merged
BUILD/compile-pentium-debug:
Auto merged
acconfig.h:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
heap/hp_rfirst.c:
Auto merged
heap/hp_rnext.c:
Auto merged
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
myisam/mi_write.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysql-test/t/union.test:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/my_vsnprintf.c:
Auto merged
sql/convert.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
strings/Makefile.am:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
readline/Makefile.am:
Auto merged
sql/convert.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.h:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
configure.in:
Auto merged
include/mysql_com.h:
Auto merged
innobase/btr/btr0btr.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/fsp/fsp0fsp.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/sync0rw.ic:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/range.test:
Auto merged
scripts/mysqldumpslow.sh:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/lock.cc:
Auto merged
sql/share/Makefile.am:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Docs/manual.texi:
merge
client/mysql.cc:
merge
client/mysqldump.c:
merge
innobase/buf/buf0buf.c:
merge
innobase/os/os0file.c:
merge
innobase/row/row0mysql.c:
merge
mysql-test/r/range.result:
merge
sql/ha_innodb.cc:
merge
sql/log_event.h:
merge
sql/mysqld.cc:
merge
sql/sql_base.cc:
merge
sql/sql_load.cc:
merge
Docs/manual.texi:
Changelog
myisam/myisampack.c:
Delete tmp file on error.
mysql-test/r/range.result:
Updated test case
mysql-test/t/range.test:
Updated test case
Fixes in charset related C++ code
configure.in:
Make things to be easier managable
include/m_ctype.h:
Hide some functions under conditional compilation
libmysql/Makefile.shared:
Make things to be easier managable
sql/item_func.cc:
Fixed that private member is not available in this context
sql/item_strfunc.cc:
Fixed that private member is not available in this context
strings/Makefile.am:
Make charset things to be easier managable
Some fixes in charset C++ code
strings/ctype-big5.c:
Hide some functions under conditional compilation
strings/ctype-czech.c:
Hide some functions under conditional compilation
strings/ctype-euc_kr.c:
Hide some functions under conditional compilation
strings/ctype-gb2312.c:
Hide some functions under conditional compilation
strings/ctype-gbk.c:
Hide some functions under conditional compilation
strings/ctype-latin1_de.c:
Hide some functions under conditional compilation
strings/ctype-mb.c:
Hide some functions under conditional compilation
strings/ctype-sjis.c:
Hide some functions under conditional compilation
strings/ctype-tis620.c:
Hide some functions under conditional compilation
strings/ctype-ujis.c:
Hide some functions under conditional compilation
client/mysql.cc:
new ctypes
client/mysqldump.c:
new ctypes
client/mysqltest.c:
new ctypes
client/sql_string.cc:
new ctypes
client/sql_string.h:
new ctypes
extra/mysql_install.c:
new ctypes
extra/replace.c:
new ctypes
extra/resolve_stack_dump.c:
new ctypes
extra/resolveip.c:
new ctypes
heap/hp_hash.c:
new ctypes
include/m_ctype.h:
new ctypes
include/my_sys.h:
new ctypes
isam/_key.c:
new ctypes
isam/_search.c:
new ctypes
libmysql/Makefile.shared:
new ctypes
libmysql/libmysql.c:
new ctypes
myisam/ft_dump.c:
new ctypes
myisam/ft_parser.c:
new ctypes
myisam/mi_test1.c:
new ctypes
mysys/charset.c:
new ctypes
mysys/default.c:
new ctypes
mysys/getvar.c:
new ctypes
mysys/hash.c:
new ctypes
mysys/mf_casecnv.c:
new ctypes
mysys/mf_dirname.c:
new ctypes
mysys/mf_format.c:
new ctypes
mysys/mf_iocache2.c:
new ctypes
mysys/mf_soundex.c:
new ctypes
mysys/mf_wfile.c:
new ctypes
mysys/my_error.c:
new ctypes
mysys/my_getwd.c:
new ctypes
mysys/my_init.c:
new ctypes
mysys/my_vsnprintf.c:
new ctypes
mysys/typelib.c:
new ctypes
sql/convert.cc:
new ctypes
sql/des_key_file.cc:
new ctypes
sql/field.cc:
new ctypes
sql/field.h:
new ctypes
sql/field_conv.cc:
new ctypes
sql/filesort.cc:
new ctypes
sql/ha_innodb.cc:
new ctypes
sql/hostname.cc:
new ctypes
sql/init.cc:
new ctypes
sql/item.cc:
new ctypes
sql/item_func.cc:
new ctypes
sql/item_strfunc.cc:
new ctypes
sql/item_sum.cc:
new ctypes
sql/item_timefunc.cc:
new ctypes
sql/key.cc:
new ctypes
sql/log.cc:
new ctypes
sql/mysql_priv.h:
new ctypes
sql/mysqld.cc:
new ctypes
sql/opt_range.cc:
new ctypes
sql/procedure.cc:
new ctypes
sql/slave.cc:
new ctypes
sql/sql_acl.cc:
new ctypes
sql/sql_analyse.cc:
new ctypes
sql/sql_base.cc:
new ctypes
sql/sql_cache.cc:
new ctypes
sql/sql_db.cc:
new ctypes
sql/sql_handler.cc:
new ctypes
sql/sql_lex.cc:
new ctypes
sql/sql_parse.cc:
new ctypes
sql/sql_show.cc:
new ctypes
sql/sql_string.cc:
new ctypes
sql/sql_string.h:
new ctypes
sql/sql_table.cc:
new ctypes
sql/sql_yacc.yy:
new ctypes
sql/table.cc:
new ctypes
sql/time.cc:
new ctypes
strings/Makefile.am:
new ctypes
strings/ctype-big5.c:
new ctypes
strings/ctype-czech.c:
new ctypes
strings/ctype-gbk.c:
new ctypes
strings/ctype-latin1_de.c:
new ctypes
strings/ctype-sjis.c:
new ctypes
strings/ctype-tis620.c:
new ctypes
strings/ctype.c:
new ctypes
strings/str2int.c:
new ctypes
strings/strto.c:
new ctypes
tools/mysqlmanager.c:
new ctypes
mysql-test/r/fulltext.result:
test added
mysql-test/t/fulltext.test:
test added
sql/item_func.cc:
fulltext+const_table problem fixed once and forever
sql/item_func.h:
fulltext+const_table problem fixed once and forever
sql/sql_select.cc:
fulltext+const_table problem fixed once and forever
sql/table.h:
fulltext+const_table problem fixed once and forever
include/my_global.h:
added dbug_volatile
mysys/mf_iocache2.c:
some debugging code to investigate failed assert in my_b_append_tell()
sql/item_func.cc:
fixed logging bug in DO RELEASE_LOCK()
Docs/manual.texi:
More information about UNSIGNED BIGINT arithmetic
sql/slave.cc:
Make binary logs 4G safe
sql/slave.h:
Make binary logs 4G safe
sql/sql_rename.cc:
cleanup
before I can push
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
include/my_sys.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/t/rpl_log.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/thr_mutex.c:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/mini_client.cc:
Auto merged
sql/mini_client.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/structs.h:
Auto merged
mysql-test/r/rpl000014.result:
merge
mysql-test/r/rpl000015.result:
merge
mysql-test/r/rpl000016.result:
merge
mysql-test/r/rpl_log.result:
merge
sql/log.cc:
merge
sql/log_event.cc:
merge
sql/log_event.h:
merge
sql/mysqld.cc:
merge
sql/slave.cc:
merge
sql/slave.h:
merge
sql/sql_class.h:
merge
sql/sql_parse.cc:
merge
sql/sql_repl.cc:
merge
sql/sql_yacc.yy:
merge
first pull, merge,test, and get it to work.
The main change is the new replication code - now we have two slave threads
SQL thread and I/O thread. I have also re-written a lot of the code to
prepare for multi-master implementation.
I also documented IO_CACHE quite extensively and to some extend, THD class.
Makefile.am:
moved tags target script into a separate file
include/my_sys.h:
fixes in IO_CACHE for SEQ_READ_APPEND + some documentation
libmysqld/lib_sql.cc:
updated replication locks, but now I see I did it wrong and it won't compile. Will fix
before the push.
mysql-test/r/rpl000014.result:
test result update
mysql-test/r/rpl000015.result:
test result update
mysql-test/r/rpl000016.result:
test result update
mysql-test/r/rpl_log.result:
test result update
mysql-test/t/rpl000016-slave.sh:
remove relay logs
mysql-test/t/rpl000017-slave.sh:
remove relay logs
mysql-test/t/rpl_log.test:
updated test
mysys/mf_iocache.c:
IO_CACHE updates to make replication work
mysys/mf_iocache2.c:
IO_CACHE update to make replication work
mysys/thr_mutex.c:
cosmetic change
sql/item_func.cc:
new replication code
sql/lex.h:
new replication
sql/log.cc:
new replication
sql/log_event.cc:
new replication
sql/log_event.h:
new replication
sql/mini_client.cc:
new replication
sql/mini_client.h:
new replication
sql/mysql_priv.h:
new replication
sql/mysqld.cc:
new replication
sql/repl_failsafe.cc:
new replication
sql/slave.cc:
new replication
sql/slave.h:
new replication
sql/sql_class.cc:
new replication
sql/sql_class.h:
new replication
sql/sql_lex.h:
new replication
sql/sql_parse.cc:
new replication
sql/sql_repl.cc:
new replication
sql/sql_repl.h:
new replication
sql/sql_show.cc:
new replication
sql/sql_yacc.yy:
new replication
sql/stacktrace.c:
more robust stack tracing
sql/structs.h:
new replication code
BitKeeper/etc/ignore:
Added mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval mysql-test/r/rpl000015.eval mysql-test/r/rpl000016.eval mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval to the ignore list
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
extra/resolveip.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/my_bitmap.c:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/ha_innobase.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_do.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysqldump.c:
Use local version in 4.0
configure.in:
Use 4.0 code
Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX.
BUILD/FINISH.sh:
Fixes for gcc 3.0
BUILD/SETUP.sh:
Fixes for gcc 3.0
Docs/manual.texi:
Changelog + SIGNED/UNSIGNED casts.
Makefile.am:
include BUILD scripts in source distribution.
client/Makefile.am:
Fixes for gcc 3.0
client/mysql.cc:
Cleanup
client/mysqldump.c:
Changed 'K' to mean 'disable-keys' instead of 'no-disabled-keys'
client/readline.cc:
Cleanup
configure.in:
Include BUILD in source distrbution
extra/my_print_defaults.c:
Cleanup
include/my_global.h:
Fix for HPUX and setrlimit.
Portability fix.
Added macros for nice TIMESPEC usage.
innobase/include/dyn0dyn.h:
Fix for AIX
libmysql/Makefile.shared:
Added strxmov to libmysqld
libmysqld/examples/Makefile.am:
Fixes for gcc 3.0
libmysqld/lib_vio.c:
Cleanup
myisam/ft_dump.c:
Portability fixes
myisam/ftdefs.h:
Portability fixes
mysql-test/r/bdb.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/bigint.result:
New test for SIGNED/UNSIGNED
mysql-test/r/fulltext.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/heap.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/innodb.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/isam.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/key.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/myisam.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/query_cache.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/select.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/show_check.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/type_ranges.result:
Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/t/bigint.test:
New test for SIGNED/UNSIGNED
mysql-test/t/key.test:
New test for SIGNED/UNSIGNED
mysql-test/t/query_cache.test:
Test for FOUND_ROWS()
sql-bench/crash-me.sh:
Safety fixes
sql/derror.cc:
Cleanup
sql/ha_berkeley.h:
New test for SIGNED/UNSIGNED
sql/ha_heap.h:
New test for SIGNED/UNSIGNED
sql/ha_innobase.cc:
New test for SIGNED/UNSIGNED
sql/ha_innobase.h:
New test for SIGNED/UNSIGNED
sql/ha_isam.h:
New test for SIGNED/UNSIGNED
sql/ha_myisam.cc:
New test for SIGNED/UNSIGNED
sql/ha_myisam.h:
New test for SIGNED/UNSIGNED
sql/handler.h:
New test for SIGNED/UNSIGNED
sql/item_func.cc:
Cleanup TIMESPEC usage
sql/item_func.h:
Added SIGNED / UNSIGNED casts
sql/lex.h:
Added SIGNED / UNSIGNED casts
sql/mysqld.cc:
Cleanup TIMESPEC usage
sql/net_pkg.cc:
Cleanup
sql/net_serv.cc:
Fixed core dump bug in net_clear()
sql/slave.cc:
Cleanup
sql/sql_cache.cc:
Back to using semaphores
sql/sql_cache.h:
Back to using semaphores
sql/sql_insert.cc:
Cleanup TIMESPEC usage
sql/sql_manager.cc:
Cleanup TIMESPEC usage
sql/sql_parse.cc:
Cleanup
sql/sql_repl.cc:
Cleanup TIMESPEC usage
sql/sql_show.cc:
Added 'Null' and 'Index_type' to SHOW INDEX.
sql/sql_table.cc:
Sort keys in table in a more logical order.
sql/sql_yacc.yy:
Support for SIGNED/UNSIGNED casts.
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Docs/manual.texi:
merge
sql/Makefile.am:
merge
sql/mysql_priv.h:
merge
sql/sql_lex.h:
merge
sql/sql_yacc.yy:
merge
First (incomplete) version of transaction and as3ap tests.
BitKeeper/etc/ignore:
Added sql-bench/test-transactions to the ignore list
mysql-test/r/fulltext.result:
Update fulltext results after merge
sql-bench/Makefile.am:
Added transaction test
sql-bench/run-all-tests.sh:
Added transaction test
sql-bench/server-cfg.sh:
Added transaction test
sql-bench/test-ATIS.sh:
Cleanup
sql/item_func.cc:
Fix bad merge
sql/mysqld.cc:
Cleanup
sql/sql_base.cc:
Fix bad merge
sql/sql_delete.cc:
Cleanup
sql/sql_parse.cc:
Fix bad merge
sql/sql_select.cc:
Fix bad merge
sql/sql_union.cc:
Fix bad merge
tools/mysqlmanager.c:
C
LOCATE() is now case sensitive
BUILD/compile-alpha-cxx:
Don't build manager because it fails with linker error on Linux Alpha
Docs/manual.texi:
Changelog
myisam/mi_check.c:
Fix bug when repairing compressed MyISAM files
myisam/mi_open.c:
Fix bug when repairing compressed MyISAM files
myisam/mi_packrec.c:
Fix bug when repairing compressed MyISAM files
myisam/myisamchk.c:
Fix bug when repairing compressed MyISAM files
myisam/myisamdef.h:
Fix bug when repairing compressed MyISAM files
mysql-test/r/func_group.result:
Fix result for new RND function
mysql-test/r/func_math.result:
Fix result for new RND function
mysql-test/r/func_str.result:
test of new locate()
mysql-test/t/func_str.test:
test of new locate()
sql/item_func.cc:
LOCATE() is now case sensitive
sql/sql_string.cc:
LOCATE() is now case sensitive
sql/sql_string.h:
LOCATE() is now case sensitive
it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
re-disabled implicit ft initialization
sql/item_func.cc:
re-disabled implicit initialization that was re-enabled (by me)
for reasons unknown (at least the code passed all the tests)
sql/mysql_priv.h:
removed ftfuncs argument for mysql_select
it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
sql/sql_base.cc:
removed ftfuncs argument for mysql_select
it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
sql/sql_parse.cc:
removed ftfuncs argument for mysql_select
it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
sql/sql_select.cc:
removed ftfuncs argument for mysql_select
it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
Docs/manual.texi:
Updated changelog.
Update info about MERGE tables.
Moved section 'Why so many open tables'
mysql-test/r/create.result:
Added test of types in CREATE
mysql-test/t/create.test:
Added test of types in CREATE
sql/item_func.cc:
More different values for RAND(nr) and RAND(nr+1)
include/ft_global.h:
I have to checkin to be able to pull
myisam/ft_boolean_search.c:
I have to checkin to be able to pull
myisam/ft_nlq_search.c:
I have to checkin to be able to pull
myisam/ftdefs.h:
I have to checkin to be able to pull
sql/item_func.cc:
I have to checkin to be able to pull
sql/item_func.h:
I have to checkin to be able to pull
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-ft_search.c~c011cb6e8041bb59:
the file is deleted anyway
include/my_global.h:
merder
myisam/ft_boolean_search.c:
huh?
mysql-test/r/fulltext.result:
use local
mysql-test/r/fulltext_cache.result:
ur
mysql-test/r/fulltext_left_join.result:
ur
mysql-test/r/fulltext_multi.result:
ur
mysql-test/r/fulltext_order_by.result:
ur
BitKeeper/etc/ignore:
auto-union
acinclude.m4:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/count_distinct2.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
libmysqld/Makefile.am:
Added back md5.c
Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version. All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86
BitKeeper/deleted/.del-mf_pack2.c~f07795bbcf57be7:
Delete: mysys/mf_pack2.c
Docs/manual.texi:
Updated chapter about embedded version
acinclude.m4:
Fix for using BDB and InnoDB with embedded
client/completion_hash.cc:
Speed up memory allocation
client/completion_hash.h:
Speed up memory allocation
client/mysql.cc:
Speed up memory allocation
client/mysqldump.c:
Fix to use now convert_dirname
client/mysqltest.c:
Fixed memory allocation bugs.
Added --basedir=#, --compress=#, --server-arg, --server-file.
Fixes for embedded version
Changed silent mode to -s instead of -q
include/my_global.h:
Update to use HAVE_ISAM
include/my_sys.h:
Cleanup of fn_format()
include/mysql.h:
Prepare FIELD struct for 4.1
include/mysql_embed.h:
Don't use ISAM in embedded version
innobase/include/srv0srv.h:
Make InnoDB startup/shutdown silent in embedded version
innobase/log/log0log.c:
Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0srv.c:
Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0start.c:
Make InnoDB startup/shutdown silent in embedded version
isam/isamlog.c:
new convert_dirname
libmysql/libmysql.c:
Prepare for 4.1
libmysqld/Makefile.am:
Changed to create one libmysqld.a file that includes all other libraries.
libmysqld/examples/Makefile.am:
Changed to use new libmysqld.a
libmysqld/examples/test-run:
Lot's of fixes to get new mysqltest with embedded MySQL to work.
libmysqld/lib_sql.cc:
Changed type of arguments for mysql_server_init() to make code more portable.
libmysqld/libmysqld.c:
Cleanup
merge/Makefile.am:
Rename to use common prefix.
merge/mrg_close.c:
Rename to use common prefix.
merge/mrg_create.c:
Rename to use common prefix.
merge/mrg_def.h:
Rename to use common prefix.
merge/mrg_delete.c:
Rename to use common prefix.
merge/mrg_extra.c:
Rename to use common prefix.
merge/mrg_info.c:
Rename to use common prefix.
merge/mrg_locking.c:
Rename to use common prefix.
merge/mrg_open.c:
Rename to use common prefix.
merge/mrg_panic.c:
Rename to use common prefix.
merge/mrg_rrnd.c:
Rename to use common prefix.
merge/mrg_rsame.c:
Rename to use common prefix.
merge/mrg_static.c:
Rename to use common prefix.
merge/mrg_update.c:
Rename to use common prefix.
myisam/myisamlog.c:
Use new convert_dirname
myisammrg/Makefile.am:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_close.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_create.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_def.h:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_delete.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_extra.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_info.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_locking.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_open.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_panic.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_queue.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rfirst.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rkey.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rlast.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rnext.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rprev.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rrnd.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rsame.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_static.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_update.c:
Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_write.c:
Renamed mymrgdef.h -> myrg_def.h
mysql-test/include/master-slave.inc:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/mysql-test-run.sh:
cleanup
mysql-test/r/auto_increment.result:
Cleanup of tests for embedded version
mysql-test/r/func_system.result:
Cleanup of tests for embedded version
mysql-test/r/isam.result:
Cleanup of tests for embedded version
mysql-test/r/lock.result:
Cleanup of tests for embedded version
mysql-test/r/show_check.result:
Cleanup of tests for embedded version
mysql-test/t/auto_increment.test:
Cleanup of tests for embedded version
mysql-test/t/backup.test:
Cleanup of tests for embedded version
mysql-test/t/count_distinct2-master.opt:
Cleanup of tests for embedded version
mysql-test/t/count_distinct2.test:
Cleanup of tests for embedded version
mysql-test/t/create.test:
Cleanup of tests for embedded version
mysql-test/t/flush.test:
Cleanup of tests for embedded version
mysql-test/t/func_system.test:
Cleanup of tests for embedded version
mysql-test/t/isam.test:
Cleanup of tests for embedded version
mysql-test/t/kill.test:
Cleanup of tests for embedded version
mysql-test/t/lock.test:
Cleanup of tests for embedded version
mysql-test/t/order_fill_sortbuf-master.opt:
Cleanup of tests for embedded version
mysql-test/t/rpl000015.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000016.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000017.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000018.test:
Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/show_check.test:
Move ISAM specific tests to isam.test
mysql-test/t/status.test:
Cleanup of tests for embedded version
mysql-test/t/tablelock.test:
Cleanup
mysys/Makefile.am:
Removed not used mf_pack2.c
mysys/charset.c:
new convert_dirname
mysys/default.c:
new convert_dirname
mysys/mf_dirname.c:
Changed convert_dirname() to be more general
mysys/mf_format.c:
Changed bit flags to fn_format() to defines.
Added handling of relative filenames
BitKeeper/etc/ignore:
Added libmysqld/examples/test-gdbinit scripts/mysql_explain_log to the ignore list
mysys/mf_pack.c:
new convert_dirname
mysys/mf_tempfile.c:
new convert_dirname
scripts/Makefile.am:
Adde mysql_explain_log
scripts/mysql_config.sh:
Added support of --libmysqld-libs
sql/Makefile.am:
Fix to use 'innodb_system_libs'
sql/ha_innobase.cc:
Make InnoDB startup/shutdown silent in embedded version
sql/ha_isam.cc:
Added handling of HAVE_ISAM
sql/ha_isammrg.cc:
Added handling of HAVE_ISAM
sql/ha_myisam.cc:
Handle relative paths; Needed to support BACKUP TABLE in embedded version
sql/ha_myisammrg.cc:
Rename of filenames
sql/handler.cc:
Added handling of HAVE_ISAM
sql/item_func.cc:
Fix for ecc (Intel Compiler)
sql/mysql_priv.h:
Added global variable 'mysql_embedded'
sql/mysqld.cc:
Use HAVE_ISAM
sql/sql_parse.cc:
Use new convert_dirname
sql/sql_select.cc:
Fix for ecc (Intel Compiler)
sql/sql_table.cc:
Added handling of relative filenames
strings/Makefile.am:
Don't compile both assembler and C functions on x86
strings/bchange.c:
cleanup
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
acinclude.m4:
SCCS merged
Fix that compressed packets and normal packets looks indentical before calling net_real_write()
(Needed for query cache)
Optimize IS NULL handling
Build-tools/Do-compile:
Fix for machines with clocks in an earlier timezone
Docs/manual.texi:
Fixed typo
acinclude.m4:
Fixed typo
client/mysqlbinlog.cc:
Cleanup
client/mysqltest.c:
Added --compress to test the compressed protocol
configure.in:
Increment shared library number (because structs changed)
include/mysql.h:
Optimize structs for Ia64
include/mysql_com.h:
Optimize structs for Ia64
libmysql/libmysql.c:
Portability fixes
libmysql/net.c:
Fix that compressed packets and normal packets looks indentical before calling net_real_write()
(Needed for query cache)
libmysqld/examples/Makefile.am:
Portability fix
libmysqld/libmysqld.c:
Portability fixes
mysql-test/mysql-test-run.sh:
Added --compress to test the compressed protocol
mysql-test/t/type_enum.test:
A
mysys/mf_casecnv.c:
Portability fixes
mysys/mf_tempfile.c:
Portability fixes
scripts/make_binary_distribution.sh:
Add libmysqld to binary distribution
sql-bench/server-cfg.sh:
Fix for Interbase
sql/item.h:
Optimize IS NULL handling
sql/item_cmpfunc.cc:
Optimize IS NULL handling
sql/item_cmpfunc.h:
Optimize IS NULL handling
sql/item_func.cc:
cleanup
sql/item_func.h:
Optimize IS NULL handling
sql/mysql_priv.h:
c
sql/net_serv.cc:
Fix that compressed packets and normal packets looks indentical before calling net_real_write()
(Needed for query cache)
client/Makefile.am:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
sql/lex.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
