diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
| commit | 4bf849c23c2fe2174016da630705a362f76d3922 (patch) | |
| tree | f39b89f218ff81ceb62349eb225a455d52c3ba78 /sql/mysql_priv.h | |
| parent | f04cf03f75ffca0b99562c027c1c57340d375f66 (diff) | |
| parent | 62db6839b82d824567979ef3e05caccd67ed11ec (diff) | |
| download | mariadb-git-4bf849c23c2fe2174016da630705a362f76d3922.tar.gz | |
Merge MySQL 5.1.44 into MariaDB.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index d11fc4f900b..499d7d2fc24 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -112,6 +112,10 @@ char* query_table_status(THD *thd,const char *db,const char *table_name); #define PREV_BITS(type,A) ((type) (((type) 1 << (A)) -1)) #define all_bits_set(A,B) ((A) & (B) != (B)) +/* Version numbers for deprecation messages */ +#define VER_BETONY "5.5" +#define VER_CELOSIA "5.6" + #define WARN_DEPRECATED(Thd,Ver,Old,New) \ do { \ DBUG_ASSERT(strncmp(Ver, MYSQL_SERVER_VERSION, sizeof(Ver)-1) > 0); \ @@ -121,7 +125,7 @@ char* query_table_status(THD *thd,const char *db,const char *table_name); (Old), (Ver), (New)); \ else \ sql_print_warning("The syntax '%s' is deprecated and will be removed " \ - "in MySQL %s. Please use %s instead.", (Old), (Ver), (New)); \ + "in a future release. Please use %s instead.", (Old), (New)); \ } while(0) extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *system_charset_info; @@ -1045,8 +1049,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, @@ -1434,8 +1438,18 @@ bool get_schema_tables_result(JOIN *join, enum enum_schema_table_state executed_place); enum enum_schema_tables get_schema_table_idx(ST_SCHEMA_TABLE *schema_table); -#define is_schema_db(X) \ - !my_strcasecmp(system_charset_info, INFORMATION_SCHEMA_NAME.str, (X)) +inline bool is_schema_db(const char *name, size_t len) +{ + return (INFORMATION_SCHEMA_NAME.length == len && + !my_strcasecmp(system_charset_info, + 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 */ |