database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-03 05:41:09 +03:00
Code Activity

Merge into latest 5.2.

Browse Source
This commit is contained in:
unknown
2012-08-24 12:57:19 +02:00
parent 1fd8150a5b 96703a63da
commit 89e4d23f3b
42 changed files with 1144 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysql_priv.h
View File

@@ -1397,7 +1397,7 @@ bool append_escaped(String *to_str, String *from_str);
/* sql_show.cc */
bool mysqld_show_open_tables(THD *thd,const char *wild);
bool mysqld_show_logs(THD *thd);
void append_identifier(THD *thd, String *packet, const char *name,
bool append_identifier(THD *thd, String *packet, const char *name,
uint length);
#endif /* MYSQL_SERVER */
#if defined MYSQL_SERVER || defined INNODB_COMPATIBILITY_HOOKS