Commit 10242064 authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
parents 376c5307 6b32f5a1
...@@ -3124,12 +3124,17 @@ row_search_for_mysql( ...@@ -3124,12 +3124,17 @@ row_search_for_mysql(
be zero; in that case select_lock_type is set to LOCK_X in be zero; in that case select_lock_type is set to LOCK_X in
::start_stmt. */ ::start_stmt. */
/* August 19, 2005 by Heikki: temporarily disable this error print until the
cursor lock count is done correctly. See bugs #12263 and #12456!
fputs( fputs(
"InnoDB: Error: MySQL is trying to perform a SELECT\n" "InnoDB: Error: MySQL is trying to perform a SELECT\n"
"InnoDB: but it has not locked any tables in ::external_lock()!\n", "InnoDB: but it has not locked any tables in ::external_lock()!\n",
stderr); stderr);
trx_print(stderr, trx, 600); trx_print(stderr, trx, 600);
fputc('\n', stderr); fputc('\n', stderr);
*/
} }
/* fprintf(stderr, "Match mode %lu\n search tuple ", (ulong) match_mode); /* fprintf(stderr, "Match mode %lu\n search tuple ", (ulong) match_mode);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment