summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2003-04-11 20:09:24 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2003-04-11 20:09:24 +0300
commit3e335144be1af3f7c70a0c385b4e88da2c1e5e94 (patch)
tree6d097446e8d8e6493071189f90aafaf9de9bab16 /sql/sql_update.cc
parentd5f3f5500f078a090bf38bc4c0ab13471e42f4d6 (diff)
downloadmariadb-git-3e335144be1af3f7c70a0c385b4e88da2c1e5e94.tar.gz
Two bug fixes
mysql-test/r/innodb.result: Fix for a bug that caused queries with ORDER BY field_in_select_list to be returned entirely unsorted. mysql-test/t/innodb.test: Fix for a bug that caused queries with ORDER BY field_in_select_list to be returned entirely unsorted. sql/sql_select.cc: Fix for a bug that caused queries with ORDER BY field_in_select_list to be returned entirely unsorted. sql/sql_update.cc: Fix for a glitch that caused too many tables to be locked.
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r--sql/sql_update.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 59c766e7a9f..de370ab92b5 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -478,7 +478,14 @@ int multi_update::prepare(List<Item> &not_used_values)
table->used_keys=0;
table->pos_in_table_list= tl;
}
+ else
+ {
+ table_ref->lock_type=TL_READ;
+ mysql_unlock_some_tables(thd,&table,1);
+ }
}
+
+
table_count= update.elements;
update_tables= (TABLE_LIST*) update.first;