Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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
1.2159 06/05/31 22:55:45 igor@stripped +8 -0
Post-merge fixes
sql/sql_base.cc
1.340 06/05/31 22:55:39 igor@stripped +2 -1
Post-merge fixes
mysql-test/t/view.test
1.147 06/05/31 22:55:39 igor@stripped +1 -1
Post-merge fixes
mysql-test/r/view.result
1.161 06/05/31 22:55:39 igor@stripped +1 -1
Post-merge fixes
mysql-test/r/select.result
1.125 06/05/31 22:55:39 igor@stripped +12 -2
Post-merge fixes
mysql-test/r/preload.result
1.11 06/05/31 22:55:39 igor@stripped +1 -1
Post-merge fixes
mysql-test/r/key_cache.result
1.19 06/05/31 22:55:39 igor@stripped +1 -1
Post-merge fixes
mysql-test/r/compress.result
1.4 06/05/31 22:55:39 igor@stripped +2 -2
Post-merge fixes
mysql-test/include/common-tests.inc
1.2 06/05/31 22:55:39 igor@stripped +2 -2
Post-merge fixes
# 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: igor
# Host: rurik.mysql.com
# Root: /home/igor/dev/mysql-5.0-0
--- 1.339/sql/sql_base.cc 2006-05-31 17:39:06 -07:00
+++ 1.340/sql/sql_base.cc 2006-05-31 22:55:39 -07:00
@@ -4441,6 +4441,7 @@
table_list= table_list->next_leaf, tablenr++)
{
TABLE *table= table_list->table;
+ table->pos_in_table_list= table_list;
if (first_select_table &&
table_list->top_table() == first_select_table)
{
@@ -4585,7 +4586,7 @@
0)
{
my_error(ER_KEY_DOES_NOT_EXITS, MYF(0), name->c_ptr(),
- table->s->table_name);
+ table->pos_in_table_list->alias);
map->set_all();
return 1;
}
--- 1.160/mysql-test/r/view.result 2006-05-22 07:57:40 -07:00
+++ 1.161/mysql-test/r/view.result 2006-05-31 22:55:39 -07:00
@@ -614,7 +614,7 @@
create table t1 (a int, b int);
create view v1 as select a, sum(b) from t1 group by a;
select b from v1 use index (some_index) where b=1;
-ERROR 42000: Key column 'some_index' doesn't exist in table
+ERROR HY000: Key 'some_index' doesn't exist in table 'v1'
drop view v1;
drop table t1;
create table t1 (col1 char(5),col2 char(5));
--- 1.146/mysql-test/t/view.test 2006-05-20 19:10:38 -07:00
+++ 1.147/mysql-test/t/view.test 2006-05-31 22:55:39 -07:00
@@ -516,7 +516,7 @@
#
create table t1 (a int, b int);
create view v1 as select a, sum(b) from t1 group by a;
--- error 1072
+-- error 1176
select b from v1 use index (some_index) where b=1;
drop view v1;
drop table t1;
--- 1.10/mysql-test/r/preload.result 2006-05-31 17:39:06 -07:00
+++ 1.11/mysql-test/r/preload.result 2006-05-31 22:55:39 -07:00
@@ -164,7 +164,7 @@
test.t2 preload_keys status Operation failed
Warnings:
Error 1146 Table 'test.t3' doesn't exist
-Error 1072 Key column 'c' doesn't exist in table
+Error 1176 Key 'c' doesn't exist in table 't2'
show status like "key_read%";
Variable_name Value
Key_read_requests 0
--- 1.124/mysql-test/r/select.result 2006-05-31 18:12:08 -07:00
+++ 1.125/mysql-test/r/select.result 2006-05-31 22:55:39 -07:00
@@ -144,9 +144,9 @@
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index
explain select fld3 from t2 ignore index (fld3,not_used);
-ERROR 42000: Key column 'not_used' doesn't exist in table
+ERROR HY000: Key 'not_used' doesn't exist in table 't2'
explain select fld3 from t2 use index (not_used);
-ERROR 42000: Key column 'not_used' doesn't exist in table
+ERROR HY000: Key 'not_used' doesn't exist in table 't2'
select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3;
fld3
honeysuckle
@@ -2716,6 +2716,16 @@
f1 f2
1 1
drop table t1,t2;
+CREATE TABLE t1 (a int, INDEX idx(a));
+INSERT INTO t1 VALUES (2), (3), (1);
+EXPLAIN SELECT * FROM t1 IGNORE INDEX (idx);
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 ALL NULL NULL NULL NULL 3
+EXPLAIN SELECT * FROM t1 IGNORE INDEX (a);
+ERROR HY000: Key 'a' doesn't exist in table 't1'
+EXPLAIN SELECT * FROM t1 FORCE INDEX (a);
+ERROR HY000: Key 'a' doesn't exist in table 't1'
+DROP TABLE t1;
CREATE TABLE t1 ( city char(30) );
INSERT INTO t1 VALUES ('London');
INSERT INTO t1 VALUES ('Paris');
--- 1.18/mysql-test/r/key_cache.result 2006-05-31 17:39:06 -07:00
+++ 1.19/mysql-test/r/key_cache.result 2006-05-31 22:55:39 -07:00
@@ -194,7 +194,7 @@
test.t1 assign_to_keycache error Key 'unknown_key' doesn't exist in table 't1'
test.t1 assign_to_keycache status Operation failed
Warnings:
-Error 1072 Key column 'unknown_key' doesn't exist in table
+Error 1176 Key 'unknown_key' doesn't exist in table 't1'
select @@keycache2.key_buffer_size;
@@keycache2.key_buffer_size
4194304
--- 1.1/mysql-test/include/common-tests.inc 2005-10-18 06:38:22 -07:00
+++ 1.2/mysql-test/include/common-tests.inc 2006-05-31 22:55:39 -07:00
@@ -1296,9 +1296,9 @@
# The next should give an error
#
--- error 1072
+-- error 1176
explain select fld3 from t2 ignore index (fld3,not_used);
--- error 1072
+-- error 1176
explain select fld3 from t2 use index (not_used);
#
--- 1.3/mysql-test/r/compress.result 2006-05-12 09:58:42 -07:00
+++ 1.4/mysql-test/r/compress.result 2006-05-31 22:55:39 -07:00
@@ -145,9 +145,9 @@
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index
explain select fld3 from t2 ignore index (fld3,not_used);
-ERROR 42000: Key column 'not_used' doesn't exist in table
+ERROR HY000: Key 'not_used' doesn't exist in table 't2'
explain select fld3 from t2 use index (not_used);
-ERROR 42000: Key column 'not_used' doesn't exist in table
+ERROR HY000: Key 'not_used' doesn't exist in table 't2'
select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3;
fld3
honeysuckle
| Thread |
|---|
| • bk commit into 5.0 tree (igor:1.2159) | igor | 1 Jun |
