List:Commits« Previous MessageNext Message »
From:guilhem Date:January 23 2006 9:17pm
Subject:bk commit into 5.1 tree (guilhem:1.2067)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository

  1.2067 06/01/23 22:17:12 guilhem@stripped +2 -0
  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 ( 

    1.2 06/01/23 22:17:08 guilhem@stripped +1 -0
    result update (people should run "make test" now, it tests row-based replication too).

    1.53 06/01/23 22:17:07 guilhem@stripped +1 -1
    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).

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1-new

--- 1.1/mysql-test/r/binlog_row_ctype_cp932.result	2005-12-22 06:34:51 +01:00
+++ 1.2/mysql-test/r/binlog_row_ctype_cp932.result	2006-01-23 22:17:08 +01:00
@@ -11366,3 +11366,4 @@
+drop table t1;

--- 1.52/BUILD/	2006-01-12 11:51:15 +01:00
+++ 1.53/BUILD/	2006-01-23 22:17:07 +01:00
@@ -55,7 +55,7 @@
 global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings"
 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"
bk commit into 5.1 tree (guilhem:1.2067)guilhem23 Jan