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
ac14d40d
Commit
ac14d40d
authored
Jan 27, 2005
by
gluh@gluh.mysql.r18.ru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A fix: information_schema test fails on Mac OSX
parent
670a2934
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
7 deletions
+20
-7
mysql-test/r/information_schema.result
mysql-test/r/information_schema.result
+5
-2
mysql-test/t/information_schema.test
mysql-test/t/information_schema.test
+1
-1
sql/sql_parse.cc
sql/sql_parse.cc
+1
-0
sql/sql_show.cc
sql/sql_show.cc
+13
-4
No files found.
mysql-test/r/information_schema.result
View file @
ac14d40d
...
@@ -571,8 +571,11 @@ where table_schema='information_schema' limit 2;
...
@@ -571,8 +571,11 @@ where table_schema='information_schema' limit 2;
TABLE_NAME TABLE_TYPE ENGINE
TABLE_NAME TABLE_TYPE ENGINE
SCHEMATA TEMPORARY MyISAM
SCHEMATA TEMPORARY MyISAM
TABLES TEMPORARY MyISAM
TABLES TEMPORARY MyISAM
show tables from information_schema like "t%";
show tables from information_schema like "T%";
Tables_in_information_schema (t%)
Tables_in_information_schema (T%)
TABLES
TABLE_PRIVILEGES
TABLE_CONSTRAINTS
create database information_schema;
create database information_schema;
ERROR HY000: Can't create database 'information_schema'; database exists
ERROR HY000: Can't create database 'information_schema'; database exists
use information_schema;
use information_schema;
...
...
mysql-test/t/information_schema.test
View file @
ac14d40d
...
@@ -281,7 +281,7 @@ drop view vo;
...
@@ -281,7 +281,7 @@ drop view vo;
select
TABLE_NAME
,
TABLE_TYPE
,
ENGINE
select
TABLE_NAME
,
TABLE_TYPE
,
ENGINE
from
information_schema
.
tables
from
information_schema
.
tables
where
table_schema
=
'information_schema'
limit
2
;
where
table_schema
=
'information_schema'
limit
2
;
show
tables
from
information_schema
like
"
t
%"
;
show
tables
from
information_schema
like
"
T
%"
;
--
error
1007
--
error
1007
create
database
information_schema
;
create
database
information_schema
;
...
...
sql/sql_parse.cc
View file @
ac14d40d
...
@@ -5339,6 +5339,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
...
@@ -5339,6 +5339,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
ptr
->
table_name
,
information_schema_name
.
str
);
ptr
->
table_name
,
information_schema_name
.
str
);
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
}
ptr
->
schema_table_name
=
ptr
->
table_name
;
ptr
->
schema_table
=
schema_table
;
ptr
->
schema_table
=
schema_table
;
}
}
ptr
->
select_lex
=
lex
->
current_select
;
ptr
->
select_lex
=
lex
->
current_select
;
...
...
sql/sql_show.cc
View file @
ac14d40d
...
@@ -1802,7 +1802,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
...
@@ -1802,7 +1802,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
res
=
open_and_lock_tables
(
thd
,
show_table_list
);
res
=
open_and_lock_tables
(
thd
,
show_table_list
);
if
(
schema_table
->
process_table
(
thd
,
show_table_list
,
if
(
schema_table
->
process_table
(
thd
,
show_table_list
,
table
,
res
,
show_table_list
->
db
,
table
,
res
,
show_table_list
->
db
,
show_table_list
->
table_name
))
show_table_list
->
alias
))
{
{
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
}
}
...
@@ -1911,7 +1911,8 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
...
@@ -1911,7 +1911,8 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
show_table_list
->
lock_type
=
lock_type
;
show_table_list
->
lock_type
=
lock_type
;
res
=
open_and_lock_tables
(
thd
,
show_table_list
);
res
=
open_and_lock_tables
(
thd
,
show_table_list
);
if
(
schema_table
->
process_table
(
thd
,
show_table_list
,
table
,
if
(
schema_table
->
process_table
(
thd
,
show_table_list
,
table
,
res
,
base_name
,
file_name
))
res
,
base_name
,
show_table_list
->
alias
))
{
{
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
}
}
...
@@ -3183,8 +3184,16 @@ int mysql_schema_table(THD *thd, LEX *lex, TABLE_LIST *table_list)
...
@@ -3183,8 +3184,16 @@ int mysql_schema_table(THD *thd, LEX *lex, TABLE_LIST *table_list)
}
}
table
->
s
->
tmp_table
=
TMP_TABLE
;
table
->
s
->
tmp_table
=
TMP_TABLE
;
table
->
grant
.
privilege
=
SELECT_ACL
;
table
->
grant
.
privilege
=
SELECT_ACL
;
table
->
alias_name_used
=
0
;
/*
table_list
->
schema_table_name
=
table_list
->
table_name
;
This test is necessary to make
case insensitive file systems +
upper case table names(information schema tables) +
views
working correctly
*/
table
->
alias_name_used
=
my_strcasecmp
(
table_alias_charset
,
table_list
->
schema_table_name
,
table_list
->
alias
);
table_list
->
table_name
=
(
char
*
)
table
->
s
->
table_name
;
table_list
->
table_name
=
(
char
*
)
table
->
s
->
table_name
;
table_list
->
table
=
table
;
table_list
->
table
=
table
;
table
->
next
=
thd
->
derived_tables
;
table
->
next
=
thd
->
derived_tables
;
...
...
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