diff options
author | unknown <monty@narttu.mysql.fi> | 2003-08-28 22:18:02 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-08-28 22:18:02 +0300 |
commit | 7c701a603f9d9740ce7640770ee6f75043cb2b06 (patch) | |
tree | f39244679eaca00bb7f900f129b56e7b4c08528e /sql/sql_class.h | |
parent | 52a802708fa5cfe5c5ce7cc4fcfc8b1f1d9967e1 (diff) | |
download | mariadb-git-7c701a603f9d9740ce7640770ee6f75043cb2b06.tar.gz |
Portability fixes
client/mysqltest.c:
Removed not used functions
myisam/mi_dynrec.c:
Added assert to avoid compilation errors
mysql-test/r/isam.result:
Updated results after merge
sql/log_event.cc:
Cleanup
sql/mysql_priv.h:
Cleanup
sql/sql_class.cc:
Moved Table_ident functions to .cc file to allow them to use table_case_convert()
sql/sql_class.h:
Moved Table_ident functions to .cc file to allow them to use table_case_convert()
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 64a314911ec..abf69628d2c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -33,7 +33,7 @@ enum enum_duplicates { DUP_ERROR, DUP_REPLACE, DUP_IGNORE }; enum enum_log_type { LOG_CLOSED, LOG_TO_BE_OPENED, LOG_NORMAL, LOG_NEW, LOG_BIN}; enum enum_delay_key_write { DELAY_KEY_WRITE_NONE, DELAY_KEY_WRITE_ON, DELAY_KEY_WRITE_ALL }; -extern inline void table_case_convert(char * name, uint length); + /* log info errors */ #define LOG_INFO_EOF -1 #define LOG_INFO_IO -2 @@ -762,22 +762,8 @@ class Table_ident :public Sql_alloc { public: LEX_STRING db; LEX_STRING table; - inline Table_ident(LEX_STRING db_arg,LEX_STRING table_arg,bool force) - :table(table_arg) - { - if (!force && (current_thd->client_capabilities & CLIENT_NO_SCHEMA)) - db.str=0; - else - db= db_arg; - if (db.str) - table_case_convert(db.str,db.length); - table_case_convert(table.str,table.length); - } - inline Table_ident(LEX_STRING table_arg) :table(table_arg) - { - db.str=0; - table_case_convert(table.str,table.length); - } + Table_ident(LEX_STRING db_arg,LEX_STRING table_arg,bool force); + Table_ident(LEX_STRING table_arg); inline void change_db(char *db_name) { db.str= db_name; db.length=(uint) strlen(db_name); } }; |