Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
f27a0eed
Commit
f27a0eed
authored
May 30, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
parents
8e60a6a4
a2993441
Changes
33
Hide whitespace changes
Inline
Side-by-side
Showing
33 changed files
with
16 additions
and
41 deletions
+16
-41
include/mysqld_error.h
include/mysqld_error.h
+1
-1
include/sql_state.h
include/sql_state.h
+0
-1
mysql-test/r/explain.result
mysql-test/r/explain.result
+2
-2
mysql-test/r/key_cache.result
mysql-test/r/key_cache.result
+1
-1
mysql-test/r/preload.result
mysql-test/r/preload.result
+1
-1
mysql-test/r/select.result
mysql-test/r/select.result
+4
-4
mysql-test/t/explain.test
mysql-test/t/explain.test
+2
-2
mysql-test/t/select.test
mysql-test/t/select.test
+4
-4
sql/share/czech/errmsg.txt
sql/share/czech/errmsg.txt
+0
-1
sql/share/danish/errmsg.txt
sql/share/danish/errmsg.txt
+0
-1
sql/share/dutch/errmsg.txt
sql/share/dutch/errmsg.txt
+0
-1
sql/share/english/errmsg.txt
sql/share/english/errmsg.txt
+0
-1
sql/share/estonian/errmsg.txt
sql/share/estonian/errmsg.txt
+0
-1
sql/share/french/errmsg.txt
sql/share/french/errmsg.txt
+0
-1
sql/share/german/errmsg.txt
sql/share/german/errmsg.txt
+0
-1
sql/share/greek/errmsg.txt
sql/share/greek/errmsg.txt
+0
-1
sql/share/hungarian/errmsg.txt
sql/share/hungarian/errmsg.txt
+0
-1
sql/share/italian/errmsg.txt
sql/share/italian/errmsg.txt
+0
-1
sql/share/japanese-sjis/errmsg.txt
sql/share/japanese-sjis/errmsg.txt
+0
-1
sql/share/japanese/errmsg.txt
sql/share/japanese/errmsg.txt
+0
-1
sql/share/korean/errmsg.txt
sql/share/korean/errmsg.txt
+0
-1
sql/share/norwegian-ny/errmsg.txt
sql/share/norwegian-ny/errmsg.txt
+0
-1
sql/share/norwegian/errmsg.txt
sql/share/norwegian/errmsg.txt
+0
-1
sql/share/polish/errmsg.txt
sql/share/polish/errmsg.txt
+0
-1
sql/share/portuguese/errmsg.txt
sql/share/portuguese/errmsg.txt
+0
-1
sql/share/romanian/errmsg.txt
sql/share/romanian/errmsg.txt
+0
-1
sql/share/russian/errmsg.txt
sql/share/russian/errmsg.txt
+0
-1
sql/share/serbian/errmsg.txt
sql/share/serbian/errmsg.txt
+0
-1
sql/share/slovak/errmsg.txt
sql/share/slovak/errmsg.txt
+0
-1
sql/share/spanish/errmsg.txt
sql/share/spanish/errmsg.txt
+0
-1
sql/share/swedish/errmsg.txt
sql/share/swedish/errmsg.txt
+0
-1
sql/share/ukrainian/errmsg.txt
sql/share/ukrainian/errmsg.txt
+0
-1
sql/sql_base.cc
sql/sql_base.cc
+1
-1
No files found.
include/mysqld_error.h
View file @
f27a0eed
...
...
@@ -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
include/sql_state.h
View file @
f27a0eed
...
...
@@ -162,4 +162,3 @@ ER_WARN_DATA_TRUNCATED, "01000", "",
ER_WRONG_NAME_FOR_INDEX
,
"42000"
,
""
,
ER_WRONG_NAME_FOR_CATALOG
,
"42000"
,
""
,
ER_UNKNOWN_STORAGE_ENGINE
,
"42000"
,
""
,
ER_INDEX_DOES_NOT_EXIST
,
"42000"
,
""
,
mysql-test/r/explain.result
View file @
f27a0eed
...
...
@@ -24,9 +24,9 @@ explain select * from t1 use key (str,str) where str="foo";
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
...
...
mysql-test/r/key_cache.result
View file @
f27a0eed
...
...
@@ -191,7 +191,7 @@ cache index t1 in unknown_key_cache;
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
...
...
mysql-test/r/preload.result
View file @
f27a0eed
...
...
@@ -158,7 +158,7 @@ Key_reads 0
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
...
...
mysql-test/r/select.result
View file @
f27a0eed
...
...
@@ -143,9 +143,9 @@ explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle';
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 @@ 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
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;
mysql-test/t/explain.test
View file @
f27a0eed
...
...
@@ -15,9 +15,9 @@ explain select * from t1 ignore key (str) where str="foo";
explain
select
*
from
t1
use
key
(str,str) where str="foo"
;
#The following should give errors
--
error
1
303
--
error
1
176
explain
select
*
from
t1
use
key
(str,str,foo) where str="foo"
;
--
error
1
303
--
error
1
176
explain
select
*
from
t1
ignore
key
(
str
,
str
,
foo
)
where
str
=
"foo"
;
drop
table
t1
;
...
...
mysql-test/t/select.test
View file @
f27a0eed
...
...
@@ -1295,9 +1295,9 @@ explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle';
# The next should give an error
#
--
error
1
303
--
error
1
176
explain
select
fld3
from
t2
ignore
index
(
fld3
,
not_used
);
--
error
1
303
--
error
1
176
explain
select
fld3
from
t2
use
index
(not_used)
;
#
...
...
@@ -2256,9 +2256,9 @@ CREATE TABLE t1 (a int, INDEX idx(a));
INSERT
INTO
t1
VALUES
(
2
),
(
3
),
(
1
);
EXPLAIN
SELECT
*
FROM
t1
IGNORE
INDEX
(
idx
);
--
error
1
303
--
error
1
176
EXPLAIN
SELECT
*
FROM
t1
IGNORE
INDEX
(
a
);
--
error
1
303
--
error
1
176
EXPLAIN
SELECT
*
FROM
t1
FORCE
INDEX
(
a
);
DROP
TABLE
t1
;
...
...
sql/share/czech/errmsg.txt
View file @
f27a0eed
...
...
@@ -331,4 +331,3 @@ character-set=latin2
"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'",
sql/share/danish/errmsg.txt
View file @
f27a0eed
...
...
@@ -322,4 +322,3 @@ character-set=latin1
"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'",
sql/share/dutch/errmsg.txt
View file @
f27a0eed
...
...
@@ -331,4 +331,3 @@ character-set=latin1
"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'",
sql/share/english/errmsg.txt
View file @
f27a0eed
...
...
@@ -319,4 +319,3 @@ character-set=latin1
"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'",
sql/share/estonian/errmsg.txt
View file @
f27a0eed
...
...
@@ -324,4 +324,3 @@ character-set=latin7
"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'",
sql/share/french/errmsg.txt
View file @
f27a0eed
...
...
@@ -319,4 +319,3 @@ character-set=latin1
"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'",
sql/share/german/errmsg.txt
View file @
f27a0eed
...
...
@@ -332,4 +332,3 @@ character-set=latin1
"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'",
sql/share/greek/errmsg.txt
View file @
f27a0eed
...
...
@@ -319,4 +319,3 @@ character-set=greek
"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'",
sql/share/hungarian/errmsg.txt
View file @
f27a0eed
...
...
@@ -324,4 +324,3 @@ character-set=latin2
"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'",
sql/share/italian/errmsg.txt
View file @
f27a0eed
...
...
@@ -319,4 +319,3 @@ character-set=latin1
"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'",
sql/share/japanese-sjis/errmsg.txt
View file @
f27a0eed
...
...
@@ -323,4 +323,3 @@ character-set=sjis
"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'",
sql/share/japanese/errmsg.txt
View file @
f27a0eed
...
...
@@ -323,4 +323,3 @@ character-set=ujis
"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'",
sql/share/korean/errmsg.txt
View file @
f27a0eed
...
...
@@ -319,4 +319,3 @@ character-set=euckr
"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'",
sql/share/norwegian-ny/errmsg.txt
View file @
f27a0eed
...
...
@@ -321,4 +321,3 @@ character-set=latin1
"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'",
sql/share/norwegian/errmsg.txt
View file @
f27a0eed
...
...
@@ -321,4 +321,3 @@ character-set=latin1
"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'",
sql/share/polish/errmsg.txt
View file @
f27a0eed
...
...
@@ -324,4 +324,3 @@ character-set=latin2
"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'",
sql/share/portuguese/errmsg.txt
View file @
f27a0eed
...
...
@@ -321,4 +321,3 @@ character-set=latin1
"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'",
sql/share/romanian/errmsg.txt
View file @
f27a0eed
...
...
@@ -324,4 +324,3 @@ character-set=latin2
"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'",
sql/share/russian/errmsg.txt
View file @
f27a0eed
...
...
@@ -324,4 +324,3 @@ character-set=koi8r
"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'",
sql/share/serbian/errmsg.txt
View file @
f27a0eed
...
...
@@ -312,4 +312,3 @@ character-set=cp1250
"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'",
sql/share/slovak/errmsg.txt
View file @
f27a0eed
...
...
@@ -327,4 +327,3 @@ character-set=latin2
"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'",
sql/share/spanish/errmsg.txt
View file @
f27a0eed
...
...
@@ -323,4 +323,3 @@ character-set=latin1
"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'",
sql/share/swedish/errmsg.txt
View file @
f27a0eed
...
...
@@ -319,4 +319,3 @@ character-set=latin1
"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'",
sql/share/ukrainian/errmsg.txt
View file @
f27a0eed
...
...
@@ -325,4 +325,3 @@ character-set=koi8u
"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'",
sql/sql_base.cc
View file @
f27a0eed
...
...
@@ -2633,7 +2633,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table,
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment