Skip to content

Commit 32e9871

Browse files
committed
MDEV-37404 Cleanups
Deadcode leftovers.
1 parent 70476c1 commit 32e9871

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

sql/sql_insert.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,11 @@ bool mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields,
3434
List<List_item> &values, List<Item> &update_fields,
3535
List<Item> &update_values, enum_duplicates flag,
3636
bool ignore, select_result* result);
37-
void upgrade_lock_type_for_insert(THD *thd, thr_lock_type *lock_type,
38-
enum_duplicates duplic,
39-
bool is_multi_insert);
4037
int check_that_all_fields_are_given_values(THD *thd, TABLE *entry,
4138
TABLE_LIST *table_list);
4239
int vers_insert_history_row(TABLE *table);
4340
int check_duplic_insert_without_overlaps(THD *thd, TABLE *table,
4441
enum_duplicates duplic);
45-
int write_record(THD *thd, TABLE *table, COPY_INFO *info,
46-
select_result *returning= NULL);
4742
void kill_delayed_threads(void);
4843
bool binlog_create_table(THD *thd, TABLE *table, bool replace);
4944
bool binlog_drop_table(THD *thd, TABLE *table);

sql/sql_prepare.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ When one supplies long data for a placeholder:
9797
#include "sql_view.h" // create_view_precheck
9898
#include "sql_delete.h" // mysql_prepare_delete
9999
#include "sql_select.h" // for JOIN
100-
#include "sql_insert.h" // upgrade_lock_type_for_insert, mysql_prepare_insert
100+
#include "sql_insert.h" // mysql_prepare_insert
101101
#include "sql_update.h" // mysql_prepare_update
102102
#include "sql_db.h" // mysql_opt_change_db, mysql_change_db
103103
#include "sql_derived.h" // mysql_derived_prepare,
@@ -1310,8 +1310,6 @@ static bool mysql_test_insert_common(Prepared_statement *stmt,
13101310
if (insert_precheck(thd, table_list))
13111311
goto error;
13121312

1313-
//upgrade_lock_type_for_insert(thd, &table_list->lock_type, duplic,
1314-
// values_list.elements > 1);
13151313
/*
13161314
open temporary memory pool for temporary data allocated by derived
13171315
tables & preparation procedure

0 commit comments

Comments
 (0)