database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

better fix for bug#7242 (crash in prepared INSERT ... UPDATE)

Browse Source
This commit is contained in:
serg@serg.mylan
2004-12-24 23:30:40 +01:00
parent d38db21048
commit 735d25ed73
2 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_insert.cc
View File

@@ -427,6 +427,7 @@ abort:
thd - thread handler thd - thread handler
table_list - global table list table_list - global table list
insert_table_list - local table list of INSERT SELECT_LEX insert_table_list - local table list of INSERT SELECT_LEX
values - values to insert. NULL for INSERT ... SELECT
RETURN VALUE RETURN VALUE
0 - OK 0 - OK
@@ -442,7 +443,7 @@ int mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
if (duplic == DUP_UPDATE && !table->insert_values) if (duplic == DUP_UPDATE && !table->insert_values)
{ {
/* it should be allocated before Item::fix_fields() */ /* it should be allocated before Item::fix_fields() */
table->insert_values= table->insert_values=
(byte *)alloc_root(thd->mem_root, table->rec_buff_length); (byte *)alloc_root(thd->mem_root, table->rec_buff_length);
if (!table->insert_values) if (!table->insert_values)
DBUG_RETURN(-1); DBUG_RETURN(-1);
@@ -454,10 +455,8 @@ int mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
(setup_fields(thd, 0, insert_table_list, update_fields, 1, 0, 0) || (setup_fields(thd, 0, insert_table_list, update_fields, 1, 0, 0) ||
setup_fields(thd, 0, insert_table_list, update_values, 1, 0, 0)))) setup_fields(thd, 0, insert_table_list, update_values, 1, 0, 0))))
DBUG_RETURN(-1); DBUG_RETURN(-1);
if ((thd->lex->sql_command==SQLCOM_INSERT || if (values && find_real_table_in_list(table_list->next, table_list->db,
thd->lex->sql_command==SQLCOM_REPLACE) && table_list->real_name))
find_real_table_in_list(table_list->next,
table_list->db, table_list->real_name))
{ {
my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->real_name); my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->real_name);
DBUG_RETURN(-1); DBUG_RETURN(-1);

30
sql/sql_prepare.cc
View File

@@ -908,14 +908,15 @@ static int mysql_test_insert(Prepared_statement *stmt,
uint value_count; uint value_count;
ulong counter= 0; ulong counter= 0;
table_list->table->insert_values=(byte *)1; // don't allocate insert_values
if ((res= mysql_prepare_insert(thd, table_list, insert_table_list, if ((res= mysql_prepare_insert(thd, table_list, insert_table_list,
table_list->table, fields, values, table_list->table, fields, values,
update_fields, update_values, duplic))) update_fields, update_values, duplic)))
goto error; goto error;
value_count= values->elements; value_count= values->elements;
its.rewind(); its.rewind();
while ((values= its++)) while ((values= its++))
{ {
counter++; counter++;
@@ -934,6 +935,7 @@ static int mysql_test_insert(Prepared_statement *stmt,
res= 0; res= 0;
error: error:
lex->unit.cleanup(); lex->unit.cleanup();
table_list->table->insert_values=0;
DBUG_RETURN(res); DBUG_RETURN(res);
} }
@@ -1513,28 +1515,6 @@ static bool init_param_array(Prepared_statement *stmt)
return 0; return 0;
} }
/* Init statement before execution */
static void cleanup_stmt_for_execute(Prepared_statement *stmt)
{
THD *thd= stmt->thd;
LEX *lex= stmt->lex;
SELECT_LEX *sl= lex->all_selects_list;
for (; sl; sl= sl->next_select_in_list())
{
for (TABLE_LIST *tables= (TABLE_LIST*) sl->table_list.first;
tables;
tables= tables->next)
{
if (tables->table)
tables->table->insert_values= 0;
}
}
}
/* /*
Given a query string with parameter markers, create a Prepared Statement Given a query string with parameter markers, create a Prepared Statement
from it and send PS info back to the client. from it and send PS info back to the client.
@@ -1635,7 +1615,6 @@ int mysql_stmt_prepare(THD *thd, char *packet, uint packet_length,
if (!error) if (!error)
error= send_prepare_results(stmt, test(name)); error= send_prepare_results(stmt, test(name));
cleanup_stmt_for_execute(stmt);
/* restore to WAIT_PRIOR: QUERY_PRIOR is set inside alloc_query */ /* restore to WAIT_PRIOR: QUERY_PRIOR is set inside alloc_query */
if (!(specialflag & SPECIAL_NO_PRIOR)) if (!(specialflag & SPECIAL_NO_PRIOR))
@@ -1926,7 +1905,6 @@ static void execute_stmt(THD *thd, Prepared_statement *stmt,
reset_stmt_params(stmt); reset_stmt_params(stmt);
close_thread_tables(thd); // to close derived tables close_thread_tables(thd); // to close derived tables
thd->set_statement(&thd->stmt_backup); thd->set_statement(&thd->stmt_backup);
cleanup_stmt_for_execute(stmt);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }