mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into hundin.mysql.fi:/home/jan/mysql-5.0
This commit is contained in:
jan@hundin.mysql.fi 2004-12-21 15:54:04 +02:00
commit d035ccb434
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/ha_innodb.cc
View file

@ -5357,7 +5357,7 @@ ha_innobase::transactional_table_lock(
"MySQL is trying to use a table handle but the .ibd file for\n"
"table %s does not exist.\n"
"Have you deleted the .ibd file from the database directory under\n"
"the MySQL datadir, or have you used DISCARD TABLESPACE?\n"
"the MySQL datadir?"
"Look from section 15.1 of http://www.innodb.com/ibman.html\n"
"how you can resolve the problem.\n",
prebuilt->table->name);
@ -5376,8 +5376,8 @@ ha_innobase::transactional_table_lock(
prebuilt->select_lock_type = LOCK_X;
prebuilt->stored_select_lock_type = LOCK_X;
} else if (lock_type == F_RDLCK) {
prebuilt->select_lock_type = LOCK_X;
prebuilt->stored_select_lock_type = LOCK_X;
prebuilt->select_lock_type = LOCK_S;
prebuilt->stored_select_lock_type = LOCK_S;
} else {
ut_print_timestamp(stderr);
fprintf(stderr, " InnoDB error:\n"