1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into hundin.mysql.fi:/home/heikki/mysql-4.1
This commit is contained in:
heikki@hundin.mysql.fi 2005-02-25 22:01:33 +02:00
commit e40a88ea62
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
innobase/row/row0sel.c
View File

@ -2912,14 +2912,19 @@ row_search_for_mysql(
ut_error;
}
if (trx->n_mysql_tables_in_use == 0) {
if (trx->n_mysql_tables_in_use == 0
&& prebuilt->select_lock_type == LOCK_NONE) {
/* Note that if MySQL uses an InnoDB temp table that it
created inside LOCK TABLES, then n_mysql_tables_in_use can
be zero; in that case select_lock_type is set to LOCK_X in
::start_stmt. */
fputs(
"InnoDB: Error: MySQL is trying to perform a SELECT\n"
"InnoDB: but it has not locked any tables in ::external_lock()!\n",
stderr);
trx_print(stderr, trx);
fputc('\n', stderr);
ut_a(0);
}
/* fprintf(stderr, "Match mode %lu\n search tuple ", (ulong) match_mode);