mysql-5.5.33 merge

1 files changed, 29 insertions, 2 deletions

diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 2c65fd657a9..31f0be254ac 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -1057,6 +1057,7 @@ struct st_mysql_storage_engine example_storage_engine=
 
 static ulong srv_enum_var= 0;
 static ulong srv_ulong_var= 0;
+static double srv_double_var= 0;
 
 const char *enum_var_names[]=
 {
@@ -1091,9 +1092,34 @@ static MYSQL_SYSVAR_ULONG(
   1000,
   0);
 
+static MYSQL_SYSVAR_DOUBLE(
+  double_var,
+  srv_double_var,
+  PLUGIN_VAR_RQCMDARG,
+  "0.500000..1000.500000",
+  NULL,
+  NULL,
+  8.5,
+  0.5,
+  1000.5,
+  0);                             // reserved always 0
+
+static MYSQL_THDVAR_DOUBLE(
+  double_thdvar,
+  PLUGIN_VAR_RQCMDARG,
+  "0.500000..1000.500000",
+  NULL,
+  NULL,
+  8.5,
+  0.5,
+  1000.5,
+  0);
+
 static struct st_mysql_sys_var* example_system_variables[]= {
   MYSQL_SYSVAR(enum_var),
   MYSQL_SYSVAR(ulong_var),
+  MYSQL_SYSVAR(double_var),
+  MYSQL_SYSVAR(double_thdvar),
   NULL
 };
 
@@ -1104,8 +1130,9 @@ static int show_func_example(MYSQL_THD thd, struct st_mysql_show_var *var,
   var->type= SHOW_CHAR;
   var->value= buf; // it's of SHOW_VAR_FUNC_BUFF_SIZE bytes
   my_snprintf(buf, SHOW_VAR_FUNC_BUFF_SIZE,
-              "enum_var is %lu, ulong_var is %lu, %.6b", // %b is MySQL extension
-              srv_enum_var, srv_ulong_var, "really");
+              "enum_var is %lu, ulong_var is %lu, "
+              "double_var is %f, %.6b", // %b is a MySQL extension
+              srv_enum_var, srv_ulong_var, srv_double_var, "really");
   return 0;
 }