diff options
| author | <Dao-Gang.Qu@sun.com> | 2010-01-25 10:55:05 +0800 |
|---|---|---|
| committer | <Dao-Gang.Qu@sun.com> | 2010-01-25 10:55:05 +0800 |
| commit | 8a66b424f3a3be667f4548f618377c2bd9b825ac (patch) | |
| tree | 79b80f370265c5019547a5ef30b218665a358d84 /sql/mysql_priv.h | |
| parent | 25a436bdc4a043bc7adb842c009d30d2130c13d2 (diff) | |
| parent | 6bf8c119feff7e15d19aea0a6893b2706891d3c1 (diff) | |
| download | mariadb-git-8a66b424f3a3be667f4548f618377c2bd9b825ac.tar.gz | |
Manual merge with Conflicts:
sql_udf.cc
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 76edbf1dea3..e99effe1dcb 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1036,8 +1036,8 @@ check_and_unset_inject_value(int value) #endif -void write_bin_log(THD *thd, bool clear_error, - char const *query, ulong query_length); +int write_bin_log(THD *thd, bool clear_error, + char const *query, ulong query_length); /* sql_connect.cc */ int check_user(THD *thd, enum enum_server_command command, @@ -1426,6 +1426,12 @@ inline bool is_schema_db(const char *name, size_t len) INFORMATION_SCHEMA_NAME.str, name)); } +inline bool is_schema_db(const char *name) +{ + return !my_strcasecmp(system_charset_info, + INFORMATION_SCHEMA_NAME.str, name); +} + /* sql_prepare.cc */ void mysqld_stmt_prepare(THD *thd, const char *packet, uint packet_length); |