Fixed new bug when reading field types
client/mysql.cc:
Fixed output for -T
libmysql/libmysql.c:
Filled missing fields in new MYSQL_FIELD structure
Fixed new bug when reading field types
mysql-test/r/order_by.result:
Result after new order by optimization
sql/opt_range.cc:
New ORDER BY optimization
sql/opt_range.h:
New ORDER BY optimization
sql/set_var.cc:
Speed optimization
sql/sql_select.cc:
New ORDER BY optimization
This alllows MySQL to change a ref/range index from (a,b) to (a,c) when 'b' was not used to find rows and one did
ORDER BY a,c or ORDER BY c
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case. (Bug 316)
client/mysql.cc:
Fixed problem with prompt when server disconnect. (Bug 356)
client/mysqltest.c:
More debug information
mysql-test/mysql-test-run.sh:
Added support for --timezone in -master.opt
mysql-test/t/raid.test:
Fixed test if raid is enabled
sql/field.cc:
New my_gmt_sec() parameters
sql/mysql_priv.h:
New my_gmt_sec() parameters
sql/mysqld.cc:
Remove LOCK_timezone.
Code cleanup
sql/time.cc:
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case. (Bug 316)
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case. (Bug 316)
Bug fix: latin1 is not compiled charset and is not specified..
mysql.cc:
Bug fix: latin1 is not compiled charset and is not specified...
client/mysql.cc:
Bug fix: latin1 is not compiled charset and is not specified...
client/mysqlcheck.c:
Bug fix: latin1 is not compiled charset and is not specified..
client/mysqldump.c:
Bug fix: latin1 is not compiled charset and is not specified..
client/mysqlimport.c:
Bug fix: latin1 is not compiled charset and is not specified..
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
Auto merged
Makefile.am:
Auto merged
acinclude.m4:
Auto merged
BitKeeper/triggers/post-commit:
Auto merged
Build-tools/Do-compile:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
include/config-win.h:
Auto merged
include/my_base.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/violite.h:
Auto merged
innobase/buf/buf0flu.c:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/include/buf0buf.h:
Auto merged
innobase/include/buf0lru.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/log/log0recv.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/srv/srv0start.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_key.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_range.c:
Auto merged
myisam/mi_search.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/delete.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/innodb_handler.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/ctype_latin1_de.test:
Auto merged
mysql-test/t/delete.test:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/innodb_handler.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/repair.test:
Auto merged
mysql-test/t/select_safe.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_pthread.c:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/init.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/records.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_load.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/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/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
sql/unireg.h:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/test-transactions.sh:
Auto merged
strings/ctype-tis620.c:
Auto merged
tests/grant.res:
Auto merged
sql/log_event.cc:
Merge with 4.0.13
Cleaned up comment syntax
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
Auto merged
BitKeeper/deleted/.del-mysql.xdc:
Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
Auto merged
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_mutex.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/log.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_show.cc:
Auto merged
strings/my_vsnprintf.c:
Auto merged
sql/sql_parse.cc:
Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
Auto merged
client/mysql.cc:
NetWare only: Remove pthread_yield on large screen results
client/mysqldump.c:
NetWare only: Remove pthread_yield on large screen results
include/my_pthread.h:
NetWare only: pthread_cond_timedwait now present in LibC
mysys/default.c:
Add conditional for NetWare
mysys/my_init.c:
Changes to netware_init
mysys/my_pthread.c:
NetWare only: special my_pthread_cond_timedwait no longer needed
mysys/thr_mutex.c:
NetWare: no need for pthread_mutex_lock calls
netware/BUILD/mwenv:
Add zlib to environment variables
netware/Makefile.am:
Add isam/isamchk.def to netware_build_files
scripts/make_binary_distribution.sh:
Made bin directory files more flexible for alternate platforms, without unnecessary repetition
client/mysql.cc:
Remove unnecessary pthread_yield calls for NetWare
client/mysqldump.c:
Remove unnecessary pthread_yield calls for NetWare
include/my_pthread.h:
Special extern my_pthread_cond_timedwait no longer required for NetWare
mysql-test/t/backup.test:
replace_result added so test passes correctly on NetWare
mysys/default.c:
Add conditional to avoid non-applicable file checking on NetWare
mysys/my_init.c:
Remove working directory change from netware_init()
mysys/my_pthread.c:
Remove unnecessary NetWare version of my_pthread_cond_timedwait
mysys/thr_mutex.c:
Remove unnecessary NetWare block
scripts/make_binary_distribution.sh:
Changes to clear up extraneous EXTRA_BIN_FILES, NetWare sections
Docs/internals.texi:
Auto merged
include/my_global.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
libmysqld/lib_vio.c:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/heap.test:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/key.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
strings/strto.c:
Auto merged
system_charset_info was removed
client/mysql.cc:
system_charset_info was removed
client/mysqlcheck.c:
system_charset_info was removed
client/mysqldump.c:
system_charset_info was removed
client/mysqlimport.c:
system_charset_info was removed
client/mysqltest.c:
system_charset_info was removed
Disabling can be safer when the server silently dies & restarts.
This is for SCRUM task #727.
client/client_priv.h:
Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client
client/mysql.cc:
Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.
Disabling can be safer when the server silently dies & restarts.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/rpl000004.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/structs.h:
Auto merged
Makefile.am:
Merge with 4.0.11
mysql-test/mysql-test-run.sh:
Merge with 4.0.11
mysql-test/r/rpl_log.result:
Use local version (needs to be updated)
mysql-test/t/type_blob.test:
Merge with 4.0.11
sql/mysqld.cc:
Merge with 4.0.11
sql/protocol.cc:
Use local version
