diff options
| author | unknown <serg@serg.mylan> | 2006-01-07 14:50:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-01-07 14:50:03 +0100 |
| commit | 4770190ab808b17c014d205a0320f4c42e93598e (patch) | |
| tree | a6b97cdc61401b4f6ed3844e3fb547844bfb11b1 /sql/sql_plugin.cc | |
| parent | 031ee043fb88f033c430df1c3c1890f8ea40d7e8 (diff) | |
| parent | d8dccc31058e8448e18981308395aac890cc4224 (diff) | |
| download | mariadb-git-4770190ab808b17c014d205a0320f4c42e93598e.tar.gz | |
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
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 4e156fb7c11..b8628b18dd4 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -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_"; |