Commit 2bb2af5b authored by tomas@mc05.(none)'s avatar tomas@mc05.(none)

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

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
parents 8599b630 d9dc42b5
...@@ -1747,7 +1747,12 @@ innobase_mysql_cmp( ...@@ -1747,7 +1747,12 @@ innobase_mysql_cmp(
} }
} }
ret = my_strnncoll(charset, /* Starting from 4.1.3 we use strnncollsp() in comparisons of
non-latin1_swedish_ci strings. NOTE that the collation order
changes then: 'b\0\0...' is ordered BEFORE 'b ...'. Users
having indexes on such data need to rebuild their tables! */
ret = charset->coll->strnncollsp(charset,
a, a_length, a, a_length,
b, b_length); b, b_length);
if (ret < 0) { if (ret < 0) {
...@@ -4658,25 +4663,6 @@ ha_innobase::start_stmt( ...@@ -4658,25 +4663,6 @@ ha_innobase::start_stmt(
prebuilt->select_lock_type = LOCK_X; prebuilt->select_lock_type = LOCK_X;
} else { } else {
/* When we first come here after LOCK TABLES,
select_lock_type is set to LOCK_S or LOCK_X. Store the value
in case we run also consistent reads and need to restore the
value later. */
if (prebuilt->select_lock_type != LOCK_NONE) {
prebuilt->stored_select_lock_type =
prebuilt->select_lock_type;
}
if (prebuilt->stored_select_lock_type != LOCK_S
&& prebuilt->stored_select_lock_type != LOCK_X) {
fprintf(stderr,
"InnoDB: Error: select_lock_type is %lu inside ::start_stmt()!\n",
prebuilt->stored_select_lock_type);
ut_error;
}
if (thd->lex->sql_command == SQLCOM_SELECT if (thd->lex->sql_command == SQLCOM_SELECT
&& thd->lex->lock_option == TL_READ) { && thd->lex->lock_option == TL_READ) {
...@@ -4685,10 +4671,11 @@ ha_innobase::start_stmt( ...@@ -4685,10 +4671,11 @@ ha_innobase::start_stmt(
prebuilt->select_lock_type = LOCK_NONE; prebuilt->select_lock_type = LOCK_NONE;
} else { } else {
/* Not a consistent read: restore the /* Not a consistent read: use LOCK_X as the
select_lock_type value */ select_lock_type value (TODO: how could we know
prebuilt->select_lock_type = whether it should be LOCK_S, LOCK_X, or LOCK_NONE?) */
prebuilt->stored_select_lock_type;
prebuilt->select_lock_type = LOCK_X;
} }
} }
......
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