mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-wl2936-two client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ndb_dd_basic.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/ndb_dd_basic.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/hash.c: Auto merged sql/event_queue.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_partition.cc: Auto merged sql/handler.cc: Auto merged sql/item_func.cc: Auto merged sql/item_sum.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_connect.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/innobase/handler/ha_innodb.h: Auto merged include/typelib.h: WL#2936 - Falcon & MySQL plugin interface: server variables Manual merge mysys/typelib.c: WL#2936 - Falcon & MySQL plugin interface: server variables Manual merge
This commit is contained in:
@ -43,37 +43,37 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables);
|
||||
const char *any_db="*any*"; // Special symbol for check_access
|
||||
|
||||
const LEX_STRING command_name[]={
|
||||
C_STRING_WITH_LEN("Sleep"),
|
||||
C_STRING_WITH_LEN("Quit"),
|
||||
C_STRING_WITH_LEN("Init DB"),
|
||||
C_STRING_WITH_LEN("Query"),
|
||||
C_STRING_WITH_LEN("Field List"),
|
||||
C_STRING_WITH_LEN("Create DB"),
|
||||
C_STRING_WITH_LEN("Drop DB"),
|
||||
C_STRING_WITH_LEN("Refresh"),
|
||||
C_STRING_WITH_LEN("Shutdown"),
|
||||
C_STRING_WITH_LEN("Statistics"),
|
||||
C_STRING_WITH_LEN("Processlist"),
|
||||
C_STRING_WITH_LEN("Connect"),
|
||||
C_STRING_WITH_LEN("Kill"),
|
||||
C_STRING_WITH_LEN("Debug"),
|
||||
C_STRING_WITH_LEN("Ping"),
|
||||
C_STRING_WITH_LEN("Time"),
|
||||
C_STRING_WITH_LEN("Delayed insert"),
|
||||
C_STRING_WITH_LEN("Change user"),
|
||||
C_STRING_WITH_LEN("Binlog Dump"),
|
||||
C_STRING_WITH_LEN("Table Dump"),
|
||||
C_STRING_WITH_LEN("Connect Out"),
|
||||
C_STRING_WITH_LEN("Register Slave"),
|
||||
C_STRING_WITH_LEN("Prepare"),
|
||||
C_STRING_WITH_LEN("Execute"),
|
||||
C_STRING_WITH_LEN("Long Data"),
|
||||
C_STRING_WITH_LEN("Close stmt"),
|
||||
C_STRING_WITH_LEN("Reset stmt"),
|
||||
C_STRING_WITH_LEN("Set option"),
|
||||
C_STRING_WITH_LEN("Fetch"),
|
||||
C_STRING_WITH_LEN("Daemon"),
|
||||
C_STRING_WITH_LEN("Error") // Last command number
|
||||
{ STRING_WITH_LEN("Sleep") },
|
||||
{ STRING_WITH_LEN("Quit") },
|
||||
{ STRING_WITH_LEN("Init DB") },
|
||||
{ STRING_WITH_LEN("Query") },
|
||||
{ STRING_WITH_LEN("Field List") },
|
||||
{ STRING_WITH_LEN("Create DB") },
|
||||
{ STRING_WITH_LEN("Drop DB") },
|
||||
{ STRING_WITH_LEN("Refresh") },
|
||||
{ STRING_WITH_LEN("Shutdown") },
|
||||
{ STRING_WITH_LEN("Statistics") },
|
||||
{ STRING_WITH_LEN("Processlist") },
|
||||
{ STRING_WITH_LEN("Connect") },
|
||||
{ STRING_WITH_LEN("Kill") },
|
||||
{ STRING_WITH_LEN("Debug") },
|
||||
{ STRING_WITH_LEN("Ping") },
|
||||
{ STRING_WITH_LEN("Time") },
|
||||
{ STRING_WITH_LEN("Delayed insert") },
|
||||
{ STRING_WITH_LEN("Change user") },
|
||||
{ STRING_WITH_LEN("Binlog Dump") },
|
||||
{ STRING_WITH_LEN("Table Dump") },
|
||||
{ STRING_WITH_LEN("Connect Out") },
|
||||
{ STRING_WITH_LEN("Register Slave") },
|
||||
{ STRING_WITH_LEN("Prepare") },
|
||||
{ STRING_WITH_LEN("Execute") },
|
||||
{ STRING_WITH_LEN("Long Data") },
|
||||
{ STRING_WITH_LEN("Close stmt") },
|
||||
{ STRING_WITH_LEN("Reset stmt") },
|
||||
{ STRING_WITH_LEN("Set option") },
|
||||
{ STRING_WITH_LEN("Fetch") },
|
||||
{ STRING_WITH_LEN("Daemon") },
|
||||
{ STRING_WITH_LEN("Error") } // Last command number
|
||||
};
|
||||
|
||||
const char *xa_state_names[]={
|
||||
|
Reference in New Issue
Block a user