cleanup: remove redundant arguments

Author: vuvova

sql/sql_insert.cc

@@ -4523,9 +4523,7 @@ TABLE *select_create::create_table_from_items(THD *thd, List<Item> *items,
  open_table().
  */
 
- if (!mysql_create_table_no_lock(thd, &create_table->db,
- &create_table->table_name,
- create_info, alter_info, NULL,
+ if (!mysql_create_table_no_lock(thd, create_info, alter_info, NULL,
  select_field_count, create_table))
  {
  DEBUG_SYNC(thd,"create_table_select_before_open");

sql/sql_table.cc

@@ -5449,16 +5449,16 @@ int create_table_impl(THD *thd, const LEX_CSTRING &orig_db,
  -1 Table was used with IF NOT EXISTS and table existed (warning, not error)
 */
 
-int mysql_create_table_no_lock(THD *thd, const LEX_CSTRING *db,
- const LEX_CSTRING *table_name,
- Table_specification_st *create_info,
+int mysql_create_table_no_lock(THD *thd, Table_specification_st *create_info,
  Alter_info *alter_info, bool *is_trans,
  int create_table_mode, TABLE_LIST *table_list)
 {
  KEY *not_used_1;
  uint not_used_2;
  int res;
  char path[FN_REFLEN + 1];
+ const LEX_CSTRING *db= &table_list->db;
+ const LEX_CSTRING *table_name= &table_list->table_name;
  LEX_CUSTRING frm= {0,0};
 
  if (create_info->tmp_table())
@@ -5635,11 +5635,8 @@ bool mysql_create_table(THD *thd, TABLE_LIST *create_table,
  /* We can abort create table for any table type */
  thd->abort_on_warning= thd->is_strict_mode();
 
- if (mysql_create_table_no_lock(thd, &create_table->db,
- &create_table->table_name, create_info,
- alter_info,
- &is_trans, create_table_mode,
- create_table) > 0)
+ if (mysql_create_table_no_lock(thd, create_info, alter_info, &is_trans,
+ create_table_mode, create_table) > 0)
  {
  result= 1;
  goto err;
@@ -6116,10 +6113,8 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table,
  pos_in_locked_tables= local_create_info.table->pos_in_locked_tables; 
 
  res= ((create_res=
- mysql_create_table_no_lock(thd, &table->db, &table->table_name,
- &local_create_info, &local_alter_info,
- &is_trans, C_ORDINARY_CREATE,
- table)) > 0);
+ mysql_create_table_no_lock(thd, &local_create_info, &local_alter_info,
+ &is_trans, C_ORDINARY_CREATE, table)) > 0);
  /* Remember to log if we deleted something */
  do_logging= thd->log_current_statement;
  if (res)

sql/sql_table.h

@@ -194,9 +194,7 @@ bool add_keyword_to_query(THD *thd, String *result, const LEX_CSTRING *keyword,
 #define C_ALTER_TABLE_FRM_ONLY -2
 #define C_ASSISTED_DISCOVERY -3
 
-int mysql_create_table_no_lock(THD *thd, const LEX_CSTRING *db,
- const LEX_CSTRING *table_name,
- Table_specification_st *create_info,
+int mysql_create_table_no_lock(THD *thd, Table_specification_st *create_info,
  Alter_info *alter_info, bool *is_trans,
  int create_table_mode, TABLE_LIST *table);