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
87b06d07
Commit
87b06d07
authored
Jun 09, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge rurik.mysql.com:/home/igor/mysql-5.1
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
parents
2ef66fca
388e8843
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
44 additions
and
14 deletions
+44
-14
client/Makefile.am
client/Makefile.am
+7
-7
extra/yassl/include/openssl/generate_prefix_files.pl
extra/yassl/include/openssl/generate_prefix_files.pl
+0
-0
mysql-test/r/select.result
mysql-test/r/select.result
+10
-0
mysql-test/t/select.test
mysql-test/t/select.test
+17
-2
mysql-test/t/view.test
mysql-test/t/view.test
+1
-1
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
+2
-1
sql/sql_parse.cc
sql/sql_parse.cc
+2
-1
No files found.
client/Makefile.am
View file @
87b06d07
...
...
@@ -83,13 +83,13 @@ link_sources:
for
f
in
$(sql_src)
;
do
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(top_srcdir)
/sql/
$$
f
$$
f
;
\
done
;
done
;
\
for
f
in
$(strings_src)
;
do
\
rm
-f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(top_srcdir)
/strings/
$$
f
$$
f
;
\
done
;
-
rm
-f
$(srcdir)
/my_user.c
;
@
LN_CP_F@
$(top_srcdir)
/sql-common/my_user.c my_user.c
done
;
\
rm
-f
$(srcdir)
/my_user.c
;
\
@LN_CP_F@
$(top_srcdir)
/sql-common/my_user.c my_user.c
;
# Don't update the files from bitkeeper
...
...
extra/yassl/include/openssl/generate_prefix_files.pl
100644 → 100755
View file @
87b06d07
File mode changed from 100644 to 100755
mysql-test/r/select.result
View file @
87b06d07
...
...
@@ -2716,6 +2716,16 @@ select * from t1 where f1 in (select f3 from t2 where (f3,f4)= (select f3,f4 fro
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 42000: Key 'a' doesn't exist in table 't1'
EXPLAIN SELECT * FROM t1 FORCE INDEX (a);
ERROR 42000: 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');
...
...
mysql-test/t/select.test
View file @
87b06d07
...
...
@@ -1296,9 +1296,9 @@ explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle';
# The next should give an error
#
--
error
1176
--
error
1176
explain
select
fld3
from
t2
ignore
index
(
fld3
,
not_used
);
--
error
1176
--
error
1176
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
#
...
...
mysql-test/t/view.test
View file @
87b06d07
...
...
@@ -516,7 +516,7 @@ drop table t1;
#
create
table
t1
(
a
int
,
b
int
);
create
view
v1
as
select
a
,
sum
(
b
)
from
t1
group
by
a
;
--
error
1176
--
error
1176
select
b
from
v1
use
index
(some_index) where b=1
;
drop
view
v1
;
drop
table
t1
;
...
...
scripts/make_sharedlib_distribution.sh
View file @
87b06d07
...
...
@@ -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 @
87b06d07
...
...
@@ -343,6 +343,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 @
87b06d07
...
...
@@ -5343,6 +5343,7 @@ bool setup_tables(THD *thd, Name_resolution_context *context,
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
)
{
...
...
@@ -5488,7 +5489,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table,
0
)
{
my_error
(
ER_KEY_DOES_NOT_EXITS
,
MYF
(
0
),
name
->
c_ptr
(),
table
->
alias
);
table
->
pos_in_table_list
->
alias
);
map
->
set_all
();
return
1
;
}
...
...
sql/sql_parse.cc
View file @
87b06d07
...
...
@@ -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_open_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