Merge lp:~atcurtis/maria/10.0-opaque-thdvar into lp:maria

[Antony T Curtis]

OPAQUE thdvar is useful for plugins.
Plugin is responsible for freeing data on connection close (plugin dependent behaviour).

[Sergei Golubchik (sergii)]

Hi, Antony!

> OPAQUE thdvar is useful for plugins.
> Plugin is responsible for freeing data on connection close (plugin dependent behaviour).

What's the point of this? To create THD-local storage for plugins, not
visible or accessible from SQL?

Regards,
Sergei

[Antony T Curtis (atcurtis)]

Yes, exactly.
On Apr 9, 2014 5:45 AM, "Sergei" <email address hidden> wrote:

> Hi, Antony!
>
> > OPAQUE thdvar is useful for plugins.
> > Plugin is responsible for freeing data on connection close (plugin
> dependent behaviour).
>
> What's the point of this? To create THD-local storage for plugins, not
> visible or accessible from SQL?
>
> Regards,
> Sergei
>
> --
> https://code.launchpad.net/~atcurtis/maria/10.0-opaque-thdvar/+merge/214139
> You are the owner of lp:~atcurtis/maria/10.0-opaque-thdvar.
>

Unmerged revisions

4144. By Antony T Curtis on 2014-04-04

Implement missing OPAQUE plugin thdvar.

=== modified file 'include/mysql/plugin.h'
--- include/mysql/plugin.h	2014-03-21 12:30:55 +0000
+++ include/mysql/plugin.h	2014-04-04 00:33:54 +0000
@@ -211,6 +211,7 @@
 #define PLUGIN_VAR_ENUM         0x0006
 #define PLUGIN_VAR_SET          0x0007
 #define PLUGIN_VAR_DOUBLE       0x0008
+#define PLUGIN_VAR_OPAQUE       0x000f
 #define PLUGIN_VAR_UNSIGNED     0x0080
 #define PLUGIN_VAR_THDLOCAL     0x0100 /* Variable is per-connection */
 #define PLUGIN_VAR_READONLY     0x0200 /* Server variable is read only */
@@ -453,6 +454,11 @@
   PLUGIN_VAR_DOUBLE | PLUGIN_VAR_THDLOCAL | ((opt) & PLUGIN_VAR_MASK), \
   #name, comment, check, update, -1, def, min, max, blk, NULL }
 
+#define MYSQL_THDVAR_OPAQUE(name, type) \
+DECLARE_MYSQL_THDVAR_BASIC(name, __typeof__ (type *)) = { \
+  PLUGIN_VAR_OPAQUE | PLUGIN_VAR_THDLOCAL | PLUGIN_VAR_NOSYSVAR | PLUGIN_VAR_NOCMDOPT, \
+  #name, NULL, NULL, NULL, -1, NULL, NULL }
+
 /* accessor macros */
 
 #define SYSVAR(name) \

=== modified file 'sql/sql_plugin.cc'
--- sql/sql_plugin.cc	2014-03-26 21:25:38 +0000
+++ sql/sql_plugin.cc	2014-04-04 00:33:54 +0000
@@ -2444,6 +2444,7 @@
 typedef DECLARE_MYSQL_THDVAR_BASIC(thdvar_bool_t, my_bool);
 typedef DECLARE_MYSQL_SYSVAR_BASIC(sysvar_str_t, char *);
 typedef DECLARE_MYSQL_THDVAR_BASIC(thdvar_str_t, char *);
+typedef DECLARE_MYSQL_THDVAR_BASIC(thdvar_opaque_t, void *);
 
 typedef DECLARE_MYSQL_SYSVAR_TYPELIB(sysvar_enum_t, unsigned long);
 typedef DECLARE_MYSQL_THDVAR_TYPELIB(thdvar_enum_t, unsigned long);
@@ -2862,6 +2863,9 @@
   case PLUGIN_VAR_DOUBLE:
     size= sizeof(double);
     break;
+  case PLUGIN_VAR_OPAQUE:
+    size= sizeof(void*);
+    break;
   default:
     DBUG_ASSERT(0);
     return NULL;
@@ -3069,6 +3073,11 @@
   return (double *) intern_sys_var_ptr(thd, offset, true);
 }
 
+static void **mysql_sys_var_ptr(THD* thd, int offset)
+{
+  return (void **) intern_sys_var_ptr(thd, offset, true);
+}
+
 void plugin_thdvar_init(THD *thd)
 {
   plugin_ref old_table_plugin= thd->variables.table_plugin;
@@ -3643,6 +3652,9 @@
     case PLUGIN_VAR_DOUBLE:
       ((thdvar_double_t *) opt)->resolve= mysql_sys_var_double;
       break;
+    case PLUGIN_VAR_OPAQUE:
+      ((thdvar_opaque_t *) opt)->resolve= mysql_sys_var_ptr;
+      break;
     default:
       sql_print_error("Unknown variable type code 0x%x in plugin '%s'.",
                       opt->flags, plugin_name);
@@ -3712,6 +3724,9 @@
       if (!opt->update)
         opt->update= update_func_double;
       break;
+    case PLUGIN_VAR_OPAQUE:
+      /* this type is opaque */
+      break;
     default:
       sql_print_error("Unknown variable type code 0x%x in plugin '%s'.",
                       opt->flags, plugin_name);