At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2837 revision-id: sergii@pisem.net-20100824194216-zlhnd7zekgtpyagj parent: sergii@pisem.net-20100824192030-kpq4s0h3sgutl9ob committer: Sergei Golubchik <sergii@pisem.net> branch nick: 5.2-aria timestamp: Tue 2010-08-24 21:42:16 +0200 message: configure and plugin API: replace "maria" with "mariadb" where the latter was meant === modified file 'CMakeLists.txt' --- a/CMakeLists.txt 2010-07-09 11:39:19 +0000 +++ b/CMakeLists.txt 2010-08-24 19:42:16 +0000 @@ -260,7 +260,7 @@ FOREACH(SUBDIR ${STORAGE_SUBDIRS}) ENDIF(WITH_${ENGINE}_STORAGE_ENGINE AND MYSQL_PLUGIN_STATIC) IF (ENGINE_BUILD_TYPE STREQUAL "STATIC") - SET (maria_plugin_defs "${maria_plugin_defs},builtin_maria_${PLUGIN_NAME}_plugin") + SET (mariadb_plugin_defs "${mariadb_plugin_defs},builtin_mariadb_${PLUGIN_NAME}_plugin") SET (MYSQLD_STATIC_ENGINE_LIBS ${MYSQLD_STATIC_ENGINE_LIBS} ${PLUGIN_NAME}) SET (STORAGE_ENGINE_DEFS "${STORAGE_ENGINE_DEFS} -DWITH_${ENGINE}_STORAGE_ENGINE") SET (WITH_${ENGINE}_STORAGE_ENGINE TRUE) @@ -279,7 +279,7 @@ ENDFOREACH(SUBDIR ${STORAGE_SUBDIRS}) # Special handling for partition(not really pluggable) IF(NOT WITHOUT_PARTITION_STORAGE_ENGINE) SET (STORAGE_ENGINE_DEFS "${STORAGE_ENGINE_DEFS} -DWITH_PARTITION_STORAGE_ENGINE") - SET (maria_plugin_defs "${maria_plugin_defs},builtin_maria_partition_plugin") + SET (mariadb_plugin_defs "${mariadb_plugin_defs},builtin_mariadb_partition_plugin") ENDIF(NOT WITHOUT_PARTITION_STORAGE_ENGINE) # Special handling for tmp tables with the maria engine === modified file 'config/ac-macros/plugins.m4' --- a/config/ac-macros/plugins.m4 2010-04-01 14:34:51 +0000 +++ b/config/ac-macros/plugins.m4 2010-08-24 19:42:16 +0000 @@ -460,7 +460,7 @@ dnl Although this is "pretty", it breaks ]) ]) ]) - maria_plugin_defs="$maria_plugin_defs, [builtin_maria_]$2[_plugin]" + mariadb_plugin_defs="$mariadb_plugin_defs, [builtin_mariadb_]$2[_plugin]" [with_plugin_]$2=yes AC_MSG_RESULT([yes]) m4_ifdef([$11], [ === modified file 'configure.in' --- a/configure.in 2010-08-24 12:47:26 +0000 +++ b/configure.in 2010-08-24 19:42:16 +0000 @@ -2889,7 +2889,7 @@ AC_SUBST(server_scripts) AC_SUBST(mysql_plugin_dirs) AC_SUBST(mysql_plugin_libs) -AC_SUBST(maria_plugin_defs) +AC_SUBST(mariadb_plugin_defs) # Now that sql_client_dirs and sql_server_dirs are stable, determine the union. === modified file 'include/mysql/plugin.h' --- a/include/mysql/plugin.h 2010-06-15 19:12:13 +0000 +++ b/include/mysql/plugin.h 2010-08-24 19:42:16 +0000 @@ -60,7 +60,7 @@ typedef struct st_mysql_xid MYSQL_XID; /* MySQL plugin interface version */ #define MYSQL_PLUGIN_INTERFACE_VERSION 0x0101 /* MariaDB plugin interface version */ -#define MARIA_PLUGIN_INTERFACE_VERSION 0x0100 +#define MariaDB_PLUGIN_INTERFACE_VERSION 0x0100 /* The allowable types of plugins @@ -105,10 +105,10 @@ int VERSION= MYSQL_PLUGIN_INTERFACE_VERS int PSIZE= sizeof(struct st_mysql_plugin); \ struct st_mysql_plugin DECLS[]= { -#define MARIA_DECLARE_PLUGIN__(NAME, VERSION, PSIZE, DECLS) \ -int VERSION= MARIA_PLUGIN_INTERFACE_VERSION; \ -int PSIZE= sizeof(struct st_maria_plugin); \ -struct st_maria_plugin DECLS[]= { +#define MariaDB_DECLARE_PLUGIN__(NAME, VERSION, PSIZE, DECLS) \ +int VERSION= MariaDB_PLUGIN_INTERFACE_VERSION; \ +int PSIZE= sizeof(struct st_mariadb_plugin); \ +struct st_mariadb_plugin DECLS[]= { #else @@ -117,10 +117,10 @@ MYSQL_PLUGIN_EXPORT int _mysql_plugin_in MYSQL_PLUGIN_EXPORT int _mysql_sizeof_struct_st_plugin_= sizeof(struct st_mysql_plugin); \ MYSQL_PLUGIN_EXPORT struct st_mysql_plugin _mysql_plugin_declarations_[]= { -#define MARIA_DECLARE_PLUGIN__(NAME, VERSION, PSIZE, DECLS) \ -MYSQL_PLUGIN_EXPORT int _maria_plugin_interface_version_= MARIA_PLUGIN_INTERFACE_VERSION; \ -MYSQL_PLUGIN_EXPORT int _maria_sizeof_struct_st_plugin_= sizeof(struct st_maria_plugin); \ -MYSQL_PLUGIN_EXPORT struct st_maria_plugin _maria_plugin_declarations_[]= { +#define MariaDB_DECLARE_PLUGIN__(NAME, VERSION, PSIZE, DECLS) \ +MYSQL_PLUGIN_EXPORT int _mariadb_plugin_interface_version_= MariaDB_PLUGIN_INTERFACE_VERSION; \ +MYSQL_PLUGIN_EXPORT int _mariadb_sizeof_struct_st_plugin_= sizeof(struct st_mariadb_plugin); \ +MYSQL_PLUGIN_EXPORT struct st_mariadb_plugin _mariadb_plugin_declarations_[]= { #endif @@ -130,14 +130,14 @@ __MYSQL_DECLARE_PLUGIN(NAME, \ builtin_ ## NAME ## _sizeof_struct_st_plugin, \ builtin_ ## NAME ## _plugin) -#define maria_declare_plugin(NAME) \ -MARIA_DECLARE_PLUGIN__(NAME, \ - builtin_maria_ ## NAME ## _plugin_interface_version, \ - builtin_maria_ ## NAME ## _sizeof_struct_st_plugin, \ - builtin_maria_ ## NAME ## _plugin) +#define mariadb_declare_plugin(NAME) \ +MariaDB_DECLARE_PLUGIN__(NAME, \ + builtin_mariadb_ ## NAME ## _plugin_interface_version, \ + builtin_mariadb_ ## NAME ## _sizeof_struct_st_plugin, \ + builtin_mariadb_ ## NAME ## _plugin) #define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0,0}} -#define maria_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0,0,0}} +#define mariadb_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0,0,0}} /* declarations for SHOW STATUS support in plugins @@ -441,7 +441,7 @@ struct st_mysql_plugin in plugins extension */ -struct st_maria_plugin +struct st_mariadb_plugin { int type; /* the plugin type (a MYSQL_XXX_PLUGIN value) */ void *info; /* pointer to type-specific plugin descriptor */ === modified file 'include/mysql/plugin_auth.h.pp' --- a/include/mysql/plugin_auth.h.pp 2010-06-15 19:12:13 +0000 +++ b/include/mysql/plugin_auth.h.pp 2010-08-24 19:42:16 +0000 @@ -77,7 +77,7 @@ struct st_mysql_plugin struct st_mysql_sys_var **system_vars; void * __reserved1; }; -struct st_maria_plugin +struct st_mariadb_plugin { int type; void *info; === modified file 'plugin/auth/auth_socket.c' --- a/plugin/auth/auth_socket.c 2010-07-19 18:53:28 +0000 +++ b/plugin/auth/auth_socket.c 2010-08-24 19:42:16 +0000 @@ -99,7 +99,7 @@ mysql_declare_plugin(socket_auth) NULL } mysql_declare_plugin_end; -maria_declare_plugin(socket_auth) +mariadb_declare_plugin(socket_auth) { MYSQL_AUTHENTICATION_PLUGIN, &socket_auth_handler, @@ -115,5 +115,5 @@ maria_declare_plugin(socket_auth) "1.0", MariaDB_PLUGIN_MATURITY_BETA } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'plugin/auth/dialog.c' --- a/plugin/auth/dialog.c 2010-04-08 13:58:04 +0000 +++ b/plugin/auth/dialog.c 2010-08-24 19:42:16 +0000 @@ -171,7 +171,7 @@ mysql_declare_plugin(dialog) NULL } mysql_declare_plugin_end; -maria_declare_plugin(dialog) +mariadb_declare_plugin(dialog) { MYSQL_AUTHENTICATION_PLUGIN, &two_handler, @@ -202,7 +202,7 @@ maria_declare_plugin(dialog) "1.0", MariaDB_PLUGIN_MATURITY_BETA } -maria_declare_plugin_end; +mariadb_declare_plugin_end; /********************* CLIENT SIDE ***************************************/ /* === modified file 'plugin/daemon_example/daemon_example.cc' --- a/plugin/daemon_example/daemon_example.cc 2010-04-01 14:34:51 +0000 +++ b/plugin/daemon_example/daemon_example.cc 2010-08-24 19:42:16 +0000 @@ -200,7 +200,7 @@ mysql_declare_plugin(daemon_example) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(daemon_example) +mariadb_declare_plugin(daemon_example) { MYSQL_DAEMON_PLUGIN, &daemon_example_plugin, @@ -216,4 +216,4 @@ maria_declare_plugin(daemon_example) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_EXPERIMENTAL /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'plugin/fulltext/plugin_example.c' --- a/plugin/fulltext/plugin_example.c 2010-04-01 14:34:51 +0000 +++ b/plugin/fulltext/plugin_example.c 2010-08-24 19:42:16 +0000 @@ -270,7 +270,7 @@ mysql_declare_plugin(ftexample) NULL } mysql_declare_plugin_end; -maria_declare_plugin(ftexample) +mariadb_declare_plugin(ftexample) { MYSQL_FTPARSER_PLUGIN, /* type */ &simple_parser_descriptor, /* descriptor */ @@ -286,5 +286,5 @@ maria_declare_plugin(ftexample) "0.01", /* string version */ MariaDB_PLUGIN_MATURITY_EXPERIMENTAL /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'sql/ha_ndbcluster.cc' --- a/sql/ha_ndbcluster.cc 2010-07-25 15:09:21 +0000 +++ b/sql/ha_ndbcluster.cc 2010-08-24 19:42:16 +0000 @@ -10553,7 +10553,7 @@ mysql_declare_plugin(ndbcluster) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(ndbcluster) +mariadb_declare_plugin(ndbcluster) { MYSQL_STORAGE_ENGINE_PLUGIN, &ndbcluster_storage_engine, @@ -10569,7 +10569,7 @@ maria_declare_plugin(ndbcluster) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; #else int Sun_ar_require_a_symbol_here= 0; === modified file 'sql/ha_partition.cc' --- a/sql/ha_partition.cc 2010-08-24 12:47:26 +0000 +++ b/sql/ha_partition.cc 2010-08-24 19:42:16 +0000 @@ -6734,7 +6734,7 @@ mysql_declare_plugin(partition) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(partition) +mariadb_declare_plugin(partition) { MYSQL_STORAGE_ENGINE_PLUGIN, &partition_storage_engine, @@ -6750,6 +6750,6 @@ maria_declare_plugin(partition) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; #endif === modified file 'sql/log.cc' --- a/sql/log.cc 2010-08-24 12:47:26 +0000 +++ b/sql/log.cc 2010-08-24 19:42:16 +0000 @@ -6086,7 +6086,7 @@ mysql_declare_plugin(binlog) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(binlog) +mariadb_declare_plugin(binlog) { MYSQL_STORAGE_ENGINE_PLUGIN, &binlog_storage_engine, @@ -6102,4 +6102,4 @@ maria_declare_plugin(binlog) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'sql/sql_acl.cc' --- a/sql/sql_acl.cc 2010-08-24 12:47:26 +0000 +++ b/sql/sql_acl.cc 2010-08-24 19:42:16 +0000 @@ -8333,7 +8333,7 @@ mysql_declare_plugin(mysql_password) } mysql_declare_plugin_end; -maria_declare_plugin(mysql_password) +mariadb_declare_plugin(mysql_password) { MYSQL_AUTHENTICATION_PLUGIN, /* type constant */ &native_password_handler, /* type descriptor */ @@ -8364,4 +8364,4 @@ maria_declare_plugin(mysql_password) "1.0", /* String version */ MariaDB_PLUGIN_MATURITY_BETA /* Maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'sql/sql_builtin.cc.in' --- a/sql/sql_builtin.cc.in 2010-04-01 14:34:51 +0000 +++ b/sql/sql_builtin.cc.in 2010-08-24 19:42:16 +0000 @@ -16,12 +16,12 @@ #include <my_global.h> #include <mysql/plugin.h> -typedef struct st_maria_plugin builtin_maria_plugin[]; +typedef struct st_mariadb_plugin builtin_mariadb_plugin[]; -extern builtin_maria_plugin - builtin_maria_binlog_plugin, builtin_maria_mysql_password_plugin@maria_plugin_defs@; +extern builtin_mariadb_plugin + builtin_mariadb_binlog_plugin, builtin_mariadb_mysql_password_plugin@mariadb_plugin_defs@; -struct st_maria_plugin *mariadb_builtins[]= +struct st_mariadb_plugin *mariadb_builtins[]= { - builtin_maria_binlog_plugin, builtin_maria_mysql_password_plugin@maria_plugin_defs@,(struct st_maria_plugin *)0 + builtin_mariadb_binlog_plugin, builtin_mariadb_mysql_password_plugin@mariadb_plugin_defs@,(struct st_mariadb_plugin *)0 }; === modified file 'sql/sql_plugin.cc' --- a/sql/sql_plugin.cc 2010-08-24 12:47:26 +0000 +++ b/sql/sql_plugin.cc 2010-08-24 19:42:16 +0000 @@ -20,7 +20,7 @@ #define REPORT_TO_LOG 1 #define REPORT_TO_USER 2 -extern struct st_maria_plugin *mariadb_builtins[]; +extern struct st_mariadb_plugin *mariadb_builtins[]; /** @note The order of the enumeration is critical. @@ -90,14 +90,14 @@ static const char *sizeof_st_plugin_sym= "_mysql_sizeof_struct_st_plugin_"; static const char *plugin_declarations_sym= "_mysql_plugin_declarations_"; static int min_plugin_interface_version= MYSQL_PLUGIN_INTERFACE_VERSION & ~0xFF; -static const char *maria_plugin_interface_version_sym= - "_maria_plugin_interface_version_"; -static const char *maria_sizeof_st_plugin_sym= - "_maria_sizeof_struct_st_plugin_"; -static const char *maria_plugin_declarations_sym= - "_maria_plugin_declarations_"; -static int min_maria_plugin_interface_version= - MARIA_PLUGIN_INTERFACE_VERSION & ~0xFF; +static const char *mariadb_plugin_interface_version_sym= + "_mariadb_plugin_interface_version_"; +static const char *mariadb_sizeof_st_plugin_sym= + "_mariadb_sizeof_struct_st_plugin_"; +static const char *mariadb_plugin_declarations_sym= + "_mariadb_plugin_declarations_"; +static int min_mariadb_plugin_interface_version= + MariaDB_PLUGIN_INTERFACE_VERSION & ~0xFF; #endif /* Note that 'int version' must be the first field of every plugin @@ -231,7 +231,7 @@ static bool plugin_load_list(MEM_ROOT *t const char *list); static int test_plugin_options(MEM_ROOT *, struct st_plugin_int *, int *, char **); -static bool register_builtin(struct st_maria_plugin *, struct st_plugin_int *, +static bool register_builtin(struct st_mariadb_plugin *, struct st_plugin_int *, struct st_plugin_int **); static void unlock_variables(THD *thd, struct system_variables *vars); static void cleanup_variables(THD *thd, struct system_variables *vars); @@ -405,7 +405,7 @@ static my_bool read_mysql_plugin_info(st void *sym, char *dlpath, int report) { - DBUG_ENTER("read_maria_plugin_info"); + DBUG_ENTER("read_mysql_plugin_info"); /* Determine interface version */ if (!sym) { @@ -413,7 +413,7 @@ static my_bool read_mysql_plugin_info(st report_error(report, ER_CANT_FIND_DL_ENTRY, plugin_interface_version_sym); DBUG_RETURN(TRUE); } - plugin_dl->mariaversion= 0; + plugin_dl->mariadbversion= 0; plugin_dl->mysqlversion= *(int *)sym; /* Versioning */ if (plugin_dl->mysqlversion < min_plugin_interface_version || @@ -432,12 +432,12 @@ static my_bool read_mysql_plugin_info(st DBUG_RETURN(TRUE); } - /* convert mysql declaration to maria one */ + /* convert mysql declaration to mariadb one */ { int i; uint sizeof_st_plugin; struct st_mysql_plugin *old; - struct st_maria_plugin *cur; + struct st_mariadb_plugin *cur; char *ptr= (char *)sym; if ((sym= dlsym(plugin_dl->handle, sizeof_st_plugin_sym))) @@ -453,8 +453,8 @@ static my_bool read_mysql_plugin_info(st i++) /* no op */; - cur= (struct st_maria_plugin*) - my_malloc((i + 1) * sizeof(struct st_maria_plugin), + cur= (struct st_mariadb_plugin*) + my_malloc((i + 1) * sizeof(struct st_mariadb_plugin), MYF(MY_ZEROFILL|MY_WME)); if (!cur) { @@ -495,12 +495,12 @@ static my_bool read_mysql_plugin_info(st cur[i].newfield= old->newfield; } */ - /* Maria only fields */ + /* MariaDB only fields */ cur[i].version_info= "Unknown"; cur[i].maturity= MariaDB_PLUGIN_MATURITY_UNKNOWN; } plugin_dl->allocated= true; - plugin_dl->plugins= (struct st_maria_plugin *)cur; + plugin_dl->plugins= (struct st_mariadb_plugin *)cur; } DBUG_RETURN(FALSE); @@ -508,7 +508,7 @@ static my_bool read_mysql_plugin_info(st /** - Reads data from maria plugin interface + Reads data from mariadb plugin interface @param plugin_dl Structure where the data should be put @param sym Reverence on version info @@ -519,29 +519,29 @@ static my_bool read_mysql_plugin_info(st @retval TRUE ERROR */ -static my_bool read_maria_plugin_info(struct st_plugin_dl *plugin_dl, +static my_bool read_mariadb_plugin_info(struct st_plugin_dl *plugin_dl, void *sym, char *dlpath, int report) { - DBUG_ENTER("read_maria_plugin_info"); + DBUG_ENTER("read_mariadb_plugin_info"); /* Determine interface version */ if (!(sym)) { /* - Actually this branch impossible because in case of absence of maria + Actually this branch impossible because in case of absence of mariadb version we try mysql version. */ free_plugin_mem(plugin_dl); report_error(report, ER_CANT_FIND_DL_ENTRY, - maria_plugin_interface_version_sym); + mariadb_plugin_interface_version_sym); DBUG_RETURN(TRUE); } - plugin_dl->mariaversion= *(int *)sym; + plugin_dl->mariadbversion= *(int *)sym; plugin_dl->mysqlversion= 0; /* Versioning */ - if (plugin_dl->mariaversion < min_maria_plugin_interface_version || - (plugin_dl->mariaversion >> 8) > (MARIA_PLUGIN_INTERFACE_VERSION >> 8)) + if (plugin_dl->mariadbversion < min_mariadb_plugin_interface_version || + (plugin_dl->mariadbversion >> 8) > (MariaDB_PLUGIN_INTERFACE_VERSION >> 8)) { free_plugin_mem(plugin_dl); report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, 0, @@ -549,24 +549,24 @@ static my_bool read_maria_plugin_info(st DBUG_RETURN(TRUE); } /* Find plugin declarations */ - if (!(sym= dlsym(plugin_dl->handle, maria_plugin_declarations_sym))) + if (!(sym= dlsym(plugin_dl->handle, mariadb_plugin_declarations_sym))) { free_plugin_mem(plugin_dl); - report_error(report, ER_CANT_FIND_DL_ENTRY, maria_plugin_declarations_sym); + report_error(report, ER_CANT_FIND_DL_ENTRY, mariadb_plugin_declarations_sym); DBUG_RETURN(TRUE); } - if (plugin_dl->mariaversion != MARIA_PLUGIN_INTERFACE_VERSION) + if (plugin_dl->mariadbversion != MariaDB_PLUGIN_INTERFACE_VERSION) { uint sizeof_st_plugin; - struct st_maria_plugin *old, *cur; + struct st_mariadb_plugin *old, *cur; char *ptr= (char *)sym; - if ((sym= dlsym(plugin_dl->handle, maria_sizeof_st_plugin_sym))) + if ((sym= dlsym(plugin_dl->handle, mariadb_sizeof_st_plugin_sym))) sizeof_st_plugin= *(int *)sym; else { free_plugin_mem(plugin_dl); - report_error(report, ER_CANT_FIND_DL_ENTRY, maria_sizeof_st_plugin_sym); + report_error(report, ER_CANT_FIND_DL_ENTRY, mariadb_sizeof_st_plugin_sym); DBUG_RETURN(TRUE); } @@ -574,12 +574,12 @@ static my_bool read_maria_plugin_info(st { int i; for (i= 0; - ((struct st_maria_plugin *)(ptr + i * sizeof_st_plugin))->info; + ((struct st_mariadb_plugin *)(ptr + i * sizeof_st_plugin))->info; i++) /* no op */; - cur= (struct st_maria_plugin*) - my_malloc((i + 1) * sizeof(struct st_maria_plugin), + cur= (struct st_mariadb_plugin*) + my_malloc((i + 1) * sizeof(struct st_mariadb_plugin), MYF(MY_ZEROFILL|MY_WME)); if (!cur) { @@ -593,7 +593,7 @@ static my_bool read_maria_plugin_info(st have less values than the struct definition. */ for (i=0; - (old= (struct st_maria_plugin *)(ptr + i * sizeof_st_plugin))->info; + (old= (struct st_mariadb_plugin *)(ptr + i * sizeof_st_plugin))->info; i++) memcpy(cur + i, old, min(sizeof(cur[i]), sizeof_st_plugin)); @@ -601,7 +601,7 @@ static my_bool read_maria_plugin_info(st plugin_dl->allocated= true; } } - plugin_dl->plugins= (struct st_maria_plugin *)sym; + plugin_dl->plugins= (struct st_mariadb_plugin *)sym; DBUG_RETURN(FALSE); } @@ -656,7 +656,7 @@ static st_plugin_dl *plugin_dl_add(const } /* Checks which plugin interface present and reads info */ - if (!(sym= dlsym(plugin_dl.handle, maria_plugin_interface_version_sym))) + if (!(sym= dlsym(plugin_dl.handle, mariadb_plugin_interface_version_sym))) { if (read_mysql_plugin_info(&plugin_dl, dlsym(plugin_dl.handle, @@ -667,7 +667,7 @@ static st_plugin_dl *plugin_dl_add(const } else { - if (read_maria_plugin_info(&plugin_dl, sym, dlpath, report)) + if (read_mariadb_plugin_info(&plugin_dl, sym, dlpath, report)) DBUG_RETURN(0); } @@ -931,7 +931,7 @@ static bool plugin_add(MEM_ROOT *tmp_roo int *argc, char **argv, int report) { struct st_plugin_int tmp; - struct st_maria_plugin *plugin; + struct st_mariadb_plugin *plugin; DBUG_ENTER("plugin_add"); if (plugin_find_internal(name, MYSQL_ANY_PLUGIN)) { @@ -1348,8 +1348,8 @@ int plugin_init(int *argc, char **argv, { uint i; bool is_myisam; - struct st_maria_plugin **builtins; - struct st_maria_plugin *plugin; + struct st_mariadb_plugin **builtins; + struct st_mariadb_plugin *plugin; struct st_plugin_int tmp, *plugin_ptr, **reap; MEM_ROOT tmp_root; bool reaped_mandatory_plugin= FALSE; @@ -1503,7 +1503,7 @@ err: } -static bool register_builtin(struct st_maria_plugin *plugin, +static bool register_builtin(struct st_mariadb_plugin *plugin, struct st_plugin_int *tmp, struct st_plugin_int **ptr) { @@ -1539,7 +1539,7 @@ static bool register_builtin(struct st_m RETURN false - plugin registered successfully */ -bool plugin_register_builtin(THD *thd, struct st_maria_plugin *plugin) +bool plugin_register_builtin(THD *thd, struct st_mariadb_plugin *plugin) { struct st_plugin_int tmp, *ptr; bool result= true; @@ -1673,7 +1673,7 @@ static bool plugin_load_list(MEM_ROOT *t char buffer[FN_REFLEN]; LEX_STRING name= {buffer, 0}, dl= {NULL, 0}, *str= &name; struct st_plugin_dl *plugin_dl; - struct st_maria_plugin *plugin; + struct st_mariadb_plugin *plugin; char *p= buffer; DBUG_ENTER("plugin_load_list"); while (list) === modified file 'sql/sql_plugin.h' --- a/sql/sql_plugin.h 2010-06-16 17:01:22 +0000 +++ b/sql/sql_plugin.h 2010-08-24 19:42:16 +0000 @@ -52,9 +52,9 @@ struct st_plugin_dl { LEX_STRING dl; void *handle; - struct st_maria_plugin *plugins; + struct st_mariadb_plugin *plugins; int mysqlversion; - int mariaversion; + int mariadbversion; bool allocated; uint ref_count; /* number of plugins loaded from the library */ }; @@ -64,7 +64,7 @@ struct st_plugin_dl struct st_plugin_int { LEX_STRING name; - struct st_maria_plugin *plugin; + struct st_mariadb_plugin *plugin; struct st_plugin_dl *plugin_dl; uint state; uint ref_count; /* number of threads using the plugin */ @@ -127,7 +127,6 @@ extern void plugin_unlock_list(THD *thd, extern bool mysql_install_plugin(THD *thd, const LEX_STRING *name, const LEX_STRING *dl); extern bool mysql_uninstall_plugin(THD *thd, const LEX_STRING *name); -extern bool plugin_register_builtin(struct st_mysql_plugin *plugin); extern void plugin_thdvar_init(THD *thd); extern void plugin_thdvar_cleanup(THD *thd); === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2010-08-24 12:47:26 +0000 +++ b/sql/sql_show.cc 2010-08-24 19:42:16 +0000 @@ -110,7 +110,7 @@ static my_bool show_plugins(THD *thd, pl void *arg) { TABLE *table= (TABLE*) arg; - struct st_maria_plugin *plug= plugin_decl(plugin); + struct st_mariadb_plugin *plug= plugin_decl(plugin); struct st_plugin_dl *plugin_dl= plugin_dlib(plugin); CHARSET_INFO *cs= system_charset_info; char version_buf[20]; @@ -155,7 +155,7 @@ static my_bool show_plugins(THD *thd, pl table->field[5]->set_notnull(); table->field[6]->store(version_buf, make_version_string(version_buf, sizeof(version_buf), - plugin_dl->mariaversion), + plugin_dl->mariadbversion), cs); table->field[6]->set_notnull(); } @@ -4494,7 +4494,7 @@ static my_bool iter_schema_engines(THD * if (plugin_state(plugin) != PLUGIN_IS_READY) { - struct st_maria_plugin *plug= plugin_decl(plugin); + struct st_mariadb_plugin *plug= plugin_decl(plugin); if (!(wild && wild[0] && wild_case_compare(scs, plug->name,wild))) { === modified file 'storage/archive/ha_archive.cc' --- a/storage/archive/ha_archive.cc 2010-07-25 15:09:21 +0000 +++ b/storage/archive/ha_archive.cc 2010-08-24 19:42:16 +0000 @@ -1682,7 +1682,7 @@ mysql_declare_plugin(archive) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(archive) +mariadb_declare_plugin(archive) { MYSQL_STORAGE_ENGINE_PLUGIN, &archive_storage_engine, @@ -1698,5 +1698,5 @@ maria_declare_plugin(archive) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'storage/blackhole/ha_blackhole.cc' --- a/storage/blackhole/ha_blackhole.cc 2010-04-01 14:34:51 +0000 +++ b/storage/blackhole/ha_blackhole.cc 2010-08-24 19:42:16 +0000 @@ -369,7 +369,7 @@ mysql_declare_plugin(blackhole) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(blackhole) +mariadb_declare_plugin(blackhole) { MYSQL_STORAGE_ENGINE_PLUGIN, &blackhole_storage_engine, @@ -385,4 +385,4 @@ maria_declare_plugin(blackhole) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'storage/csv/ha_tina.cc' --- a/storage/csv/ha_tina.cc 2010-07-09 11:39:19 +0000 +++ b/storage/csv/ha_tina.cc 2010-08-24 19:42:16 +0000 @@ -1655,7 +1655,7 @@ mysql_declare_plugin(csv) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(csv) +mariadb_declare_plugin(csv) { MYSQL_STORAGE_ENGINE_PLUGIN, &csv_storage_engine, @@ -1671,4 +1671,4 @@ maria_declare_plugin(csv) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'storage/example/ha_example.cc' --- a/storage/example/ha_example.cc 2010-07-24 06:10:03 +0000 +++ b/storage/example/ha_example.cc 2010-08-24 19:42:16 +0000 @@ -1076,7 +1076,7 @@ mysql_declare_plugin(example) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(example) +mariadb_declare_plugin(example) { MYSQL_STORAGE_ENGINE_PLUGIN, &example_storage_engine, @@ -1092,4 +1092,4 @@ maria_declare_plugin(example) "0.1", /* string version */ MariaDB_PLUGIN_MATURITY_EXPERIMENTAL /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'storage/federated/ha_federated.cc' --- a/storage/federated/ha_federated.cc 2010-07-25 15:09:21 +0000 +++ b/storage/federated/ha_federated.cc 2010-08-24 19:42:16 +0000 @@ -3416,7 +3416,7 @@ mysql_declare_plugin(federated) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(federated) +mariadb_declare_plugin(federated) { MYSQL_STORAGE_ENGINE_PLUGIN, &federated_storage_engine, @@ -3432,4 +3432,4 @@ maria_declare_plugin(federated) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_BETA /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'storage/federatedx/ha_federatedx.cc' --- a/storage/federatedx/ha_federatedx.cc 2010-08-24 12:47:26 +0000 +++ b/storage/federatedx/ha_federatedx.cc 2010-08-24 19:42:16 +0000 @@ -3582,7 +3582,7 @@ mysql_declare_plugin(federatedx) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(federatedx) +mariadb_declare_plugin(federatedx) { MYSQL_STORAGE_ENGINE_PLUGIN, &federatedx_storage_engine, @@ -3598,4 +3598,4 @@ maria_declare_plugin(federatedx) "2.0", /* string version */ MariaDB_PLUGIN_MATURITY_BETA /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'storage/heap/ha_heap.cc' --- a/storage/heap/ha_heap.cc 2010-04-01 14:34:51 +0000 +++ b/storage/heap/ha_heap.cc 2010-08-24 19:42:16 +0000 @@ -767,7 +767,7 @@ mysql_declare_plugin(heap) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(heap) +mariadb_declare_plugin(heap) { MYSQL_STORAGE_ENGINE_PLUGIN, &heap_storage_engine, @@ -783,4 +783,4 @@ maria_declare_plugin(heap) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'storage/ibmdb2i/ha_ibmdb2i.cc' --- a/storage/ibmdb2i/ha_ibmdb2i.cc 2010-07-16 22:41:44 +0000 +++ b/storage/ibmdb2i/ha_ibmdb2i.cc 2010-08-24 19:42:16 +0000 @@ -3355,7 +3355,7 @@ mysql_declare_plugin(ibmdb2i) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(ibmdb2i) +mariadb_declare_plugin(ibmdb2i) { MYSQL_STORAGE_ENGINE_PLUGIN, &ibmdb2i_storage_engine, @@ -3371,4 +3371,4 @@ maria_declare_plugin(ibmdb2i) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_UNKNOWN /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'storage/maria/ha_maria.cc' --- a/storage/maria/ha_maria.cc 2010-08-24 12:47:26 +0000 +++ b/storage/maria/ha_maria.cc 2010-08-24 19:42:16 +0000 @@ -3546,7 +3546,7 @@ mysql_declare_plugin(maria) NULL } mysql_declare_plugin_end; -maria_declare_plugin(maria) +mariadb_declare_plugin(maria) { MYSQL_STORAGE_ENGINE_PLUGIN, &maria_storage_engine, @@ -3562,4 +3562,4 @@ maria_declare_plugin(maria) "1.5", /* string version */ MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'storage/myisam/ha_myisam.cc' --- a/storage/myisam/ha_myisam.cc 2010-07-25 15:09:21 +0000 +++ b/storage/myisam/ha_myisam.cc 2010-08-24 19:42:16 +0000 @@ -2134,7 +2134,7 @@ mysql_declare_plugin(myisam) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(myisam) +mariadb_declare_plugin(myisam) { MYSQL_STORAGE_ENGINE_PLUGIN, &myisam_storage_engine, @@ -2150,7 +2150,7 @@ maria_declare_plugin(myisam) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; #ifdef HAVE_QUERY_CACHE === modified file 'storage/myisammrg/ha_myisammrg.cc' --- a/storage/myisammrg/ha_myisammrg.cc 2010-08-24 12:47:26 +0000 +++ b/storage/myisammrg/ha_myisammrg.cc 2010-08-24 19:42:16 +0000 @@ -1326,7 +1326,7 @@ mysql_declare_plugin(myisammrg) NULL /* config options */ } mysql_declare_plugin_end; -maria_declare_plugin(myisammrg) +mariadb_declare_plugin(myisammrg) { MYSQL_STORAGE_ENGINE_PLUGIN, &myisammrg_storage_engine, @@ -1342,4 +1342,4 @@ maria_declare_plugin(myisammrg) "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; === modified file 'storage/pbxt/src/ha_pbxt.cc' --- a/storage/pbxt/src/ha_pbxt.cc 2010-06-01 19:52:20 +0000 +++ b/storage/pbxt/src/ha_pbxt.cc 2010-08-24 19:42:16 +0000 @@ -6070,7 +6070,7 @@ drizzle_declare_plugin_end; #else mysql_declare_plugin_end; #ifdef MARIADB_BASE_VERSION -maria_declare_plugin(pbxt) +mariadb_declare_plugin(pbxt) { /* PBXT */ MYSQL_STORAGE_ENGINE_PLUGIN, &pbxt_storage_engine, @@ -6101,7 +6101,7 @@ maria_declare_plugin(pbxt) "1.0.09g RC3", /* string version */ MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */ } -maria_declare_plugin_end; +mariadb_declare_plugin_end; #endif #endif === modified file 'storage/sphinx/ha_sphinx.cc' --- a/storage/sphinx/ha_sphinx.cc 2010-07-19 18:53:28 +0000 +++ b/storage/sphinx/ha_sphinx.cc 2010-08-24 19:42:16 +0000 @@ -3088,8 +3088,8 @@ mysql_declare_plugin(sphinx) } mysql_declare_plugin_end; -#ifdef maria_declare_plugin -maria_declare_plugin(sphinx) +#ifdef mariadb_declare_plugin +mariadb_declare_plugin(sphinx) { MYSQL_STORAGE_ENGINE_PLUGIN, &sphinx_storage_engine, @@ -3105,7 +3105,7 @@ maria_declare_plugin(sphinx) "0.1", // string version MariaDB_PLUGIN_MATURITY_EXPERIMENTAL } -maria_declare_plugin_end; +mariadb_declare_plugin_end; #endif #endif // >50100 === modified file 'storage/xtradb/handler/ha_innodb.cc' --- a/storage/xtradb/handler/ha_innodb.cc 2010-08-24 16:48:58 +0000 +++ b/storage/xtradb/handler/ha_innodb.cc 2010-08-24 19:42:16 +0000 @@ -11541,7 +11541,7 @@ i_s_innodb_sys_tables, i_s_innodb_sys_indexes, i_s_innodb_patches mysql_declare_plugin_end; -maria_declare_plugin(xtradb) +mariadb_declare_plugin(xtradb) { /* InnoDB */ MYSQL_STORAGE_ENGINE_PLUGIN, &innobase_storage_engine, @@ -11557,24 +11557,24 @@ maria_declare_plugin(xtradb) INNODB_VERSION_STR, /* string version */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ }, -i_s_innodb_rseg_maria, -i_s_innodb_buffer_pool_pages_maria, -i_s_innodb_buffer_pool_pages_index_maria, -i_s_innodb_buffer_pool_pages_blob_maria, -i_s_innodb_trx_maria, -i_s_innodb_locks_maria, -i_s_innodb_lock_waits_maria, -i_s_innodb_cmp_maria, -i_s_innodb_cmp_reset_maria, -i_s_innodb_cmpmem_maria, -i_s_innodb_cmpmem_reset_maria, -i_s_innodb_table_stats_maria, -i_s_innodb_index_stats_maria, -i_s_innodb_admin_command_maria, -i_s_innodb_sys_tables_maria, -i_s_innodb_sys_indexes_maria, -i_s_innodb_patches_maria -maria_declare_plugin_end; +i_s_innodb_rseg_mariadb, +i_s_innodb_buffer_pool_pages_mariadb, +i_s_innodb_buffer_pool_pages_index_mariadb, +i_s_innodb_buffer_pool_pages_blob_mariadb, +i_s_innodb_trx_mariadb, +i_s_innodb_locks_mariadb, +i_s_innodb_lock_waits_mariadb, +i_s_innodb_cmp_mariadb, +i_s_innodb_cmp_reset_mariadb, +i_s_innodb_cmpmem_mariadb, +i_s_innodb_cmpmem_reset_mariadb, +i_s_innodb_table_stats_mariadb, +i_s_innodb_index_stats_mariadb, +i_s_innodb_admin_command_mariadb, +i_s_innodb_sys_tables_mariadb, +i_s_innodb_sys_indexes_mariadb, +i_s_innodb_patches_mariadb +mariadb_declare_plugin_end; /** @brief Initialize the default value of innodb_commit_concurrency. === modified file 'storage/xtradb/handler/i_s.cc' --- a/storage/xtradb/handler/i_s.cc 2010-08-24 12:47:26 +0000 +++ b/storage/xtradb/handler/i_s.cc 2010-08-24 19:42:16 +0000 @@ -394,7 +394,7 @@ UNIV_INTERN struct st_mysql_plugin STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_patches_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_patches_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -1094,7 +1094,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_buffer_pool_pages_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -1196,7 +1196,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages_index_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_buffer_pool_pages_index_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -1298,7 +1298,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_buffer_pool_pages_blob_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_buffer_pool_pages_blob_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -1587,7 +1587,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_trx_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_trx_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -1915,7 +1915,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_locks_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_locks_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -2151,7 +2151,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_lock_waits_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_lock_waits_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -2536,7 +2536,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_cmp_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -2639,7 +2639,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_cmp_reset_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_cmp_reset_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -2910,7 +2910,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_cmpmem_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -3013,7 +3013,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_cmpmem_reset_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_cmpmem_reset_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -3246,7 +3246,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_rseg_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_rseg_mariadb = { /* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* int */ @@ -3627,7 +3627,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_table_stats_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_table_stats_mariadb = { STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), STRUCT_FLD(info, &i_s_info), @@ -3660,7 +3660,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_index_stats_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_index_stats_mariadb = { STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), STRUCT_FLD(info, &i_s_info), @@ -3843,7 +3843,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_admin_command_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_admin_command_mariadb = { STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), STRUCT_FLD(info, &i_s_info), @@ -4402,7 +4402,7 @@ UNIV_INTERN struct st_mysql_plugin i_s STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_tables_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_sys_tables_mariadb = { STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), STRUCT_FLD(info, &i_s_info), @@ -4435,7 +4435,7 @@ UNIV_INTERN struct st_mysql_plugin i_s STRUCT_FLD(__reserved1, NULL) }; -UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_indexes_maria = +UNIV_INTERN struct st_mariadb_plugin i_s_innodb_sys_indexes_mariadb = { STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), STRUCT_FLD(info, &i_s_info), === modified file 'storage/xtradb/handler/i_s.h' --- a/storage/xtradb/handler/i_s.h 2010-06-07 21:53:25 +0000 +++ b/storage/xtradb/handler/i_s.h 2010-08-24 19:42:16 +0000 @@ -44,22 +44,22 @@ extern struct st_mysql_plugin i_s_innodb extern struct st_mysql_plugin i_s_innodb_sys_tables; extern struct st_mysql_plugin i_s_innodb_sys_indexes; -extern struct st_maria_plugin i_s_innodb_buffer_pool_pages_maria; -extern struct st_maria_plugin i_s_innodb_buffer_pool_pages_index_maria; -extern struct st_maria_plugin i_s_innodb_buffer_pool_pages_blob_maria; -extern struct st_maria_plugin i_s_innodb_trx_maria; -extern struct st_maria_plugin i_s_innodb_locks_maria; -extern struct st_maria_plugin i_s_innodb_lock_waits_maria; -extern struct st_maria_plugin i_s_innodb_cmp_maria; -extern struct st_maria_plugin i_s_innodb_cmp_reset_maria; -extern struct st_maria_plugin i_s_innodb_cmpmem_maria; -extern struct st_maria_plugin i_s_innodb_cmpmem_reset_maria; -extern struct st_maria_plugin i_s_innodb_patches_maria; -extern struct st_maria_plugin i_s_innodb_rseg_maria; -extern struct st_maria_plugin i_s_innodb_table_stats_maria; -extern struct st_maria_plugin i_s_innodb_index_stats_maria; -extern struct st_maria_plugin i_s_innodb_admin_command_maria; -extern struct st_maria_plugin i_s_innodb_sys_tables_maria; -extern struct st_maria_plugin i_s_innodb_sys_indexes_maria; +extern struct st_mariadb_plugin i_s_innodb_buffer_pool_pages_mariadb; +extern struct st_mariadb_plugin i_s_innodb_buffer_pool_pages_index_mariadb; +extern struct st_mariadb_plugin i_s_innodb_buffer_pool_pages_blob_mariadb; +extern struct st_mariadb_plugin i_s_innodb_trx_mariadb; +extern struct st_mariadb_plugin i_s_innodb_locks_mariadb; +extern struct st_mariadb_plugin i_s_innodb_lock_waits_mariadb; +extern struct st_mariadb_plugin i_s_innodb_cmp_mariadb; +extern struct st_mariadb_plugin i_s_innodb_cmp_reset_mariadb; +extern struct st_mariadb_plugin i_s_innodb_cmpmem_mariadb; +extern struct st_mariadb_plugin i_s_innodb_cmpmem_reset_mariadb; +extern struct st_mariadb_plugin i_s_innodb_patches_mariadb; +extern struct st_mariadb_plugin i_s_innodb_rseg_mariadb; +extern struct st_mariadb_plugin i_s_innodb_table_stats_mariadb; +extern struct st_mariadb_plugin i_s_innodb_index_stats_mariadb; +extern struct st_mariadb_plugin i_s_innodb_admin_command_mariadb; +extern struct st_mariadb_plugin i_s_innodb_sys_tables_mariadb; +extern struct st_mariadb_plugin i_s_innodb_sys_indexes_mariadb; #endif /* i_s_h */