database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

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

Browse Source 
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2


sql/opt_range.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
This commit is contained in:
unknown
2005-01-12 23:22:12 +03:00
parent 4c9d5f80c1 5861c6dc17
commit 4596579c99
6 changed files with 154 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/ha_innodb.cc
View File

@@ -2302,13 +2302,7 @@ build_template(
ulint n_fields;
ulint n_requested_fields = 0;
ibool fetch_all_in_key = FALSE;
ibool fetch_primary_key_cols = TRUE; /* The ROR code in
opt_range.cc assumes that the
primary key cols are always
retrieved. Starting from
MySQL-5.0.2, let us always
fetch them, even though it
wastes some CPU. */
ibool fetch_primary_key_cols = FALSE;
ulint i;
if (prebuilt->select_lock_type == LOCK_X) {