2773 Georgi Kodinov 2008-12-05 [merge]
merged the disablement of bug 41255 to 6.0
modified:
mysql-test/t/disabled.def
2772 Vladislav Vaintroub 2008-12-05 [merge]
- merge BUG#38522 from 5.1
- revert BUG#41103
modified:
client/mysql.cc
client/mysqltest.c
dbug/dbug.c
include/m_ctype.h
include/m_string.h
include/my_dbug.h
include/my_global.h
include/my_sys.h
include/mysql.h
libmysql/libmysql.c
libmysql/libmysql.def
libmysqld/examples/CMakeLists.txt
libmysqld/lib_sql.cc
libmysqld/libmysqld.c
libmysqld/libmysqld.def
mysys/my_fopen.c
mysys/my_thr_init.c
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_manager.cc
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def 2008-12-01 15:57:12 +0000
+++ b/mysql-test/t/disabled.def 2008-12-05 11:27:19 +0000
@@ -21,4 +21,5 @@ backup_triggers_and_events : Bug#37762
backup_no_be : Bug#38023 2008-07-16 rafal Test triggers valgrind warnings described in the bug
thread_cache_size_func : Bug#40575 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
log_output_basic : Bug #40988 log_output_basic.test succeeded though syntactically false.
+wait_timeout_func : Bug #41225 joro wait_timeout_func fails
| Thread |
|---|
| • bzr push into mysql-6.0-bugteam branch (kgeorge:2772 to 2773) | Georgi Kodinov | 5 Dec |
