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
6397471f
Commit
6397471f
authored
May 06, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.8998
parents
1586eea5
fb760acf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
mysql-test/r/information_schema.result
mysql-test/r/information_schema.result
+3
-3
sql/sql_show.cc
sql/sql_show.cc
+6
-4
No files found.
mysql-test/r/information_schema.result
View file @
6397471f
...
@@ -4,9 +4,9 @@ skip_show_database OFF
...
@@ -4,9 +4,9 @@ skip_show_database OFF
grant select, update, execute on test.* to mysqltest_2@localhost;
grant select, update, execute on test.* to mysqltest_2@localhost;
grant select, update on test.* to mysqltest_1@localhost;
grant select, update on test.* to mysqltest_1@localhost;
select * from information_schema.SCHEMATA where schema_name > 'm';
select * from information_schema.SCHEMATA where schema_name > 'm';
CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME SQL_PATH
CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME
DEFAULT_COLLATION_NAME
SQL_PATH
NULL mysql latin1 NULL
NULL mysql latin1
latin1_swedish_ci
NULL
NULL test latin1 NULL
NULL test latin1
latin1_swedish_ci
NULL
select schema_name from information_schema.schemata;
select schema_name from information_schema.schemata;
schema_name
schema_name
information_schema
information_schema
...
...
sql/sql_show.cc
View file @
6397471f
...
@@ -2000,11 +2000,12 @@ err:
...
@@ -2000,11 +2000,12 @@ err:
bool
store_schema_shemata
(
THD
*
thd
,
TABLE
*
table
,
const
char
*
db_name
,
bool
store_schema_shemata
(
THD
*
thd
,
TABLE
*
table
,
const
char
*
db_name
,
const
char
*
cs_name
)
CHARSET_INFO
*
cs
)
{
{
restore_record
(
table
,
s
->
default_values
);
restore_record
(
table
,
s
->
default_values
);
table
->
field
[
1
]
->
store
(
db_name
,
strlen
(
db_name
),
system_charset_info
);
table
->
field
[
1
]
->
store
(
db_name
,
strlen
(
db_name
),
system_charset_info
);
table
->
field
[
2
]
->
store
(
cs_name
,
strlen
(
cs_name
),
system_charset_info
);
table
->
field
[
2
]
->
store
(
cs
->
csname
,
strlen
(
cs
->
csname
),
system_charset_info
);
table
->
field
[
3
]
->
store
(
cs
->
name
,
strlen
(
cs
->
name
),
system_charset_info
);
return
schema_table_store_record
(
thd
,
table
);
return
schema_table_store_record
(
thd
,
table
);
}
}
...
@@ -2035,7 +2036,7 @@ int fill_schema_shemata(THD *thd, TABLE_LIST *tables, COND *cond)
...
@@ -2035,7 +2036,7 @@ int fill_schema_shemata(THD *thd, TABLE_LIST *tables, COND *cond)
if
(
with_i_schema
)
// information schema name is always first in list
if
(
with_i_schema
)
// information schema name is always first in list
{
{
if
(
store_schema_shemata
(
thd
,
table
,
file_name
,
if
(
store_schema_shemata
(
thd
,
table
,
file_name
,
system_charset_info
->
csname
))
system_charset_info
))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
with_i_schema
=
0
;
with_i_schema
=
0
;
continue
;
continue
;
...
@@ -2060,7 +2061,7 @@ int fill_schema_shemata(THD *thd, TABLE_LIST *tables, COND *cond)
...
@@ -2060,7 +2061,7 @@ int fill_schema_shemata(THD *thd, TABLE_LIST *tables, COND *cond)
strmov
(
path
+
length
,
MY_DB_OPT_FILE
);
strmov
(
path
+
length
,
MY_DB_OPT_FILE
);
load_db_opt
(
thd
,
path
,
&
create
);
load_db_opt
(
thd
,
path
,
&
create
);
if
(
store_schema_shemata
(
thd
,
table
,
file_name
,
if
(
store_schema_shemata
(
thd
,
table
,
file_name
,
create
.
default_table_charset
->
csname
))
create
.
default_table_charset
))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
}
}
}
}
...
@@ -3482,6 +3483,7 @@ ST_FIELD_INFO schema_fields_info[]=
...
@@ -3482,6 +3483,7 @@ ST_FIELD_INFO schema_fields_info[]=
{
"CATALOG_NAME"
,
FN_REFLEN
,
MYSQL_TYPE_STRING
,
0
,
1
,
0
},
{
"CATALOG_NAME"
,
FN_REFLEN
,
MYSQL_TYPE_STRING
,
0
,
1
,
0
},
{
"SCHEMA_NAME"
,
NAME_LEN
,
MYSQL_TYPE_STRING
,
0
,
0
,
"Database"
},
{
"SCHEMA_NAME"
,
NAME_LEN
,
MYSQL_TYPE_STRING
,
0
,
0
,
"Database"
},
{
"DEFAULT_CHARACTER_SET_NAME"
,
64
,
MYSQL_TYPE_STRING
,
0
,
0
,
0
},
{
"DEFAULT_CHARACTER_SET_NAME"
,
64
,
MYSQL_TYPE_STRING
,
0
,
0
,
0
},
{
"DEFAULT_COLLATION_NAME"
,
64
,
MYSQL_TYPE_STRING
,
0
,
0
,
0
},
{
"SQL_PATH"
,
FN_REFLEN
,
MYSQL_TYPE_STRING
,
0
,
1
,
0
},
{
"SQL_PATH"
,
FN_REFLEN
,
MYSQL_TYPE_STRING
,
0
,
1
,
0
},
{
0
,
0
,
MYSQL_TYPE_STRING
,
0
,
0
,
0
}
{
0
,
0
,
MYSQL_TYPE_STRING
,
0
,
0
,
0
}
};
};
...
...
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