Commit 61213dbc authored by monty@narttu.mysql.fi's avatar monty@narttu.mysql.fi

Code cleanup

parent 39635eb2
...@@ -89,14 +89,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, ...@@ -89,14 +89,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
*enclosed=ex->enclosed; *enclosed=ex->enclosed;
bool is_fifo=0; bool is_fifo=0;
LOAD_FILE_INFO lf_info; LOAD_FILE_INFO lf_info;
char * db = table_list->db ? table_list->db : thd->db; char *db = table_list->db; // This is never null
char * tdb= thd->db ? thd->db : db; /* If no current database, use database where table is located */
/* char *tdb= thd->db ? thd->db : db;
'tdb' can be NULL only if both table_list->db and thd->db are NULL
'db' itself can be NULL. but in that case it will generate
an error earlier open_ltable()).
*/
bool transactional_table, log_delayed; bool transactional_table, log_delayed;
DBUG_ENTER("mysql_load"); DBUG_ENTER("mysql_load");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment