mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/merge-5.1 sql/mysql_priv.h: Auto merged
This commit is contained in:
@ -21,6 +21,9 @@
|
||||
except the part which must be in the server and in the client.
|
||||
*/
|
||||
|
||||
#ifndef MYSQL_PRIV_H
|
||||
#define MYSQL_PRIV_H
|
||||
|
||||
#ifndef MYSQL_CLIENT
|
||||
|
||||
#include <my_global.h>
|
||||
@ -2007,3 +2010,5 @@ bool schema_table_store_record(THD *thd, TABLE *table);
|
||||
|
||||
#endif /* MYSQL_SERVER */
|
||||
#endif /* MYSQL_CLIENT */
|
||||
|
||||
#endif /* MYSQL_PRIV_H */
|
||||
|
Reference in New Issue
Block a user