diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-17 20:47:20 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-17 20:47:20 +0200 |
| commit | 11cbe4271c2f931562bdb5f496dcfa6ebd22760f (patch) | |
| tree | 9189968dca2f68cfe5634ccd7ac1cd1a8a6228d2 /sql/mysql_priv.h | |
| parent | 4a66de6dd0f7250dedf28e0c4316cc9d6a9c0ed4 (diff) | |
| parent | 621be521f8ea5680a6c3412ce944819290043117 (diff) | |
| download | mariadb-git-11cbe4271c2f931562bdb5f496dcfa6ebd22760f.tar.gz | |
merge with 3.23.47 (DO statement)
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Docs/manual.texi:
merge
sql/Makefile.am:
merge
sql/mysql_priv.h:
merge
sql/sql_lex.h:
merge
sql/sql_yacc.yy:
merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index abce5b0c4ac..27dba4d62fd 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -412,6 +412,9 @@ extern pthread_mutex_t LOCK_des_key_file; bool load_des_key_file(const char *file_name); #endif /* HAVE_OPENSSL */ +/* sql_do.cc */ +int mysql_do(THD *thd, List<Item> &values); + /* sql_list.c */ int mysqld_show_dbs(THD *thd,const char *wild); int mysqld_show_open_tables(THD *thd,const char *wild); |