Merge lp:~stewart/drizzle/embedded-innodb-configuration-file-format into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

support innodb_file_format option

[lp:~stewart/drizzle/embedded-innodb-configuration-file-format]

1438. By Stewart Smith on 2010-05-06

remove mem leak as well as properly show the default innodb_file_format.

[Jay Pipes (jaypipes)]

++broccolini

review: Approve

[lp:~stewart/drizzle/embedded-innodb-configuration-file-format]

1439. By Stewart Smith on 2010-05-11

Merged embedded-innodb-configuration-file-per-table into embedded-innodb-configuration-file-format.

1440. By Stewart Smith on 2010-05-11

Merged embedded-innodb-configuration-file-per-table into embedded-innodb-configuration-file-format.

1441. By Stewart Smith on 2010-05-12

merge trunk

1442. By Stewart Smith on 2010-05-17

Merged embedded-innodb-configuration-file-per-table into embedded-innodb-configuration-file-format.

1443. By Stewart Smith on 2010-05-17

Merged embedded-innodb-configuration-file-per-table into embedded-innodb-configuration-file-format.

1444. By Stewart Smith on 2010-05-17

Merged embedded-innodb-configuration-file-per-table into embedded-innodb-configuration-file-format.

=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.cc'
--- plugin/embedded_innodb/embedded_innodb_engine.cc	2010-05-17 13:07:35 +0000
+++ plugin/embedded_innodb/embedded_innodb_engine.cc	2010-05-17 13:07:36 +0000
@@ -2179,6 +2179,7 @@
 static unsigned long srv_io_capacity= 200;
 static unsigned long innobase_fast_shutdown= 1;
 static bool srv_file_per_table= false;
+static char*  innobase_file_format_name   = NULL;
 static char  default_innodb_data_file_path[]= "ibdata1:10M:autoextend";
 static char* innodb_data_file_path= NULL;
 
@@ -2239,7 +2240,7 @@
   if (err != DB_SUCCESS)
     goto innodb_error;
 
-  err= ib_startup("barracuda");
+  err= ib_startup(innobase_file_format_name);
   if (err != DB_SUCCESS)
     goto innodb_error;
 
@@ -2279,6 +2280,55 @@
   }
 }
 
+static char innodb_file_format_name_storage[100];
+
+static int innodb_file_format_name_validate(Session*, drizzle_sys_var*,
+                                            void *save,
+                                            drizzle_value *value)
+{
+  ib_err_t err;
+  char buff[100];
+  int len= sizeof(buff);
+  const char *format= value->val_str(value, buff, &len);
+
+  *static_cast<const char**>(save)= NULL;
+
+  if (format == NULL)
+    return 1;
+
+  err= ib_cfg_set_text("file_format", format);
+
+  if (err == DB_SUCCESS)
+  {
+    strncpy(innodb_file_format_name_storage, format, sizeof(innodb_file_format_name_storage));;
+    innodb_file_format_name_storage[sizeof(innodb_file_format_name_storage)-1]= 0;
+
+    *static_cast<const char**>(save)= innodb_file_format_name_storage;
+    return 0;
+  }
+  else
+    return 1;
+}
+
+static void innodb_file_format_name_update(Session*, drizzle_sys_var*,
+                                           void *var_ptr,
+                                           const void *save)
+
+{
+  const char* format;
+
+  assert(var_ptr != NULL);
+  assert(save != NULL);
+
+  format= *static_cast<const char*const*>(save);
+
+  /* Format is already set in validate */
+    strncpy(innodb_file_format_name_storage, format, sizeof(innodb_file_format_name_storage));;
+    innodb_file_format_name_storage[sizeof(innodb_file_format_name_storage)-1]= 0;
+
+  *static_cast<const char**>(var_ptr)= innodb_file_format_name_storage;
+}
+
 static DRIZZLE_SYSVAR_BOOL(checksums, innobase_use_checksums,
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
   "Enable InnoDB checksums validation (enabled by default). "
@@ -2314,6 +2364,12 @@
   "Stores each InnoDB table to an .ibd file in the database dir.",
   NULL, NULL, false);
 
+static DRIZZLE_SYSVAR_STR(file_format, innobase_file_format_name,
+  PLUGIN_VAR_RQCMDARG,
+  "File format to use for new tables in .ibd files.",
+  innodb_file_format_name_validate,
+  innodb_file_format_name_update, "Barracuda");
+
 static DRIZZLE_SYSVAR_STR(data_file_path, innodb_data_file_path,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Path to individual files and their sizes.",
@@ -2341,6 +2397,7 @@
   DRIZZLE_SYSVAR(io_capacity),
   DRIZZLE_SYSVAR(fast_shutdown),
   DRIZZLE_SYSVAR(file_per_table),
+  DRIZZLE_SYSVAR(file_format),
   DRIZZLE_SYSVAR(data_file_path),
   DRIZZLE_SYSVAR(lock_wait_timeout),
   DRIZZLE_SYSVAR(log_file_size),

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_file_format.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_file_format.result	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_file_format.result	2010-05-17 13:07:36 +0000
@@ -0,0 +1,28 @@
+SHOW VARIABLES LIKE 'innodb_file_format';
+Variable_name	Value
+innodb_file_format	Barracuda
+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+NAME	TYPE	VALUE
+file_format	TEXT	Barracuda
+SET GLOBAL innodb_file_format='antelope';
+SHOW VARIABLES LIKE 'innodb_file_format';
+Variable_name	Value
+innodb_file_format	antelope
+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+NAME	TYPE	VALUE
+file_format	TEXT	Antelope
+SET GLOBAL innodb_file_format='barracuda';
+SHOW VARIABLES LIKE 'innodb_file_format';
+Variable_name	Value
+innodb_file_format	barracuda
+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+NAME	TYPE	VALUE
+file_format	TEXT	Barracuda
+SET GLOBAL innodb_file_format='broccolini';
+ERROR HY000: Incorrect arguments to SET
+SHOW VARIABLES LIKE 'innodb_file_format';
+Variable_name	Value
+innodb_file_format	barracuda
+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+NAME	TYPE	VALUE
+file_format	TEXT	Barracuda

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format-master.opt	2010-05-17 13:07:36 +0000
@@ -0,0 +1,1 @@
+--plugin_add=embedded_innodb --plugin_remove=innobase 

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format.test	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format.test	2010-05-17 13:07:36 +0000
@@ -0,0 +1,13 @@
+SHOW VARIABLES LIKE 'innodb_file_format';
+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+SET GLOBAL innodb_file_format='antelope';
+SHOW VARIABLES LIKE 'innodb_file_format';
+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+SET GLOBAL innodb_file_format='barracuda';
+SHOW VARIABLES LIKE 'innodb_file_format';
+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+--error 1210
+SET GLOBAL innodb_file_format='broccolini';
+SHOW VARIABLES LIKE 'innodb_file_format';
+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
+