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

merge with 4.0

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2003-10-16 03:08:40 +03:00
parent 0d34e50f39 4d45ad98b9
commit e87c9f5ff8
24 changed files with 251 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_insert.cc
View File

@@ -1553,6 +1553,14 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
if (!table)
DBUG_RETURN(-1); // abort() deletes table
if (table->fields < values.elements)
{
my_printf_error(ER_WRONG_VALUE_COUNT_ON_ROW,
ER(ER_WRONG_VALUE_COUNT_ON_ROW),
MYF(0),1);
DBUG_RETURN(-1);
}
/* First field to copy */
field=table->field+table->fields - values.elements;
@@ -1611,7 +1619,7 @@ bool select_create::send_eof()
*/
if (!table->tmp_table)
hash_delete(&open_cache,(byte*) table);
lock=0;
lock=0;
table=0;
VOID(pthread_mutex_unlock(&LOCK_open));
}
@@ -1632,7 +1640,8 @@ void select_create::abort()
enum db_type table_type=table->db_type;
if (!table->tmp_table)
hash_delete(&open_cache,(byte*) table);
quick_rm_table(table_type,db,name);
if (!create_info->table_existed)
quick_rm_table(table_type,db,name);
table=0;
}
VOID(pthread_mutex_unlock(&LOCK_open));