Docs/manual.texi:
Changelog
mysql-test/r/update.result:
Test found bug in UPDATE .. ORDER BY
mysql-test/t/update.test:
Test found bug in UPDATE .. ORDER BY
Docs/manual.texi:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Add timeout for shutdown
mysql-test/r/innodb.result:
Use local test
mysql-test/t/innodb.test:
merge
Docs/manual.texi:
Changelog
mysql-test/mysql-test-run.sh:
Change shutdown to 20 seconds for slow systems
mysql-test/r/innodb.result:
Testcase for found bug
mysql-test/t/innodb.test:
Testcase for found bug
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
include/my_base.h:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/rpl000012.test:
Auto merged
BUILD/FINISH.sh:
Auto merged
BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
Auto merged
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
Build-tools/Do-all-build-steps:
Auto merged
client/client_priv.h:
Auto merged
client/mysqladmin.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/having.test:
Auto merged
mysql-test/t/rpl000015-slave.sh:
Auto merged
mysql-test/t/rpl000016-slave.sh:
Auto merged
mysys/mf_cache.c:
Auto merged
mysys/mf_casecnv.c:
Auto merged
mysys/mf_tempfile.c:
Auto merged
readline/vi_mode.c:
Auto merged
strings/strto.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/time.cc:
Auto merged
BUILD/SETUP.sh:
Use -mcpu as default (safe for all x86 cpu's)
client/mysqldump.c:
Merge from 3.23.44
configure.in:
Update version number
extra/resolveip.c:
Portability fix
BitKeeper/etc/logging_ok:
auto-union
acinclude.m4:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/english/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/polish/errmsg.txt:
Auto merged
sql/share/portuguese/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
Docs/manual.texi:
Bad merge.
include/mysqld_error.h:
Merge with 3.23
Merged error messages with 3.23.44
Fixed bug with DATA DIRECTORY on windows
Docs/internals.texi:
Update coding policies
Docs/manual.texi:
Minor general corrections
acinclude.m4:
Fixed wrong cpu-test
configure.in:
Remove CPU test, because this makes unportable binaries.
include/mysql.h:
Added STDCALL to mysql_sever and mysql_thread variables
include/mysqld_error.h:
Merged error messages with 3.23.44
libmysql/libmysql.c:
Added STDCALL to mysql_sever and mysql_thread variables
libmysqld/lib_sql.cc:
Added STDCALL to mysql_sever and mysql_thread variables
sql-bench/limits/db2.cfg:
New limits file
sql-bench/test-select.sh:
Fixed bug in cache test
sql/share/czech/errmsg.txt:
Merged error messages with 3.23.44
sql/share/danish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/dutch/errmsg.txt:
Merged error messages with 3.23.44
sql/share/english/errmsg.txt:
Merged error messages with 3.23.44
sql/share/estonian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/french/errmsg.txt:
Merged error messages with 3.23.44
sql/share/german/errmsg.txt:
Merged error messages with 3.23.44
sql/share/greek/errmsg.txt:
Merged error messages with 3.23.44
sql/share/hungarian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/italian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/japanese/errmsg.txt:
Merged error messages with 3.23.44
sql/share/korean/errmsg.txt:
Merged error messages with 3.23.44
sql/share/norwegian-ny/errmsg.txt:
Merged error messages with 3.23.44
sql/share/norwegian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/polish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/portuguese/errmsg.txt:
Merged error messages with 3.23.44
sql/share/romanian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/russian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/slovak/errmsg.txt:
Merged error messages with 3.23.44
sql/share/spanish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/swedish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/ukrainian/errmsg.txt:
Merged error messages with 3.23.44
sql/sql_parse.cc:
Fix bug with DATA DIRECTORY on windows.
sql/sql_select.cc:
Cleanup
BUILD/SETUP.sh:
Use -O1 to avoid problem with INLINE functions
Docs/manual.texi:
Changelog
mysql-test/r/join.result:
Test for bugfix
mysql-test/t/join.test:
Test for bugfix
sql/sql_select.cc:
Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column was declared as NOT NULL.
BitKeeper/etc/ignore:
Added bdb/include/db_ext.h bdb/include/mutex_ext.h to the ignore list
Fixed bug with BLOB keys in BDB tables
Fixed problem with MERGE tables on OS with 32 bit files
Fixed that TIME_TO_SEC() works with negative times
Docs/manual.texi:
Changelog
client/mysqladmin.c:
Fix that mysqladmin shutdown can be interrupted with ^C
include/mysqld_error.h:
Fixed typo
mysql-test/r/func_time.result:
Added test case for negative times
mysql-test/t/func_time.test:
Added test case for negative times
mysql-test/t/rpl000015-slave.sh:
Removed warnings
mysql-test/t/rpl000016-slave.sh:
Removed warnings
sql/field.cc:
Fixed bug with BLOB keys in BDB tables
sql/field.h:
Fixed bug with BLOB keys in BDB tables
sql/ha_berkeley.cc:
Fixed bug with BLOB keys in BDB tables
sql/ha_myisammrg.cc:
Fixed problem with MERGE tables on OS with 32 bit files
sql/item_timefunc.cc:
Fixed that TIME_TO_SEC() works with negative times.
sql/share/swedish/errmsg.txt:
Merge with 4.0
sql/sql_acl.cc:
Fixed typo
