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
d590dd56
Commit
d590dd56
authored
Feb 02, 2006
by
stewart@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some fixes from review of WL1359.
fix up test cases.
parent
7458f115
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
5 deletions
+15
-5
mysql-test/r/information_schema.result
mysql-test/r/information_schema.result
+10
-2
mysql-test/r/information_schema_db.result
mysql-test/r/information_schema_db.result
+1
-0
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+2
-2
sql/sql_show.cc
sql/sql_show.cc
+1
-1
sql/table.h
sql/table.h
+1
-0
No files found.
mysql-test/r/information_schema.result
View file @
d590dd56
...
...
@@ -45,6 +45,7 @@ COLUMNS
COLUMN_PRIVILEGES
ENGINES
EVENTS
FILES
KEY_COLUMN_USAGE
PARTITIONS
PLUGINS
...
...
@@ -735,7 +736,7 @@ CREATE TABLE t_crashme ( f1 BIGINT);
CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
count(*)
11
0
11
1
drop view a2, a1;
drop table t_crashme;
select table_schema,table_name, column_name from
...
...
@@ -765,6 +766,12 @@ EVENTS ENDS datetime
EVENTS CREATED datetime
EVENTS LAST_ALTERED datetime
EVENTS LAST_EXECUTED datetime
FILES CREATION_TIME datetime
FILES LAST_UPDATE_TIME datetime
FILES LAST_ACCESS_TIME datetime
FILES CREATE_TIME datetime
FILES UPDATE_TIME datetime
FILES CHECK_TIME datetime
PARTITIONS CREATE_TIME datetime
PARTITIONS UPDATE_TIME datetime
PARTITIONS CHECK_TIME datetime
...
...
@@ -813,6 +820,7 @@ where COLUMN_NAME='TABLE_NAME';
TABLE_NAME COLUMN_NAME PRIVILEGES
COLUMNS TABLE_NAME select
COLUMN_PRIVILEGES TABLE_NAME select
FILES TABLE_NAME select
KEY_COLUMN_USAGE TABLE_NAME select
PARTITIONS TABLE_NAME select
STATISTICS TABLE_NAME select
...
...
@@ -826,7 +834,7 @@ flush privileges;
SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;
table_schema count(*)
cluster_replication 1
information_schema 2
0
information_schema 2
1
mysql 21
create table t1 (i int, j int);
create trigger trg1 before insert on t1 for each row
...
...
mysql-test/r/information_schema_db.result
View file @
d590dd56
...
...
@@ -8,6 +8,7 @@ COLUMNS
COLUMN_PRIVILEGES
ENGINES
EVENTS
FILES
KEY_COLUMN_USAGE
PARTITIONS
PLUGINS
...
...
sql/ha_ndbcluster.cc
View file @
d590dd56
...
...
@@ -9666,7 +9666,7 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond)
table
->
field
[
c
++
]
->
store
(
"NORMAL"
,
6
,
system_charset_info
);
char
extra
[
30
];
int
len
=
snprintf
(
extra
,
sizeof
(
extra
),
"CLUSTER_NODE=%u"
,
id
);
int
len
=
my_
snprintf
(
extra
,
sizeof
(
extra
),
"CLUSTER_NODE=%u"
,
id
);
table
->
field
[
c
]
->
store
(
extra
,
len
,
system_charset_info
);
schema_table_store_record
(
thd
,
table
);
}
...
...
@@ -9741,7 +9741,7 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond)
table
->
field
[
c
++
]
->
store
(
"NORMAL"
,
6
,
system_charset_info
);
char
extra
[
30
];
int
len
=
snprintf
(
extra
,
sizeof
(
extra
),
"CLUSTER_NODE=%u"
,
id
);
int
len
=
my_
snprintf
(
extra
,
sizeof
(
extra
),
"CLUSTER_NODE=%u"
,
id
);
table
->
field
[
c
]
->
store
(
extra
,
len
,
system_charset_info
);
schema_table_store_record
(
thd
,
table
);
}
...
...
sql/sql_show.cc
View file @
d590dd56
...
...
@@ -4586,7 +4586,7 @@ int fill_schema_files(THD *thd, TABLE_LIST *tables, COND *cond)
{
int
i
;
TABLE
*
table
=
tables
->
table
;
DBUG_ENTER
(
"fill_schema_
logfile_group
s"
);
DBUG_ENTER
(
"fill_schema_
file
s"
);
struct
run_hton_fill_schema_files_args
args
;
args
.
tables
=
tables
;
...
...
sql/table.h
View file @
d590dd56
...
...
@@ -339,6 +339,7 @@ enum enum_schema_tables
SCH_COLUMN_PRIVILEGES
,
SCH_ENGINES
,
SCH_EVENTS
,
SCH_FILES
,
SCH_KEY_COLUMN_USAGE
,
SCH_OPEN_TABLES
,
SCH_PARTITIONS
,
...
...
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