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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
429e0abb
Commit
429e0abb
authored
Aug 19, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy004.:/work/mysql-5.0-clean
parents
adf56c8c
fce5427e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
3 deletions
+16
-3
mysql-test/r/innodb.result
mysql-test/r/innodb.result
+1
-1
mysql-test/r/show_check.result
mysql-test/r/show_check.result
+2
-0
mysql-test/t/innodb.test
mysql-test/t/innodb.test
+1
-1
mysql-test/t/show_check.test
mysql-test/t/show_check.test
+5
-0
sql/sql_show.cc
sql/sql_show.cc
+7
-1
No files found.
mysql-test/r/innodb.result
View file @
429e0abb
...
@@ -904,7 +904,7 @@ insert into mysqltest.t3 values(1);
...
@@ -904,7 +904,7 @@ insert into mysqltest.t3 values(1);
commit;
commit;
drop database mysqltest;
drop database mysqltest;
show tables from mysqltest;
show tables from mysqltest;
Got one of the listed errors
ERROR 42000: Unknown database 'mysqltest'
set autocommit=0;
set autocommit=0;
create table t1 (a int not null) engine= innodb;
create table t1 (a int not null) engine= innodb;
insert into t1 values(1),(2);
insert into t1 values(1),(2);
...
...
mysql-test/r/show_check.result
View file @
429e0abb
...
@@ -555,3 +555,5 @@ Database Table In_use Name_locked
...
@@ -555,3 +555,5 @@ Database Table In_use Name_locked
DROP TABLE txt1;
DROP TABLE txt1;
DROP TABLE tyt2;
DROP TABLE tyt2;
DROP TABLE urkunde;
DROP TABLE urkunde;
SHOW TABLES FROM non_existing_database;
ERROR 42000: Unknown database 'non_existing_database'
mysql-test/t/innodb.test
View file @
429e0abb
...
@@ -586,7 +586,7 @@ insert into mysqltest.t3 values(1);
...
@@ -586,7 +586,7 @@ insert into mysqltest.t3 values(1);
commit
;
commit
;
drop
database
mysqltest
;
drop
database
mysqltest
;
# Don't check error message
# Don't check error message
--
error
1
2
,
12
--
error
1
049
show
tables
from
mysqltest
;
show
tables
from
mysqltest
;
#
#
...
...
mysql-test/t/show_check.test
View file @
429e0abb
...
@@ -405,3 +405,8 @@ SHOW OPEN TABLES;
...
@@ -405,3 +405,8 @@ SHOW OPEN TABLES;
DROP
TABLE
txt1
;
DROP
TABLE
txt1
;
DROP
TABLE
tyt2
;
DROP
TABLE
tyt2
;
DROP
TABLE
urkunde
;
DROP
TABLE
urkunde
;
#
# BUG #12591 (SHOW TABLES FROM dbname produces wrong error message)
#
--
error
1049
SHOW
TABLES
FROM
non_existing_database
;
sql/sql_show.cc
View file @
429e0abb
...
@@ -264,8 +264,14 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path,
...
@@ -264,8 +264,14 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path,
bzero
((
char
*
)
&
table_list
,
sizeof
(
table_list
));
bzero
((
char
*
)
&
table_list
,
sizeof
(
table_list
));
if
(
!
(
dirp
=
my_dir
(
path
,
MYF
(
MY_WME
|
(
dir
?
MY_WANT_STAT
:
0
)))))
if
(
!
(
dirp
=
my_dir
(
path
,
MYF
(
dir
?
MY_WANT_STAT
:
0
))))
{
if
(
my_errno
==
ENOENT
)
my_error
(
ER_BAD_DB_ERROR
,
MYF
(
ME_BELL
+
ME_WAITTANG
),
db
);
else
my_error
(
ER_CANT_READ_DIR
,
MYF
(
ME_BELL
+
ME_WAITTANG
),
path
,
my_errno
);
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
}
for
(
i
=
0
;
i
<
(
uint
)
dirp
->
number_off_files
;
i
++
)
for
(
i
=
0
;
i
<
(
uint
)
dirp
->
number_off_files
;
i
++
)
{
{
...
...
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