diff options
| author | jan@hundin.mysql.fi <> | 2004-12-21 15:53:01 +0200 |
|---|---|---|
| committer | jan@hundin.mysql.fi <> | 2004-12-21 15:53:01 +0200 |
| commit | d3a979888d100754a1ab2b93d57b55233fa7a5b5 (patch) | |
| tree | aa593488b37f8bd515a5a7b453a5b5132fb28d9e /sql/ha_innodb.cc | |
| parent | 198dc7a8ec6e220c348bb47e59a2ac7532be18b8 (diff) | |
| download | mariadb-git-d3a979888d100754a1ab2b93d57b55233fa7a5b5.tar.gz | |
Review fixes.
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 61481de6e10..cb23e31225b 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -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" |