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
e6e4462d
Commit
e6e4462d
authored
Jun 09, 2006
by
igor@rurik.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fixes
parent
9ec346b9
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
14 deletions
+15
-14
mysql-test/r/compress.result
mysql-test/r/compress.result
+2
-2
mysql-test/r/explain.result
mysql-test/r/explain.result
+2
-2
mysql-test/r/select.result
mysql-test/r/select.result
+4
-4
mysql-test/r/ssl.result
mysql-test/r/ssl.result
+2
-2
mysql-test/r/ssl_compress.result
mysql-test/r/ssl_compress.result
+2
-2
mysql-test/r/view.result
mysql-test/r/view.result
+1
-1
sql/sql_parse.cc
sql/sql_parse.cc
+2
-1
No files found.
mysql-test/r/compress.result
View file @
e6e4462d
...
...
@@ -145,9 +145,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
HY
000: Key 'not_used' doesn't exist in table 't2'
ERROR
42
000: Key 'not_used' doesn't exist in table 't2'
explain select fld3 from t2 use index (not_used);
ERROR
HY
000: Key 'not_used' doesn't exist in table 't2'
ERROR
42
000: 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
...
...
mysql-test/r/explain.result
View file @
e6e4462d
...
...
@@ -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
HY
000: Key 'foo' doesn't exist in table 't1'
ERROR
42
000: Key 'foo' doesn't exist in table 't1'
explain select * from t1 ignore key (str,str,foo) where str="foo";
ERROR
HY
000: Key 'foo' doesn't exist in table 't1'
ERROR
42
000: 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/select.result
View file @
e6e4462d
...
...
@@ -144,9 +144,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
HY
000: Key 'not_used' doesn't exist in table 't2'
ERROR
42
000: Key 'not_used' doesn't exist in table 't2'
explain select fld3 from t2 use index (not_used);
ERROR
HY
000: Key 'not_used' doesn't exist in table 't2'
ERROR
42
000: 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
...
...
@@ -2722,9 +2722,9 @@ 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
HY
000: Key 'a' doesn't exist in table 't1'
ERROR
42
000: Key 'a' doesn't exist in table 't1'
EXPLAIN SELECT * FROM t1 FORCE INDEX (a);
ERROR
HY
000: Key 'a' doesn't exist in table 't1'
ERROR
42
000: Key 'a' doesn't exist in table 't1'
DROP TABLE t1;
CREATE TABLE t1 ( city char(30) );
INSERT INTO t1 VALUES ('London');
...
...
mysql-test/r/ssl.result
View file @
e6e4462d
...
...
@@ -145,9 +145,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
HY
000: Key 'not_used' doesn't exist in table 't2'
ERROR
42
000: Key 'not_used' doesn't exist in table 't2'
explain select fld3 from t2 use index (not_used);
ERROR
HY
000: Key 'not_used' doesn't exist in table 't2'
ERROR
42
000: 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
...
...
mysql-test/r/ssl_compress.result
View file @
e6e4462d
...
...
@@ -148,9 +148,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
HY
000: Key 'not_used' doesn't exist in table 't2'
ERROR
42
000: Key 'not_used' doesn't exist in table 't2'
explain select fld3 from t2 use index (not_used);
ERROR
HY
000: Key 'not_used' doesn't exist in table 't2'
ERROR
42
000: 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
...
...
mysql-test/r/view.result
View file @
e6e4462d
...
...
@@ -614,7 +614,7 @@ drop table t1;
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
HY
000: Key 'some_index' doesn't exist in table 'v1'
ERROR
42
000: Key 'some_index' doesn't exist in table 'v1'
drop view v1;
drop table t1;
create table t1 (col1 char(5),col2 char(5));
...
...
sql/sql_parse.cc
View file @
e6e4462d
...
...
@@ -2020,7 +2020,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
uptime
,
(
int
)
thread_count
,
(
ulong
)
thd
->
query_id
,
current_global_status_var
.
long_query_count
,
current_global_status_var
.
opened_tables
,
refresh_version
,
cached_tables
(),
current_global_status_var
.
opened_tables
,
refresh_version
,
cached_open_tables
(),
(
uptime
?
(
ulonglong2double
(
thd
->
query_id
)
/
(
double
)
uptime
)
:
(
double
)
0
));
#ifdef SAFEMALLOC
...
...
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