List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:March 24 2011 10:36am
Subject:bzr commit into mysql-trunk branch (Georgi.Kodinov:3319) Bug#11766306
View as plain text  
#At file:///Users/kgeorge/mysql/work/B11766306-trunk/ based on revid:marc.alff@stripped

 3319 Georgi Kodinov	2011-03-24 [merge]
      Null merge of bug #11766306 : have_innodb is deprecated in 5.6
      Removed one dead extern declaration of have_innodb from set_var.h

=== modified file 'sql/set_var.h'
--- a/sql/set_var.h	2011-03-22 11:44:40 +0000
+++ b/sql/set_var.h	2011-03-24 10:35:12 +0000
@@ -284,7 +284,7 @@ public:
 /* optional things, have_* variables */
-extern SHOW_COMP_OPTION have_csv, have_innodb;
+extern SHOW_COMP_OPTION have_csv;
 extern SHOW_COMP_OPTION have_ndbcluster, have_partitioning;
 extern SHOW_COMP_OPTION have_profiling;

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
bzr commit into mysql-trunk branch (Georgi.Kodinov:3319) Bug#11766306Georgi Kodinov24 Mar