3152 Georgi Kodinov 2009-10-04
rpl.rpl_trigger made experimental because of bug #47810 :
rpl.rpl_trigger.test fails with valgrind errors with the innodb plugin
modified:
mysql-test/collections/default.experimental
3151 Georgi Kodinov 2009-10-04
Make innodb-autoinc.test experimental until bug#47809 is fixed.
modified:
mysql-test/collections/default.experimental
3150 Georgi Kodinov 2009-10-04
Disable innodb_information_schema.test until bug #47808 is fixed.
modified:
mysql-test/suite/innodb/t/disabled.def
3149 Georgi Kodinov 2009-10-04
Fixed a valgrind error in debug_sync
modified:
sql/debug_sync.cc
3148 Georgi Kodinov 2009-10-04 [merge]
automerge
3147 Georgi Kodinov 2009-10-04 [merge]
automerge
modified:
Makefile.am
client/mysqlimport.c
client/mysqlslap.c
configure.in
mysys/Makefile.am
unittest/mysys/Makefile.am
3146 Ingo Struewing 2009-10-02 [merge]
auto-merge
added:
mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test
mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test
mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test
mysql-test/include/have_not_innodb_plugin.inc
mysql-test/r/not_true.require
mysql-test/r/partition_innodb_builtin.result
mysql-test/r/partition_innodb_plugin.result
mysql-test/std_data/binlog_transaction.000001
mysql-test/suite/federated/federated_debug-master.opt
mysql-test/suite/federated/federated_debug.result
mysql-test/suite/federated/federated_debug.test
mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
mysql-test/t/partition_innodb_builtin.test
mysql-test/t/partition_innodb_plugin.test
modified:
client/mysqlbinlog.cc
libmysqld/lib_sql.cc
mysql-test/include/concurrent.inc
mysql-test/lib/mtr_cases.pm
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/information_schema_db.result
mysql-test/r/mysqlbinlog.result
mysql-test/r/view_grant.result
mysql-test/suite/binlog/r/binlog_killed_simulate.result
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
mysql-test/suite/binlog/r/binlog_stm_blackhole.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test
mysql-test/suite/federated/my.cnf
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
mysql-test/suite/rpl/r/rpl_loaddata.result
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
mysql-test/suite/rpl/r/rpl_loaddata_map.result
mysql-test/suite/rpl/r/rpl_loaddatalocal.result
mysql-test/suite/rpl/r/rpl_stm_log.result
mysql-test/suite/rpl/t/rpl_loaddatalocal.test
mysql-test/t/alter_table.test
mysql-test/t/disabled.def
mysql-test/t/information_schema_db.test
mysql-test/t/mysqlbinlog.test
mysql-test/t/view_grant.test
scripts/make_win_bin_dist
sql/field.cc
sql/field.h
sql/log_event.cc
sql/log_event.h
sql/mysql_priv.h
sql/slave.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_show.cc
sql/sql_table.cc
sql/sql_yacc.yy
sql/table.cc
=== modified file 'Makefile.am'
--- a/Makefile.am 2009-05-15 12:57:51 +0000
+++ b/Makefile.am 2009-09-17 16:34:24 +0000
@@ -1,4 +1,4 @@
-# Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright 2000-2008 MySQL AB, 2009 Sun Microsystems, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN
SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
@readline_topdir@ sql-common scripts \
@pstack_dir@ \
- @sql_union_dirs@ unittest storage plugin \
+ @sql_union_dirs@ unittest \
@sql_server@ @man_dirs@ tests \
netware @libmysqld_dirs@ \
mysql-test support-files sql-bench @tools_dirs@ \
=== modified file 'client/mysqlimport.c'
--- a/client/mysqlimport.c 2009-07-14 17:08:38 +0000
+++ b/client/mysqlimport.c 2009-09-17 16:34:24 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (C) 2000-2006 MySQL AB, 2009 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -583,7 +583,7 @@ error:
counter--;
pthread_cond_signal(&count_threshhold);
pthread_mutex_unlock(&counter_mutex);
- my_thread_end();
+ mysql_thread_end();
return 0;
}
=== modified file 'client/mysqlslap.c'
--- a/client/mysqlslap.c 2009-09-23 13:21:29 +0000
+++ b/client/mysqlslap.c 2009-10-04 09:15:05 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (C) 2005 MySQL AB, 2009 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1923,7 +1923,7 @@ end:
if (!opt_only_print)
mysql_close(mysql);
- my_thread_end();
+ mysql_thread_end();
pthread_mutex_lock(&counter_mutex);
thread_counter--;
=== modified file 'configure.in'
--- a/configure.in 2009-09-29 15:38:40 +0000
+++ b/configure.in 2009-10-04 09:15:05 +0000
@@ -1648,13 +1648,14 @@ then
DEBUG_OPTIMIZE_CXX="-O"
OPTIMIZE_CXXFLAGS="$MAX_CXX_OPTIMIZE"
else
- DEBUG_CXXFLAGS="-g"
DEBUG_OPTIMIZE_CXX=""
case $SYSTEM_TYPE in
*solaris*)
+ DEBUG_CXXFLAGS="-g0"
OPTIMIZE_CXXFLAGS="-O1"
;;
*)
+ DEBUG_CXXFLAGS="-g"
OPTIMIZE_CXXFLAGS="-O"
;;
esac
@@ -2768,7 +2769,7 @@ server_scripts=
dnl This probably should be cleaned up more - for now the threaded
dnl client is just using plain-old libs.
-sql_client_dirs="strings regex mysys libmysql"
+sql_client_dirs="strings regex mysys dbug libmysql"
AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
@@ -2796,15 +2797,20 @@ fi
AC_SUBST(netware_dir)
AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")
-if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no"
+if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"
then
AC_DEFINE([THREAD], [1],
[Define if you want to have threaded code. This may be undef on client code])
# Avoid _PROGRAMS names
THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"
AC_SUBST(THREAD_LOBJECTS)
+fi
+AM_CONDITIONAL(NEED_THREAD, test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no")
+
+if test "$with_server" != "no"
+then
server_scripts="mysqld_safe mysql_install_db"
- sql_server_dirs="strings mysys dbug extra regex"
+ sql_server_dirs="strings mysys dbug extra regex storage plugin"
sql_server="vio sql"
fi
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2009-09-02 21:29:11 +0000
+++ b/mysql-test/collections/default.experimental 2009-10-04 10:31:55 +0000
@@ -6,3 +6,5 @@ rpl.rpl_row_create_table*
rpl_ndb.rpl_ndb_log # Bug#38998
rpl.rpl_innodb_bug28430* @solaris # Bug#46029
rpl.rpl_get_master_version_and_clock* # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31
+innodb-autoinc # Bug#47809 2009-10-04 joro innodb-autoinc.test fails with valgrind errors with the innodb plugin
+rpl.rpl_trigger # Bug#47810 2009-10-04 joro rpl.rpl_trigger.test fails with valgrind errors with the innodb plugin
=== modified file 'mysql-test/suite/innodb/t/disabled.def'
--- a/mysql-test/suite/innodb/t/disabled.def 2009-06-11 12:57:44 +0000
+++ b/mysql-test/suite/innodb/t/disabled.def 2009-10-04 10:15:53 +0000
@@ -1 +1,2 @@
innodb-index: InnoDB: Error: table `test`.`t1#1` already exists in InnoDB internal
+innodb_information_schema: Bug #47808 joro : innodb_information_schema.test fails when run under valgrind
=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am 2009-07-31 19:28:15 +0000
+++ b/mysys/Makefile.am 2009-09-17 16:34:24 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2000-2006 MySQL AB
+# Copyright (C) 2000-2006 MySQL AB, 2009 Sun Microsystems, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ libmysys_a_SOURCES = my_init.c my_get
mf_path.c mf_loadpath.c my_file.c \
my_open.c my_create.c my_dup.c my_seek.c my_read.c \
my_pread.c my_write.c my_getpagesize.c \
- mf_keycache.c mf_keycaches.c my_crc32.c \
+ mf_keycaches.c my_crc32.c \
mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \
mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \
my_malloc.c my_realloc.c my_once.c mulalloc.c \
@@ -53,6 +53,14 @@ libmysys_a_SOURCES = my_init.c my_get
my_handler.c my_netware.c my_largepage.c \
my_memmem.c stacktrace.c \
my_windac.c my_access.c base64.c my_libwrap.c
+
+if NEED_THREAD
+# mf_keycache is used only in the server, so it is safe to leave the file
+# out of the non-threaded library.
+# In fact, it will currently not compile without thread support.
+libmysys_a_SOURCES += mf_keycache.c
+endif
+
EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
thr_mutex.c thr_rwlock.c \
CMakeLists.txt mf_soundex.c \
=== modified file 'sql/debug_sync.cc'
--- a/sql/debug_sync.cc 2009-10-01 13:54:11 +0000
+++ b/sql/debug_sync.cc 2009-10-04 09:53:02 +0000
@@ -1276,7 +1276,7 @@ static bool debug_sync_eval_action(THD *
const char *errmsg;
char *ptr;
char *token;
- uint token_length;
+ uint token_length= 0;
DBUG_ENTER("debug_sync_eval_action");
DBUG_ASSERT(thd);
DBUG_ASSERT(action_str);
=== modified file 'unittest/mysys/Makefile.am'
--- a/unittest/mysys/Makefile.am 2007-05-28 20:18:51 +0000
+++ b/unittest/mysys/Makefile.am 2009-09-17 16:34:24 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 MySQL AB
+# Copyright (C) 2009 Sun Microsystems, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,14 @@ LDADD = $(top_builddir)/unittest/mytap
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/strings/libmystrings.a
-noinst_PROGRAMS = bitmap-t base64-t my_atomic-t
+noinst_PROGRAMS = bitmap-t base64-t
+
+if NEED_THREAD
+# my_atomic-t is used to check thread functions, so it is safe to
+# ignore the file in non-threaded builds.
+# In fact, it will not compile without thread support.
+noinst_PROGRAMS += my_atomic-t
+endif
# Don't update the files from bitkeeper
%::SCCS/s.%
Attachment: [text/bzr-bundle] bzr/joro@sun.com-20091004103155-dmze5cijl34kwmib.bundle
| Thread |
|---|
| • bzr push into mysql-5.1-bugteam branch (joro:3146 to 3152) Bug#47810 | Georgi Kodinov | 4 Oct |
