Skip to content

M
mariadb
Commit d3a97988 authored by jan@hundin.mysql.fi's avatar jan@hundin.mysql.fi
Browse files
Options

Review fixes.

parent 198dc7a8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
sql/ha_innodb.cc
View file @ d3a97988
...@@ -5357,7 +5357,7 @@ ha_innobase::transactional_table_lock( ...@@ -5357,7 +5357,7 @@ ha_innobase::transactional_table_lock(
"MySQL is trying to use a table handle but the .ibd file for\n" "MySQL is trying to use a table handle but the .ibd file for\n"
"table %s does not exist.\n" "table %s does not exist.\n"
"Have you deleted the .ibd file from the database directory under\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" "Look from section 15.1 of http://www.innodb.com/ibman.html\n"
"how you can resolve the problem.\n", "how you can resolve the problem.\n",
prebuilt->table->name); prebuilt->table->name);
...@@ -5376,8 +5376,8 @@ ha_innobase::transactional_table_lock( ...@@ -5376,8 +5376,8 @@ ha_innobase::transactional_table_lock(
prebuilt->select_lock_type = LOCK_X; prebuilt->select_lock_type = LOCK_X;
prebuilt->stored_select_lock_type = LOCK_X; prebuilt->stored_select_lock_type = LOCK_X;
} else if (lock_type == F_RDLCK) { } else if (lock_type == F_RDLCK) {
prebuilt->select_lock_type = LOCK_X; prebuilt->select_lock_type = LOCK_S;
prebuilt->stored_select_lock_type = LOCK_X; prebuilt->stored_select_lock_type = LOCK_S;
} else { } else {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fprintf(stderr, " InnoDB error:\n" fprintf(stderr, " InnoDB error:\n"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7