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 | 6fd5403d3105eb5df3e23a2dcf7ddd33a3589778 (patch) | |
tree | f39244679eaca00bb7f900f129b56e7b4c08528e /sql/sql_class.cc | |
parent | 6866b92331fa7badc3d5ee34d2663bb4cc369917 (diff) | |
download | mariadb-git-6fd5403d3105eb5df3e23a2dcf7ddd33a3589778.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.cc')
-rw-r--r-- | sql/sql_class.cc | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 132e0d7745f..71aec69e49b 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -431,6 +431,29 @@ void THD::close_active_vio() #endif /***************************************************************************** + Table Ident +****************************************************************************/ + + +Table_ident::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); +} + +Table_ident::Table_ident(LEX_STRING table_arg) :table(table_arg) +{ + db.str=0; + table_case_convert(table.str,table.length); +} + +/***************************************************************************** ** Functions to provide a interface to select results *****************************************************************************/ |