Commit 342c5488 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/psergey/mysql-5.0-oct25-test
parents ac8b32f9 ba0c548c

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -15,5 +15,4 @@ rpl_relayrotate : Unstable test case, bug#12429 
rpl_until       : Unstable test case, bug#12429

rpl_deadlock    : Unstable test case, bug#12429

kill            : Unstable test case, bug#9712

federated       : Broken test case, bug#14272

archive_gis     : The test fails on 32bit Linux

sql/sql_update.cc

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ int mysql_update(THD *thd, 
      /* If quick select is used, initialize it before retrieving rows. */

      if (select && select->quick && select->quick->reset())

        goto err;

      if (used_index == MAX_KEY)

      if (used_index == MAX_KEY || (select && select->quick))

        init_read_record(&info,thd,table,select,0,1);

      else

        init_read_record_idx(&info, thd, table, 1, used_index);