mirror of
https://github.com/MariaDB/server.git
synced 2026-04-27 18:55:31 +02:00
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1 sql/ha_innodb.cc: Auto merged sql/handler.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_show.cc: Auto merged
This commit is contained in:
commit
4770190ab8
129 changed files with 1991 additions and 5104 deletions
|
|
@ -23,9 +23,9 @@ char *opt_plugin_dir_ptr;
|
|||
char opt_plugin_dir[FN_REFLEN];
|
||||
LEX_STRING plugin_type_names[]=
|
||||
{
|
||||
{ STRING_WITH_LEN("UDF") },
|
||||
{ STRING_WITH_LEN("STORAGE ENGINE") },
|
||||
{ STRING_WITH_LEN("FTPARSER") }
|
||||
{ (char *)STRING_WITH_LEN("UDF") },
|
||||
{ (char *)STRING_WITH_LEN("STORAGE ENGINE") },
|
||||
{ (char *)STRING_WITH_LEN("FTPARSER") }
|
||||
};
|
||||
static const char *plugin_interface_version_sym=
|
||||
"_mysql_plugin_interface_version_";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue