From 015157fd9b514941beb9def303c5421de8b2fffd Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 23 Jan 2006 22:17:12 +0100 Subject: [PATCH] Fix for the test failure of binlog_row_ctype_cp932. Note that since we pushed row-based replication, "make test" != "mysql-test-run && mysql-test-run --ps-protocol". "make test" is what should be used; had it been, the failure would have been noticed earlier. Putting back cxx flags I had by accident removed. Disclaimer: 5.1-new is in a sorry state: log_tables and some ndb* fail, mysqlslap test crashes randomly in a row-based replication assertion (sql_class.cc:2207). BUILD/SETUP.sh: Putting back flags which I, by accident, removed during the push of row-based replication (I had removed them in my tree because they cause tens of wrong warnings with my gcc4.0.0, and committed that by accident). mysql-test/r/binlog_row_ctype_cp932.result: result update (people should run "make test" now, it tests row-based replication too). --- BUILD/SETUP.sh | 2 +- mysql-test/r/binlog_row_ctype_cp932.result | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index ae5c8332bcd..eece41d72e6 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -55,7 +55,7 @@ SSL_LIBRARY=--with-openssl global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings" #debug_extra_warnings="-Wuninitialized" c_warnings="$global_warnings -Wunused" -cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder" +cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY" base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY" max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-embedded-server --with-big-tables --with-partition $SSL_LIBRARY" diff --git a/mysql-test/r/binlog_row_ctype_cp932.result b/mysql-test/r/binlog_row_ctype_cp932.result index 179b6e52d86..6d213158ef6 100644 --- a/mysql-test/r/binlog_row_ctype_cp932.result +++ b/mysql-test/r/binlog_row_ctype_cp932.result @@ -11366,3 +11366,4 @@ col1 a a a +drop table t1;