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
0585e505
Commit
0585e505
authored
May 31, 2006
by
igor@rurik.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge rurik.mysql.com:/home/igor/tmp_merge
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
parents
5d8d38ee
1504abcd
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
238 additions
and
942 deletions
+238
-942
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
+209
-931
mysql-test/t/explain.test
mysql-test/t/explain.test
+2
-2
mysql-test/t/select.test
mysql-test/t/select.test
+17
-2
scripts/make_sharedlib_distribution.sh
scripts/make_sharedlib_distribution.sh
+4
-2
scripts/make_win_src_distribution.sh
scripts/make_win_src_distribution.sh
+1
-0
sql/sql_base.cc
sql/sql_base.cc
+1
-1
No files found.
mysql-test/r/explain.result
View file @
0585e505
...
...
@@ -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: Key column 'foo' doesn't exist in table
ERROR
HY000: Key 'foo' doesn't exist in table 't1'
explain select * from t1 ignore key (str,str,foo) where str="foo";
ERROR
42000: Key column 'foo' doesn't exist in table
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 @
0585e505
...
...
@@ -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 Key
column 'unknown_key' doesn't exist in table
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
...
...
mysql-test/r/preload.result
View file @
0585e505
...
...
@@ -160,7 +160,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 Key
column 'c' doesn't exist in table
test.t2 preload_keys error Key
'c' doesn't exist in table 't2'
test.t2 preload_keys status Operation failed
Warnings:
Error 1146 Table 'test.t3' doesn't exist
...
...
mysql-test/r/select.result
View file @
0585e505
This diff is collapsed.
Click to expand it.
mysql-test/t/explain.test
View file @
0585e505
...
...
@@ -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
072
--
error
1
176
explain
select
*
from
t1
use
key
(str,str,foo) where str="foo"
;
--
error
1
072
--
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 @
0585e505
...
...
@@ -1296,9 +1296,9 @@ explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle';
# The next should give an error
#
--
error
1
072
--
error
1
176
explain
select
fld3
from
t2
ignore
index
(
fld3
,
not_used
);
--
error
1
072
--
error
1
176
explain
select
fld3
from
t2
use
index
(not_used)
;
#
...
...
@@ -2264,6 +2264,21 @@ insert into t2 values(1,1);
select
*
from
t1
where
f1
in
(
select
f3
from
t2
where
(
f3
,
f4
)
=
(
select
f3
,
f4
from
t2
));
drop
table
t1
,
t2
;
#
# Bug #17873: confusing error message when IGNORE INDEX refers a column name
#
CREATE
TABLE
t1
(
a
int
,
INDEX
idx
(
a
));
INSERT
INTO
t1
VALUES
(
2
),
(
3
),
(
1
);
EXPLAIN
SELECT
*
FROM
t1
IGNORE
INDEX
(
idx
);
--
error
1176
EXPLAIN
SELECT
*
FROM
t1
IGNORE
INDEX
(
a
);
--
error
1176
EXPLAIN
SELECT
*
FROM
t1
FORCE
INDEX
(
a
);
DROP
TABLE
t1
;
# End of 4.1 tests
#
...
...
scripts/make_sharedlib_distribution.sh
View file @
0585e505
...
...
@@ -45,9 +45,11 @@ fi
mkdir
-p
$BASE
/lib
for
i
in
\
libmysql/.libs/libmysqlclient.s
{
l,o
}
*
\
libmysql/.libs/libmysqlclient.so
*
\
libmysql/.libs/libmysqlclient.sl
*
\
libmysql/.libs/libmysqlclient
*
.dylib
\
libmysql_r/.libs/libmysqlclient_r.s
{
l,o
}
*
\
libmysql_r/.libs/libmysqlclient_r.so
*
\
libmysql_r/.libs/libmysqlclient_r.sl
*
\
libmysql_r/.libs/libmysqlclient_r
*
.dylib
do
if
[
-f
$i
]
...
...
scripts/make_win_src_distribution.sh
View file @
0585e505
...
...
@@ -345,6 +345,7 @@ mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp
find
$BASE
\(
-name
"*.cnf"
-o
-name
"*.ini"
\
-o
-name
COPYING
-o
-name
ChangeLog
-o
-name
EXCEPTIONS-CLIENT
\
-o
-name
"INSTALL*"
-o
-name
LICENSE
-o
-name
"README*"
\
-o
-name
"*.dsp"
-o
-name
"*.dsw"
\
-o
-name
"*.vcproj"
-o
-name
"*.sln"
\)
-type
f
-print
\
|
while
read
v
do
...
...
sql/sql_base.cc
View file @
0585e505
...
...
@@ -4584,7 +4584,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table,
name
->
length
(),
1
))
<=
0
)
{
my_error
(
ER_KEY_
COLUMN_
DOES_NOT_EXITS
,
MYF
(
0
),
name
->
c_ptr
(),
my_error
(
ER_KEY_DOES_NOT_EXITS
,
MYF
(
0
),
name
->
c_ptr
(),
table
->
s
->
table_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