summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormkindahl@dl145h.mysql.com <>2008-03-25 15:20:42 +0100
committermkindahl@dl145h.mysql.com <>2008-03-25 15:20:42 +0100
commitbc683c6450a40a148e3cb321de26c35fca5749b6 (patch)
treef94f6382ed4a8708a0459daf6d28e7570f6fa1b7
parent6c0dcad829ad4b6ed3731224b92ae332fe4e5467 (diff)
downloadmariadb-git-bc683c6450a40a148e3cb321de26c35fca5749b6.tar.gz
Eliminating compiler warnings.
-rw-r--r--mysql-test/suite/binlog/combinations8
-rw-r--r--sql/set_var.h4
2 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/suite/binlog/combinations b/mysql-test/suite/binlog/combinations
new file mode 100644
index 00000000000..ea25611a5d4
--- /dev/null
+++ b/mysql-test/suite/binlog/combinations
@@ -0,0 +1,8 @@
+[row]
+--binlog-format=row
+
+[stmt]
+--binlog-format=statement
+
+[mix]
+--binlog-format=mixed
diff --git a/sql/set_var.h b/sql/set_var.h
index 46fe7755baf..b33a3a968bb 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -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)