Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-12-26 11:26:06-08:00, antony@stripped +12 -0
Merge ppcg5.local:/Users/antony/Work/mysql-5.0-engines
into ppcg5.local:/Users/antony/Work/mysql-5.0-engines-merge
MERGE: 1.2344.1.8
myisam/mi_check.c@stripped, 2006-12-26 11:26:00-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.147.1.1
myisam/mi_dynrec.c@stripped, 2006-12-26 11:26:00-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.43.1.2
myisam/mi_packrec.c@stripped, 2006-12-26 11:26:00-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.35.1.1
myisam/mi_range.c@stripped, 2006-12-26 11:26:00-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.16.1.1
myisam/mi_test1.c@stripped, 2006-12-26 11:26:00-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.27.1.1
myisam/mi_write.c@stripped, 2006-12-26 11:26:00-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.58.1.1
myisam/rt_split.c@stripped, 2006-12-26 11:26:00-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.14.1.1
sql/ha_federated.cc@stripped, 2006-12-26 11:26:00-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.71.1.1
sql/opt_range.cc@stripped, 2006-12-26 11:26:00-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.234.1.1
sql/sql_class.h@stripped, 2006-12-26 11:26:01-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.313.1.2
sql/sql_insert.cc@stripped, 2006-12-26 11:26:01-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.206.1.1
sql/sql_parse.cc@stripped, 2006-12-26 11:26:01-08:00, antony@stripped +0 -0
Auto merged
MERGE: 1.595.1.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: antony
# Host: ppcg5.local
# Root: /Users/antony/Work/mysql-5.0-engines-merge/RESYNC
--- 1.148/myisam/mi_check.c 2006-12-26 11:26:14 -08:00
+++ 1.149/myisam/mi_check.c 2006-12-26 11:26:14 -08:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.45/myisam/mi_dynrec.c 2006-12-26 11:26:14 -08:00
+++ 1.46/myisam/mi_dynrec.c 2006-12-26 11:26:14 -08:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.37/myisam/mi_packrec.c 2006-12-26 11:26:14 -08:00
+++ 1.38/myisam/mi_packrec.c 2006-12-26 11:26:14 -08:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.17/myisam/mi_range.c 2006-12-26 11:26:14 -08:00
+++ 1.18/myisam/mi_range.c 2006-12-26 11:26:14 -08:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.28/myisam/mi_test1.c 2006-12-26 11:26:14 -08:00
+++ 1.29/myisam/mi_test1.c 2006-12-26 11:26:14 -08:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.59/myisam/mi_write.c 2006-12-26 11:26:14 -08:00
+++ 1.60/myisam/mi_write.c 2006-12-26 11:26:14 -08:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.235/sql/opt_range.cc 2006-12-26 11:26:14 -08:00
+++ 1.236/sql/opt_range.cc 2006-12-26 11:26:14 -08:00
@@ -874,7 +874,11 @@ QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT(
if (file)
{
range_end();
- file->extra(HA_EXTRA_NO_KEYREAD);
+ if (head->key_read)
+ {
+ head->key_read= 0;
+ file->extra(HA_EXTRA_NO_KEYREAD);
+ }
if (free_file)
{
DBUG_PRINT("info", ("Freeing separate handler 0x%lx (free: %d)", (long) file,
@@ -1016,8 +1020,12 @@ int QUICK_RANGE_SELECT::init_ror_merged_
if (reuse_handler)
{
DBUG_PRINT("info", ("Reusing handler %p", file));
- if (file->extra(HA_EXTRA_KEYREAD) ||
- file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) ||
+ if (!head->no_keyread)
+ {
+ head->key_read= 1;
+ file->extra(HA_EXTRA_KEYREAD);
+ }
+ if (file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) ||
init() || reset())
{
DBUG_RETURN(1);
@@ -1040,9 +1048,12 @@ int QUICK_RANGE_SELECT::init_ror_merged_
}
if (file->external_lock(thd, F_RDLCK))
goto failure;
-
- if (file->extra(HA_EXTRA_KEYREAD) ||
- file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) ||
+ if (!head->no_keyread)
+ {
+ head->key_read= 1;
+ file->extra(HA_EXTRA_KEYREAD);
+ }
+ if (file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) ||
init() || reset())
{
file->external_lock(thd, F_UNLCK);
--- 1.315/sql/sql_class.h 2006-12-26 11:26:14 -08:00
+++ 1.316/sql/sql_class.h 2006-12-26 11:26:14 -08:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.209/sql/sql_insert.cc 2006-12-26 11:26:14 -08:00
+++ 1.210/sql/sql_insert.cc 2006-12-26 11:26:14 -08:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.596/sql/sql_parse.cc 2006-12-26 11:26:14 -08:00
+++ 1.597/sql/sql_parse.cc 2006-12-26 11:26:14 -08:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.15/myisam/rt_split.c 2006-12-26 11:26:14 -08:00
+++ 1.16/myisam/rt_split.c 2006-12-26 11:26:14 -08:00
@@ -3,8 +3,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 1.72/sql/ha_federated.cc 2006-12-26 11:26:14 -08:00
+++ 1.73/sql/ha_federated.cc 2006-12-26 11:26:14 -08:00
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
| Thread |
|---|
| • bk commit into 5.0 tree (antony:1.2353) | antony | 26 Dec |
