bk commit into 5.1 tree (mkindahl:1.2569)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl.  When mkindahl 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
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-25 15:20:42+01:00, mkindahl@stripped +2 -0
  Eliminating compiler warnings.

  mysql-test/suite/binlog/combinations@stripped, 2008-03-25 15:20:36+01:00, mkindahl@stripped +8 -0
    New BitKeeper file ``mysql-test/suite/binlog/combinations''

  mysql-test/suite/binlog/combinations@stripped, 2008-03-25 15:20:36+01:00, mkindahl@stripped +0 -0

  sql/set_var.h@stripped, 2008-03-25 15:20:36+01:00, mkindahl@stripped +2 -2
    Changing order of initializer list for sys_var class constructor to
    eliminate compiler warning.

diff -Nrup a/mysql-test/suite/binlog/combinations b/mysql-test/suite/binlog/combinations
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/binlog/combinations	2008-03-25 15:20:36 +01:00
@@ -0,0 +1,8 @@
+[row]
+--binlog-format=row
+
+[stmt]
+--binlog-format=statement
+
+[mix]
+--binlog-format=mixed
diff -Nrup a/sql/set_var.h b/sql/set_var.h
--- a/sql/set_var.h	2008-03-07 13:59:34 +01:00
+++ b/sql/set_var.h	2008-03-25 15:20:36 +01:00
@@ -73,8 +73,8 @@ public:
   bool no_support_one_shot;
   sys_var(const char *name_arg, sys_after_update_func func= NULL,
           Binlog_status_enum binlog_status_arg= NOT_IN_BINLOG)
-    :name(name_arg), after_update(func), binlog_status(binlog_status_arg)
-    , no_support_one_shot(1)
+    :name(name_arg), after_update(func), no_support_one_shot(1),
+    binlog_status(binlog_status_arg)
   {}
   virtual ~sys_var() {}
   void chain_sys_var(sys_var_chain *chain_arg)