Below is the list of changes that have just been committed into a local
4.1 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.2490 06/05/30 00:08:58 igor@stripped +33 -0
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
sql/sql_base.cc
1.271 06/05/30 00:08:51 igor@stripped +1 -1
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
sql/share/ukrainian/errmsg.txt
1.97 06/05/30 00:08:51 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/swedish/errmsg.txt
1.137 06/05/30 00:08:51 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/spanish/errmsg.txt
1.137 06/05/30 00:08:51 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/slovak/errmsg.txt
1.136 06/05/30 00:08:51 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/serbian/errmsg.txt
1.83 06/05/30 00:08:51 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/russian/errmsg.txt
1.131 06/05/30 00:08:51 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/romanian/errmsg.txt
1.136 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/portuguese/errmsg.txt
1.136 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/polish/errmsg.txt
1.135 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/norwegian/errmsg.txt
1.136 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/norwegian-ny/errmsg.txt
1.135 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/korean/errmsg.txt
1.135 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/japanese/errmsg.txt
1.133 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/japanese-sjis/errmsg.txt
1.5 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.\
sql/share/italian/errmsg.txt
1.141 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/hungarian/errmsg.txt
1.136 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/greek/errmsg.txt
1.136 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.\
sql/share/german/errmsg.txt
1.131 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/french/errmsg.txt
1.136 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/estonian/errmsg.txt
1.135 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/english/errmsg.txt
1.151 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/dutch/errmsg.txt
1.137 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/danish/errmsg.txt
1.133 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
sql/share/czech/errmsg.txt
1.137 06/05/30 00:08:50 igor@stripped +0 -1
Removed error message ER_INDEX_DOES_NOT_EXIST,
used ER_KEY_DOES_NOT_EXITS instead.
mysql-test/t/select.test
1.56 06/05/30 00:08:50 igor@stripped +4 -4
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
Added a new test case.
mysql-test/t/explain.test
1.10 06/05/30 00:08:50 igor@stripped +2 -2
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
mysql-test/r/select.result
1.73 06/05/30 00:08:50 igor@stripped +4 -4
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
Added a new test case.
mysql-test/r/preload.result
1.9 06/05/30 00:08:50 igor@stripped +1 -1
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
mysql-test/r/key_cache.result
1.17 06/05/30 00:08:50 igor@stripped +1 -1
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
mysql-test/r/explain.result
1.17 06/05/30 00:08:49 igor@stripped +2 -2
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
include/sql_state.h
1.14 06/05/30 00:08:49 igor@stripped +0 -1
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
include/mysqld_error.h
1.109 06/05/30 00:08:49 igor@stripped +1 -1
Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
# 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-4.1-0
--- 1.108/include/mysqld_error.h 2006-05-27 23:57:26 -07:00
+++ 1.109/include/mysqld_error.h 2006-05-30 00:08:49 -07:00
@@ -319,5 +319,5 @@
#define ER_INVALID_CHARACTER_STRING 1300
#define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301
#define ER_CONFLICTING_DECLARATIONS 1302
-#define ER_INDEX_DOES_NOT_EXIST 1303
+/* Attention: 1302 must be the last error code in 4.1 */
#define ER_ERROR_MESSAGES 303
--- 1.136/sql/share/czech/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.137/sql/share/czech/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -331,4 +331,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.132/sql/share/danish/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.133/sql/share/danish/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -322,4 +322,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.136/sql/share/dutch/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.137/sql/share/dutch/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -331,4 +331,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.150/sql/share/english/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.151/sql/share/english/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -319,4 +319,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.134/sql/share/estonian/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.135/sql/share/estonian/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -324,4 +324,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.135/sql/share/french/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.136/sql/share/french/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -319,4 +319,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.130/sql/share/german/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.131/sql/share/german/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -332,4 +332,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.135/sql/share/greek/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.136/sql/share/greek/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -319,4 +319,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.135/sql/share/hungarian/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.136/sql/share/hungarian/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -324,4 +324,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.140/sql/share/italian/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.141/sql/share/italian/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -319,4 +319,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.132/sql/share/japanese/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.133/sql/share/japanese/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -323,4 +323,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.134/sql/share/korean/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.135/sql/share/korean/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -319,4 +319,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.134/sql/share/norwegian-ny/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.135/sql/share/norwegian-ny/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -321,4 +321,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.135/sql/share/norwegian/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.136/sql/share/norwegian/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -321,4 +321,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.134/sql/share/polish/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.135/sql/share/polish/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -324,4 +324,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.135/sql/share/portuguese/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.136/sql/share/portuguese/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -321,4 +321,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.135/sql/share/romanian/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.136/sql/share/romanian/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -324,4 +324,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.130/sql/share/russian/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.131/sql/share/russian/errmsg.txt 2006-05-30 00:08:51 -07:00
@@ -324,4 +324,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.135/sql/share/slovak/errmsg.txt 2006-05-27 23:57:28 -07:00
+++ 1.136/sql/share/slovak/errmsg.txt 2006-05-30 00:08:51 -07:00
@@ -327,4 +327,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.136/sql/share/spanish/errmsg.txt 2006-05-27 23:57:28 -07:00
+++ 1.137/sql/share/spanish/errmsg.txt 2006-05-30 00:08:51 -07:00
@@ -323,4 +323,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.136/sql/share/swedish/errmsg.txt 2006-05-27 23:57:28 -07:00
+++ 1.137/sql/share/swedish/errmsg.txt 2006-05-30 00:08:51 -07:00
@@ -319,4 +319,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.270/sql/sql_base.cc 2006-05-27 23:57:28 -07:00
+++ 1.271/sql/sql_base.cc 2006-05-30 00:08:51 -07:00
@@ -2633,7 +2633,7 @@
if ((pos= find_type(&table->keynames, name->ptr(), name->length(), 1)) <=
0)
{
- my_error(ER_INDEX_DOES_NOT_EXIST, MYF(0), name->c_ptr(),
+ my_error(ER_KEY_DOES_NOT_EXITS, MYF(0), name->c_ptr(),
table->real_name);
map->set_all();
return 1;
--- 1.82/sql/share/serbian/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.83/sql/share/serbian/errmsg.txt 2006-05-30 00:08:51 -07:00
@@ -312,4 +312,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.4/sql/share/japanese-sjis/errmsg.txt 2006-05-27 23:57:27 -07:00
+++ 1.5/sql/share/japanese-sjis/errmsg.txt 2006-05-30 00:08:50 -07:00
@@ -323,4 +323,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.8/mysql-test/r/preload.result 2006-05-27 23:57:26 -07:00
+++ 1.9/mysql-test/r/preload.result 2006-05-30 00:08:50 -07:00
@@ -158,7 +158,7 @@
load index into cache t3 key (b), t2 key (c) ;
Table Op Msg_type Msg_text
test.t3 preload_keys error Table 'test.t3' doesn't exist
-test.t2 preload_keys error Index 'c' is not defined for table 't2'
+test.t2 preload_keys error Key 'c' doesn't exist in table 't2'
test.t2 preload_keys status Operation failed
show status like "key_read%";
Variable_name Value
--- 1.16/mysql-test/r/explain.result 2006-05-27 23:57:26 -07:00
+++ 1.17/mysql-test/r/explain.result 2006-05-30 00:08:49 -07:00
@@ -24,9 +24,9 @@
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 const str str 11 const 1
explain select * from t1 use key (str,str,foo) where str="foo";
-ERROR 42000: Index 'foo' is not defined for table 't1'
+ERROR HY000: Key 'foo' doesn't exist in table 't1'
explain select * from t1 ignore key (str,str,foo) where str="foo";
-ERROR 42000: Index 'foo' is not defined for table 't1'
+ERROR HY000: Key 'foo' doesn't exist in table 't1'
drop table t1;
explain select 1;
id select_type table type possible_keys key key_len ref rows Extra
--- 1.72/mysql-test/r/select.result 2006-05-27 23:57:27 -07:00
+++ 1.73/mysql-test/r/select.result 2006-05-30 00:08:50 -07:00
@@ -143,9 +143,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: Index 'not_used' is not defined for table 't2'
+ERROR HY000: Key 'not_used' doesn't exist in table 't2'
explain select fld3 from t2 use index (not_used);
-ERROR 42000: Index 'not_used' is not defined for table 't2'
+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
@@ -2720,7 +2720,7 @@
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 42000: Index 'a' is not defined for table 't1'
+ERROR HY000: Key 'a' doesn't exist in table 't1'
EXPLAIN SELECT * FROM t1 FORCE INDEX (a);
-ERROR 42000: Index 'a' is not defined for table 't1'
+ERROR HY000: Key 'a' doesn't exist in table 't1'
DROP TABLE t1;
--- 1.9/mysql-test/t/explain.test 2006-05-27 23:57:27 -07:00
+++ 1.10/mysql-test/t/explain.test 2006-05-30 00:08:50 -07:00
@@ -15,9 +15,9 @@
explain select * from t1 use key (str,str) where str="foo";
#The following should give errors
---error 1303
+--error 1176
explain select * from t1 use key (str,str,foo) where str="foo";
---error 1303
+--error 1176
explain select * from t1 ignore key (str,str,foo) where str="foo";
drop table t1;
--- 1.55/mysql-test/t/select.test 2006-05-27 23:57:27 -07:00
+++ 1.56/mysql-test/t/select.test 2006-05-30 00:08:50 -07:00
@@ -1295,9 +1295,9 @@
# The next should give an error
#
--- error 1303
+-- error 1176
explain select fld3 from t2 ignore index (fld3,not_used);
--- error 1303
+-- error 1176
explain select fld3 from t2 use index (not_used);
#
@@ -2256,9 +2256,9 @@
INSERT INTO t1 VALUES (2), (3), (1);
EXPLAIN SELECT * FROM t1 IGNORE INDEX (idx);
---error 1303
+--error 1176
EXPLAIN SELECT * FROM t1 IGNORE INDEX (a);
---error 1303
+--error 1176
EXPLAIN SELECT * FROM t1 FORCE INDEX (a);
DROP TABLE t1;
--- 1.96/sql/share/ukrainian/errmsg.txt 2006-05-27 23:57:28 -07:00
+++ 1.97/sql/share/ukrainian/errmsg.txt 2006-05-30 00:08:51 -07:00
@@ -325,4 +325,3 @@
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
"Conflicting declarations: '%s%s' and '%s%s'",
-"Index '%-.100s' is not defined for table '%-.100s'",
--- 1.16/mysql-test/r/key_cache.result 2006-05-27 23:57:26 -07:00
+++ 1.17/mysql-test/r/key_cache.result 2006-05-30 00:08:50 -07:00
@@ -191,7 +191,7 @@
ERROR HY000: Unknown key cache 'unknown_key_cache'
cache index t1 key (unknown_key) in keycache1;
Table Op Msg_type Msg_text
-test.t1 assign_to_keycache error Index 'unknown_key' is not defined for table 't1'
+test.t1 assign_to_keycache error Key 'unknown_key' doesn't exist in table 't1'
test.t1 assign_to_keycache status Operation failed
select @@keycache2.key_buffer_size;
@@keycache2.key_buffer_size
--- 1.13/include/sql_state.h 2006-05-27 23:57:26 -07:00
+++ 1.14/include/sql_state.h 2006-05-30 00:08:49 -07:00
@@ -162,4 +162,3 @@
ER_WRONG_NAME_FOR_INDEX, "42000", "",
ER_WRONG_NAME_FOR_CATALOG, "42000", "",
ER_UNKNOWN_STORAGE_ENGINE, "42000", "",
-ER_INDEX_DOES_NOT_EXIST, "42000", "",
| Thread |
|---|
| • bk commit into 4.1 tree (igor:1.2490) BUG#17873 | igor | 30 May |
