Drizzle

Merge lp:~skinny.moey/drizzle/bug771572 into lp:~drizzle-trunk/drizzle/development

  1. bug771572
  2. Merge into development
Proposed by Joe Daly
Status: Merged
Approved by: Brian Aker
Approved revision: 2294
Merged at revision: 2296
Proposed branch: lp:~skinny.moey/drizzle/bug771572
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 600 lines (+64/-57)
26 files modified
drizzled/message/statement_transform.cc (+4/-0)
drizzled/sql_yacc.yy (+5/-2)
plugin/collation_dictionary/tests/r/data_dictionary.result (+2/-2)
plugin/filtered_replicator/tests/r/var_filteredschemas.result (+1/-1)
plugin/filtered_replicator/tests/r/var_schemaregex.result (+1/-1)
plugin/information_schema_dictionary/tests/r/show_create_table.result (+20/-20)
plugin/innobase/tests/r/innodb_cmp.result (+1/-1)
plugin/innobase/tests/r/innodb_cmp_reset.result (+1/-1)
plugin/innobase/tests/r/innodb_cmpmem.result (+1/-1)
plugin/innobase/tests/r/innodb_cmpmem_reset.result (+1/-1)
plugin/innobase/tests/r/innodb_lock_waits.result (+1/-1)
plugin/innobase/tests/r/innodb_locks.result (+1/-1)
plugin/innobase/tests/r/innodb_replication_log.result (+1/-1)
plugin/innobase/tests/r/innodb_status.result (+1/-1)
plugin/innobase/tests/r/innodb_trx.result (+1/-1)
plugin/logging_stats/tests/r/command.result (+1/-1)
plugin/logging_stats/tests/r/max_user.result (+1/-1)
plugin/registry_dictionary/tests/r/data_dictionary.result (+2/-2)
plugin/replication_dictionary/tests/r/data_dictionary.result (+1/-1)
plugin/schema_dictionary/tests/r/data_dictionary.result (+6/-6)
plugin/session_dictionary/tests/r/data_dictionary.result (+1/-1)
plugin/status_dictionary/tests/r/data_dictionary.result (+4/-4)
plugin/table_cache_dictionary/tests/r/table_cache.result (+1/-1)
plugin/table_cache_dictionary/tests/r/table_definition_cache.result (+1/-1)
plugin/transaction_log/tests/r/schema.result (+2/-2)
tests/r/create.result (+2/-2)
To merge this branch: bzr merge lp:~skinny.moey/drizzle/bug771572
Reviewer Review Type Date Requested Status
Brian Aker Approve
Review via email: mp+59358@code.launchpad.net

Description of the change

get DEFINER working for create schema, and create table. Its required to quote 'user' in the DEFINER clause that is the reason for all the test changes

To post a comment you must log in.
Revision history for this message
Brian Aker (brianaker) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'drizzled/message/statement_transform.cc'
--- drizzled/message/statement_transform.cc 2011-04-20 22:18:30 +0000
+++ drizzled/message/statement_transform.cc 2011-04-28 12:13:33 +0000
@@ -894,7 +894,9 @@
894 if (message::has_definer(schema))894 if (message::has_definer(schema))
895 {895 {
896 destination.append(" DEFINER ");896 destination.append(" DEFINER ");
897 destination.push_back('\'');
897 destination.append(message::definer(schema));898 destination.append(message::definer(schema));
899 destination.push_back('\'');
898 }900 }
899901
900 return NONE;902 return NONE;
@@ -1098,7 +1100,9 @@
1098 if (message::has_definer(table))1100 if (message::has_definer(table))
1099 {1101 {
1100 destination.append(" DEFINER ");1102 destination.append(" DEFINER ");
1103 destination.push_back('\'');
1101 destination.append(message::definer(table));1104 destination.append(message::definer(table));
1105 destination.push_back('\'');
1102 }1106 }
11031107
1104 return NONE;1108 return NONE;
11051109
=== modified file 'drizzled/sql_yacc.yy'
--- drizzled/sql_yacc.yy 2011-04-13 22:07:01 +0000
+++ drizzled/sql_yacc.yy 2011-04-28 12:13:33 +0000
@@ -980,12 +980,15 @@
980980
981opt_create_database_options:981opt_create_database_options:
982 /* empty */ {}982 /* empty */ {}
983 | default_collation_schema {}983 | default_collation_schema
984 | opt_database_custom_options {}984 | default_collation_schema opt_database_custom_options
985 | default_collation_schema ',' opt_database_custom_options
986 | opt_database_custom_options
985 ;987 ;
986988
987opt_database_custom_options:989opt_database_custom_options:
988 custom_database_option990 custom_database_option
991 | custom_database_option opt_database_custom_options
989 | custom_database_option ',' opt_database_custom_options992 | custom_database_option ',' opt_database_custom_options
990 ;993 ;
991994
992995
=== modified file 'plugin/collation_dictionary/tests/r/data_dictionary.result'
--- plugin/collation_dictionary/tests/r/data_dictionary.result 2011-04-03 06:02:00 +0000
+++ plugin/collation_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
@@ -6,7 +6,7 @@
6 `DEFAULT_COLLATE_NAME` VARCHAR(256) NOT NULL,6 `DEFAULT_COLLATE_NAME` VARCHAR(256) NOT NULL,
7 `DESCRIPTION` VARCHAR(256) NOT NULL,7 `DESCRIPTION` VARCHAR(256) NOT NULL,
8 `MAXLEN` BIGINT NOT NULL8 `MAXLEN` BIGINT NOT NULL
9) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM9) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
10show create table COLLATIONS ;10show create table COLLATIONS ;
11Table Create Table11Table Create Table
12COLLATIONS CREATE TABLE `COLLATIONS` (12COLLATIONS CREATE TABLE `COLLATIONS` (
@@ -17,7 +17,7 @@
17 `IS_DEFAULT` BOOLEAN NOT NULL,17 `IS_DEFAULT` BOOLEAN NOT NULL,
18 `IS_COMPILED` BOOLEAN NOT NULL,18 `IS_COMPILED` BOOLEAN NOT NULL,
19 `SORTLEN` BIGINT NOT NULL19 `SORTLEN` BIGINT NOT NULL
20) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM20) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
21SELECT * FROM character_sets ORDER BY CHARACTER_SET_NAME;21SELECT * FROM character_sets ORDER BY CHARACTER_SET_NAME;
22CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN22CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN
23binary binary 123binary binary 1
2424
=== modified file 'plugin/filtered_replicator/tests/r/var_filteredschemas.result'
--- plugin/filtered_replicator/tests/r/var_filteredschemas.result 2011-04-03 06:02:00 +0000
+++ plugin/filtered_replicator/tests/r/var_filteredschemas.result 2011-04-28 12:13:33 +0000
@@ -11,7 +11,7 @@
11We should only see the 'bar' schema in the log11We should only see the 'bar' schema in the log
1212
13SET AUTOCOMMIT=0;13SET AUTOCOMMIT=0;
14CREATE SCHEMA `bar` COLLATE utf8_general_ci DEFINER root;14CREATE SCHEMA `bar` COLLATE utf8_general_ci DEFINER 'root';
15COMMIT;15COMMIT;
16SET AUTOCOMMIT=0;16SET AUTOCOMMIT=0;
17DROP SCHEMA `bar`;17DROP SCHEMA `bar`;
1818
=== modified file 'plugin/filtered_replicator/tests/r/var_schemaregex.result'
--- plugin/filtered_replicator/tests/r/var_schemaregex.result 2011-04-03 06:02:00 +0000
+++ plugin/filtered_replicator/tests/r/var_schemaregex.result 2011-04-28 12:13:33 +0000
@@ -13,7 +13,7 @@
13We should only see the 'bar' schema in the log13We should only see the 'bar' schema in the log
1414
15SET AUTOCOMMIT=0;15SET AUTOCOMMIT=0;
16CREATE SCHEMA `bar` COLLATE utf8_general_ci DEFINER root;16CREATE SCHEMA `bar` COLLATE utf8_general_ci DEFINER 'root';
17COMMIT;17COMMIT;
18SET AUTOCOMMIT=0;18SET AUTOCOMMIT=0;
19DROP SCHEMA `bar`;19DROP SCHEMA `bar`;
2020
=== modified file 'plugin/information_schema_dictionary/tests/r/show_create_table.result'
--- plugin/information_schema_dictionary/tests/r/show_create_table.result 2011-04-03 06:02:00 +0000
+++ plugin/information_schema_dictionary/tests/r/show_create_table.result 2011-04-28 12:13:33 +0000
@@ -6,7 +6,7 @@
6 `CONSTRAINT_SCHEMA` VARCHAR(256) NOT NULL,6 `CONSTRAINT_SCHEMA` VARCHAR(256) NOT NULL,
7 `CONSTRAINT_NAME` VARCHAR(256) NOT NULL,7 `CONSTRAINT_NAME` VARCHAR(256) NOT NULL,
8 `CHECK_CLAUSE` VARCHAR(256) NOT NULL8 `CHECK_CLAUSE` VARCHAR(256) NOT NULL
9) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM9) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
10SHOW CREATE TABLE `COLUMNS`;10SHOW CREATE TABLE `COLUMNS`;
11Table Create Table11Table Create Table
12COLUMNS CREATE TABLE `COLUMNS` (12COLUMNS CREATE TABLE `COLUMNS` (
@@ -33,7 +33,7 @@
33 `DOMAIN_CATALOG` VARCHAR(256) DEFAULT NULL,33 `DOMAIN_CATALOG` VARCHAR(256) DEFAULT NULL,
34 `DOMAIN_SCHEMA` VARCHAR(256) DEFAULT NULL,34 `DOMAIN_SCHEMA` VARCHAR(256) DEFAULT NULL,
35 `DOMAIN_NAME` VARCHAR(256) DEFAULT NULL35 `DOMAIN_NAME` VARCHAR(256) DEFAULT NULL
36) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM36) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
37SHOW CREATE TABLE `COLUMN_DOMAIN_USAGE`;37SHOW CREATE TABLE `COLUMN_DOMAIN_USAGE`;
38Table Create Table38Table Create Table
39COLUMN_DOMAIN_USAGE CREATE TABLE `COLUMN_DOMAIN_USAGE` (39COLUMN_DOMAIN_USAGE CREATE TABLE `COLUMN_DOMAIN_USAGE` (
@@ -44,7 +44,7 @@
44 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,44 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,
45 `TABLE_NAME` VARCHAR(256) NOT NULL,45 `TABLE_NAME` VARCHAR(256) NOT NULL,
46 `COLUMN_NAME` VARCHAR(256) NOT NULL46 `COLUMN_NAME` VARCHAR(256) NOT NULL
47) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM47) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
48SHOW CREATE TABLE `COLUMN_PRIVILEGES`;48SHOW CREATE TABLE `COLUMN_PRIVILEGES`;
49Table Create Table49Table Create Table
50COLUMN_PRIVILEGES CREATE TABLE `COLUMN_PRIVILEGES` (50COLUMN_PRIVILEGES CREATE TABLE `COLUMN_PRIVILEGES` (
@@ -56,7 +56,7 @@
56 `COLUMN_NAME` VARCHAR(256) NOT NULL,56 `COLUMN_NAME` VARCHAR(256) NOT NULL,
57 `PRIVILEGE_TYPE` VARCHAR(256) NOT NULL,57 `PRIVILEGE_TYPE` VARCHAR(256) NOT NULL,
58 `IS_GRANTABLE` VARCHAR(256) NOT NULL58 `IS_GRANTABLE` VARCHAR(256) NOT NULL
59) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM59) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
60SHOW CREATE TABLE `CONSTRAINT_COLUMN_USAGE`;60SHOW CREATE TABLE `CONSTRAINT_COLUMN_USAGE`;
61Table Create Table61Table Create Table
62CONSTRAINT_COLUMN_USAGE CREATE TABLE `CONSTRAINT_COLUMN_USAGE` (62CONSTRAINT_COLUMN_USAGE CREATE TABLE `CONSTRAINT_COLUMN_USAGE` (
@@ -67,7 +67,7 @@
67 `CONSTRAINT_CATALOG` VARCHAR(256) NOT NULL,67 `CONSTRAINT_CATALOG` VARCHAR(256) NOT NULL,
68 `CONSTRAINT_SCHEMA` VARCHAR(256) NOT NULL,68 `CONSTRAINT_SCHEMA` VARCHAR(256) NOT NULL,
69 `CONSTRAINT_NAME` VARCHAR(256) NOT NULL69 `CONSTRAINT_NAME` VARCHAR(256) NOT NULL
70) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM70) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
71SHOW CREATE TABLE `CONSTRAINT_TABLE_USAGE`;71SHOW CREATE TABLE `CONSTRAINT_TABLE_USAGE`;
72Table Create Table72Table Create Table
73CONSTRAINT_TABLE_USAGE CREATE TABLE `CONSTRAINT_TABLE_USAGE` (73CONSTRAINT_TABLE_USAGE CREATE TABLE `CONSTRAINT_TABLE_USAGE` (
@@ -77,7 +77,7 @@
77 `CONSTRAINT_CATALOG` VARCHAR(256) NOT NULL,77 `CONSTRAINT_CATALOG` VARCHAR(256) NOT NULL,
78 `CONSTRAINT_SCHEMA` VARCHAR(256) NOT NULL,78 `CONSTRAINT_SCHEMA` VARCHAR(256) NOT NULL,
79 `CONSTRAINT_NAME` VARCHAR(256) NOT NULL79 `CONSTRAINT_NAME` VARCHAR(256) NOT NULL
80) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM80) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
81SHOW CREATE TABLE `DOMAINS`;81SHOW CREATE TABLE `DOMAINS`;
82Table Create Table82Table Create Table
83DOMAINS CREATE TABLE `DOMAINS` (83DOMAINS CREATE TABLE `DOMAINS` (
@@ -98,7 +98,7 @@
98 `NUMERIC_SCALE` VARCHAR(256) NOT NULL,98 `NUMERIC_SCALE` VARCHAR(256) NOT NULL,
99 `DATETIME_PRECISION` VARCHAR(256) NOT NULL,99 `DATETIME_PRECISION` VARCHAR(256) NOT NULL,
100 `DOMAIN_DEFAULT` VARCHAR(256) NOT NULL100 `DOMAIN_DEFAULT` VARCHAR(256) NOT NULL
101) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM101) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
102SHOW CREATE TABLE `DOMAIN_CONSTRAINTS`;102SHOW CREATE TABLE `DOMAIN_CONSTRAINTS`;
103Table Create Table103Table Create Table
104DOMAIN_CONSTRAINTS CREATE TABLE `DOMAIN_CONSTRAINTS` (104DOMAIN_CONSTRAINTS CREATE TABLE `DOMAIN_CONSTRAINTS` (
@@ -110,7 +110,7 @@
110 `DOMAIN_NAME` VARCHAR(256) NOT NULL,110 `DOMAIN_NAME` VARCHAR(256) NOT NULL,
111 `IS_DEFERRABLE` BOOLEAN NOT NULL,111 `IS_DEFERRABLE` BOOLEAN NOT NULL,
112 `INITIALLY_DEFERRED` BOOLEAN NOT NULL112 `INITIALLY_DEFERRED` BOOLEAN NOT NULL
113) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM113) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
114SHOW CREATE TABLE `KEY_COLUMN_USAGE`;114SHOW CREATE TABLE `KEY_COLUMN_USAGE`;
115Table Create Table115Table Create Table
116KEY_COLUMN_USAGE CREATE TABLE `KEY_COLUMN_USAGE` (116KEY_COLUMN_USAGE CREATE TABLE `KEY_COLUMN_USAGE` (
@@ -122,7 +122,7 @@
122 `TABLE_NAME` VARCHAR(256) NOT NULL,122 `TABLE_NAME` VARCHAR(256) NOT NULL,
123 `COLUMN_NAME` VARCHAR(256) NOT NULL,123 `COLUMN_NAME` VARCHAR(256) NOT NULL,
124 `ORDINAL_POSITION` BIGINT NOT NULL124 `ORDINAL_POSITION` BIGINT NOT NULL
125) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM125) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
126SHOW CREATE TABLE `PARAMETERS`;126SHOW CREATE TABLE `PARAMETERS`;
127Table Create Table127Table Create Table
128PARAMETERS CREATE TABLE `PARAMETERS` (128PARAMETERS CREATE TABLE `PARAMETERS` (
@@ -156,7 +156,7 @@
156 `SCOPE_CATALOG` VARCHAR(256) NOT NULL,156 `SCOPE_CATALOG` VARCHAR(256) NOT NULL,
157 `SCOPE_SCHEMA` VARCHAR(256) NOT NULL,157 `SCOPE_SCHEMA` VARCHAR(256) NOT NULL,
158 `SCOPE_NAME` VARCHAR(256) NOT NULL158 `SCOPE_NAME` VARCHAR(256) NOT NULL
159) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM159) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
160SHOW CREATE TABLE `REFERENTIAL_CONSTRAINTS`;160SHOW CREATE TABLE `REFERENTIAL_CONSTRAINTS`;
161Table Create Table161Table Create Table
162REFERENTIAL_CONSTRAINTS CREATE TABLE `REFERENTIAL_CONSTRAINTS` (162REFERENTIAL_CONSTRAINTS CREATE TABLE `REFERENTIAL_CONSTRAINTS` (
@@ -169,7 +169,7 @@
169 `MATCH_OPTION` VARCHAR(256) NOT NULL,169 `MATCH_OPTION` VARCHAR(256) NOT NULL,
170 `UPDATE_RULE` VARCHAR(256) NOT NULL,170 `UPDATE_RULE` VARCHAR(256) NOT NULL,
171 `DELETE_RULE` VARCHAR(256) NOT NULL171 `DELETE_RULE` VARCHAR(256) NOT NULL
172) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM172) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
173SHOW CREATE TABLE `ROUTINES`;173SHOW CREATE TABLE `ROUTINES`;
174Table Create Table174Table Create Table
175ROUTINES CREATE TABLE `ROUTINES` (175ROUTINES CREATE TABLE `ROUTINES` (
@@ -226,7 +226,7 @@
226 `IS_IMPLICITLY_INVOCABLE` VARCHAR(256) NOT NULL,226 `IS_IMPLICITLY_INVOCABLE` VARCHAR(256) NOT NULL,
227 `CREATED` VARCHAR(256) NOT NULL,227 `CREATED` VARCHAR(256) NOT NULL,
228 `LAST_ALTERED` VARCHAR(256) NOT NULL228 `LAST_ALTERED` VARCHAR(256) NOT NULL
229) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM229) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
230SHOW CREATE TABLE `ROUTINE_COLUMNS`;230SHOW CREATE TABLE `ROUTINE_COLUMNS`;
231Table Create Table231Table Create Table
232ROUTINE_COLUMNS CREATE TABLE `ROUTINE_COLUMNS` (232ROUTINE_COLUMNS CREATE TABLE `ROUTINE_COLUMNS` (
@@ -253,7 +253,7 @@
253 `DOMAIN_CATALOG` VARCHAR(256) NOT NULL,253 `DOMAIN_CATALOG` VARCHAR(256) NOT NULL,
254 `DOMAIN_SCHEMA` VARCHAR(256) NOT NULL,254 `DOMAIN_SCHEMA` VARCHAR(256) NOT NULL,
255 `DOMAIN_NAME` VARCHAR(256) NOT NULL255 `DOMAIN_NAME` VARCHAR(256) NOT NULL
256) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM256) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
257SHOW CREATE TABLE `SCHEMATA`;257SHOW CREATE TABLE `SCHEMATA`;
258Table Create Table258Table Create Table
259SCHEMATA CREATE TABLE `SCHEMATA` (259SCHEMATA CREATE TABLE `SCHEMATA` (
@@ -263,7 +263,7 @@
263 `DEFAULT_CHARACTER_SET_CATALOG` VARCHAR(256) DEFAULT NULL,263 `DEFAULT_CHARACTER_SET_CATALOG` VARCHAR(256) DEFAULT NULL,
264 `DEFAULT_CHARACTER_SET_SCHEMA` VARCHAR(256) DEFAULT NULL,264 `DEFAULT_CHARACTER_SET_SCHEMA` VARCHAR(256) DEFAULT NULL,
265 `DEFAULT_CHARACTER_SET_NAME` VARCHAR(256) DEFAULT NULL265 `DEFAULT_CHARACTER_SET_NAME` VARCHAR(256) DEFAULT NULL
266) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM266) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
267SHOW CREATE TABLE `TABLES`;267SHOW CREATE TABLE `TABLES`;
268Table Create Table268Table Create Table
269TABLES CREATE TABLE `TABLES` (269TABLES CREATE TABLE `TABLES` (
@@ -271,7 +271,7 @@
271 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,271 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,
272 `TABLE_NAME` VARCHAR(256) NOT NULL,272 `TABLE_NAME` VARCHAR(256) NOT NULL,
273 `TABLE_TYPE` VARCHAR(256) NOT NULL273 `TABLE_TYPE` VARCHAR(256) NOT NULL
274) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM274) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
275SHOW CREATE TABLE `TABLE_CONSTRAINTS`;275SHOW CREATE TABLE `TABLE_CONSTRAINTS`;
276Table Create Table276Table Create Table
277TABLE_CONSTRAINTS CREATE TABLE `TABLE_CONSTRAINTS` (277TABLE_CONSTRAINTS CREATE TABLE `TABLE_CONSTRAINTS` (
@@ -284,7 +284,7 @@
284 `CONSTRAINT_TYPE` VARCHAR(256) NOT NULL,284 `CONSTRAINT_TYPE` VARCHAR(256) NOT NULL,
285 `IS_DEFERRABLE` BOOLEAN NOT NULL,285 `IS_DEFERRABLE` BOOLEAN NOT NULL,
286 `INITIALLY_DEFERRED` BOOLEAN NOT NULL286 `INITIALLY_DEFERRED` BOOLEAN NOT NULL
287) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM287) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
288SHOW CREATE TABLE `TABLE_PRIVILEGES`;288SHOW CREATE TABLE `TABLE_PRIVILEGES`;
289Table Create Table289Table Create Table
290TABLE_PRIVILEGES CREATE TABLE `TABLE_PRIVILEGES` (290TABLE_PRIVILEGES CREATE TABLE `TABLE_PRIVILEGES` (
@@ -296,7 +296,7 @@
296 `COLUMN_NAME` VARCHAR(256) NOT NULL,296 `COLUMN_NAME` VARCHAR(256) NOT NULL,
297 `PRIVILEGE_TYPE` VARCHAR(256) NOT NULL,297 `PRIVILEGE_TYPE` VARCHAR(256) NOT NULL,
298 `IS_GRANTABLE` VARCHAR(256) NOT NULL298 `IS_GRANTABLE` VARCHAR(256) NOT NULL
299) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM299) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
300SHOW CREATE TABLE `VIEWS`;300SHOW CREATE TABLE `VIEWS`;
301Table Create Table301Table Create Table
302VIEWS CREATE TABLE `VIEWS` (302VIEWS CREATE TABLE `VIEWS` (
@@ -306,7 +306,7 @@
306 `TABLE_CATALOG` VARCHAR(256) NOT NULL,306 `TABLE_CATALOG` VARCHAR(256) NOT NULL,
307 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,307 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,
308 `TABLE_NAME` VARCHAR(256) NOT NULL308 `TABLE_NAME` VARCHAR(256) NOT NULL
309) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM309) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
310SHOW CREATE TABLE `VIEW_COLUMN_USAGE`;310SHOW CREATE TABLE `VIEW_COLUMN_USAGE`;
311Table Create Table311Table Create Table
312VIEW_COLUMN_USAGE CREATE TABLE `VIEW_COLUMN_USAGE` (312VIEW_COLUMN_USAGE CREATE TABLE `VIEW_COLUMN_USAGE` (
@@ -317,7 +317,7 @@
317 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,317 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,
318 `TABLE_NAME` VARCHAR(256) NOT NULL,318 `TABLE_NAME` VARCHAR(256) NOT NULL,
319 `COLUMN_NAME` VARCHAR(256) NOT NULL319 `COLUMN_NAME` VARCHAR(256) NOT NULL
320) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM320) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
321SHOW CREATE TABLE `VIEW_TABLE_USAGE`;321SHOW CREATE TABLE `VIEW_TABLE_USAGE`;
322Table Create Table322Table Create Table
323VIEW_TABLE_USAGE CREATE TABLE `VIEW_TABLE_USAGE` (323VIEW_TABLE_USAGE CREATE TABLE `VIEW_TABLE_USAGE` (
@@ -327,4 +327,4 @@
327 `VIEW_DEFINITION` VARCHAR(256) NOT NULL,327 `VIEW_DEFINITION` VARCHAR(256) NOT NULL,
328 `CHECK_OPTION` VARCHAR(256) NOT NULL,328 `CHECK_OPTION` VARCHAR(256) NOT NULL,
329 `IS_UPDATABLE` VARCHAR(256) NOT NULL329 `IS_UPDATABLE` VARCHAR(256) NOT NULL
330) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM330) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
331331
=== modified file 'plugin/innobase/tests/r/innodb_cmp.result'
--- plugin/innobase/tests/r/innodb_cmp.result 2011-04-03 06:02:00 +0000
+++ plugin/innobase/tests/r/innodb_cmp.result 2011-04-28 12:13:33 +0000
@@ -15,4 +15,4 @@
15 `COMPRESS_TIME` BIGINT NOT NULL,15 `COMPRESS_TIME` BIGINT NOT NULL,
16 `UNCOMPRESS_OPS` BIGINT NOT NULL,16 `UNCOMPRESS_OPS` BIGINT NOT NULL,
17 `UNCOMPRESS_TIME` BIGINT NOT NULL17 `UNCOMPRESS_TIME` BIGINT NOT NULL
18) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM18) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
1919
=== modified file 'plugin/innobase/tests/r/innodb_cmp_reset.result'
--- plugin/innobase/tests/r/innodb_cmp_reset.result 2011-04-03 06:02:00 +0000
+++ plugin/innobase/tests/r/innodb_cmp_reset.result 2011-04-28 12:13:33 +0000
@@ -15,4 +15,4 @@
15 `COMPRESS_TIME` BIGINT NOT NULL,15 `COMPRESS_TIME` BIGINT NOT NULL,
16 `UNCOMPRESS_OPS` BIGINT NOT NULL,16 `UNCOMPRESS_OPS` BIGINT NOT NULL,
17 `UNCOMPRESS_TIME` BIGINT NOT NULL17 `UNCOMPRESS_TIME` BIGINT NOT NULL
18) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM18) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
1919
=== modified file 'plugin/innobase/tests/r/innodb_cmpmem.result'
--- plugin/innobase/tests/r/innodb_cmpmem.result 2011-04-03 06:02:00 +0000
+++ plugin/innobase/tests/r/innodb_cmpmem.result 2011-04-28 12:13:33 +0000
@@ -18,4 +18,4 @@
18 `PAGES_FREE` BIGINT NOT NULL,18 `PAGES_FREE` BIGINT NOT NULL,
19 `RELOCATION_OPS` BIGINT NOT NULL,19 `RELOCATION_OPS` BIGINT NOT NULL,
20 `RELOCATION_TIME` BIGINT NOT NULL20 `RELOCATION_TIME` BIGINT NOT NULL
21) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM21) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
2222
=== modified file 'plugin/innobase/tests/r/innodb_cmpmem_reset.result'
--- plugin/innobase/tests/r/innodb_cmpmem_reset.result 2011-04-03 06:02:00 +0000
+++ plugin/innobase/tests/r/innodb_cmpmem_reset.result 2011-04-28 12:13:33 +0000
@@ -18,4 +18,4 @@
18 `PAGES_FREE` BIGINT NOT NULL,18 `PAGES_FREE` BIGINT NOT NULL,
19 `RELOCATION_OPS` BIGINT NOT NULL,19 `RELOCATION_OPS` BIGINT NOT NULL,
20 `RELOCATION_TIME` BIGINT NOT NULL20 `RELOCATION_TIME` BIGINT NOT NULL
21) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM21) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
2222
=== modified file 'plugin/innobase/tests/r/innodb_lock_waits.result'
--- plugin/innobase/tests/r/innodb_lock_waits.result 2011-04-03 06:02:00 +0000
+++ plugin/innobase/tests/r/innodb_lock_waits.result 2011-04-28 12:13:33 +0000
@@ -8,4 +8,4 @@
8 `REQUESTED_LOCK_ID` VARCHAR(256) NOT NULL,8 `REQUESTED_LOCK_ID` VARCHAR(256) NOT NULL,
9 `BLOCKING_TRX_ID` VARCHAR(256) NOT NULL,9 `BLOCKING_TRX_ID` VARCHAR(256) NOT NULL,
10 `BLOCKING_LOCK_ID` VARCHAR(256) NOT NULL10 `BLOCKING_LOCK_ID` VARCHAR(256) NOT NULL
11) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM11) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
1212
=== modified file 'plugin/innobase/tests/r/innodb_locks.result'
--- plugin/innobase/tests/r/innodb_locks.result 2011-04-03 06:02:00 +0000
+++ plugin/innobase/tests/r/innodb_locks.result 2011-04-28 12:13:33 +0000
@@ -14,4 +14,4 @@
14 `LOCK_PAGE` BIGINT NOT NULL,14 `LOCK_PAGE` BIGINT NOT NULL,
15 `LOCK_REC` BIGINT NOT NULL,15 `LOCK_REC` BIGINT NOT NULL,
16 `LOCK_DATA` VARCHAR(256) NOT NULL16 `LOCK_DATA` VARCHAR(256) NOT NULL
17) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM17) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
1818
=== modified file 'plugin/innobase/tests/r/innodb_replication_log.result'
--- plugin/innobase/tests/r/innodb_replication_log.result 2011-04-03 06:02:00 +0000
+++ plugin/innobase/tests/r/innodb_replication_log.result 2011-04-28 12:13:33 +0000
@@ -12,7 +12,7 @@
12 `END_TIMESTAMP` BIGINT NOT NULL,12 `END_TIMESTAMP` BIGINT NOT NULL,
13 `TRANSACTION_MESSAGE_STRING` TEXT COLLATE utf8_general_ci NOT NULL,13 `TRANSACTION_MESSAGE_STRING` TEXT COLLATE utf8_general_ci NOT NULL,
14 `TRANSACTION_LENGTH` BIGINT NOT NULL14 `TRANSACTION_LENGTH` BIGINT NOT NULL
15) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM15) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
16select count(*) >= 3 from data_dictionary.INNODB_REPLICATION_LOG;16select count(*) >= 3 from data_dictionary.INNODB_REPLICATION_LOG;
17count(*) >= 317count(*) >= 3
181181
1919
=== modified file 'plugin/innobase/tests/r/innodb_status.result'
--- plugin/innobase/tests/r/innodb_status.result 2011-04-03 06:02:00 +0000
+++ plugin/innobase/tests/r/innodb_status.result 2011-04-28 12:13:33 +0000
@@ -7,4 +7,4 @@
7INNODB_STATUS CREATE TABLE `INNODB_STATUS` (7INNODB_STATUS CREATE TABLE `INNODB_STATUS` (
8 `VARIABLE_NAME` VARCHAR(256) NOT NULL,8 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
9 `VARIABLE_VALUE` VARCHAR(256) NOT NULL9 `VARIABLE_VALUE` VARCHAR(256) NOT NULL
10) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM10) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
1111
=== modified file 'plugin/innobase/tests/r/innodb_trx.result'
--- plugin/innobase/tests/r/innodb_trx.result 2011-04-03 06:02:00 +0000
+++ plugin/innobase/tests/r/innodb_trx.result 2011-04-28 12:13:33 +0000
@@ -25,7 +25,7 @@
25 `TRX_LAST_FOREIGN_KEY_ERROR` VARCHAR(256) DEFAULT NULL,25 `TRX_LAST_FOREIGN_KEY_ERROR` VARCHAR(256) DEFAULT NULL,
26 `TRX_ADAPTIVE_HASH_LATCHED` BIGINT NOT NULL,26 `TRX_ADAPTIVE_HASH_LATCHED` BIGINT NOT NULL,
27 `TRX_ADAPTIVE_HASH_TIMEOUT` BIGINT NOT NULL27 `TRX_ADAPTIVE_HASH_TIMEOUT` BIGINT NOT NULL
28) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM28) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
29use test;29use test;
30create table t1 (a int);30create table t1 (a int);
31start transaction;31start transaction;
3232
=== modified file 'plugin/logging_stats/tests/r/command.result'
--- plugin/logging_stats/tests/r/command.result 2011-04-03 06:02:00 +0000
+++ plugin/logging_stats/tests/r/command.result 2011-04-28 12:13:33 +0000
@@ -23,7 +23,7 @@
23SESSION_STATEMENTS CREATE TABLE `SESSION_STATEMENTS` (23SESSION_STATEMENTS CREATE TABLE `SESSION_STATEMENTS` (
24 `VARIABLE_NAME` VARCHAR(256) NOT NULL,24 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
25 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL25 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
26) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM26) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
27SELECT count(*) FROM data_dictionary.SESSION_STATEMENTS;27SELECT count(*) FROM data_dictionary.SESSION_STATEMENTS;
28count(*)28count(*)
29#29#
3030
=== modified file 'plugin/logging_stats/tests/r/max_user.result'
--- plugin/logging_stats/tests/r/max_user.result 2011-04-03 06:02:00 +0000
+++ plugin/logging_stats/tests/r/max_user.result 2011-04-28 12:13:33 +0000
@@ -524,7 +524,7 @@
524GLOBAL_STATEMENTS CREATE TABLE `GLOBAL_STATEMENTS` (524GLOBAL_STATEMENTS CREATE TABLE `GLOBAL_STATEMENTS` (
525 `VARIABLE_NAME` VARCHAR(256) NOT NULL,525 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
526 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL526 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
527) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM527) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
528SELECT count(*) FROM data_dictionary.GLOBAL_STATEMENTS;528SELECT count(*) FROM data_dictionary.GLOBAL_STATEMENTS;
529count(*)529count(*)
530#530#
531531
=== modified file 'plugin/registry_dictionary/tests/r/data_dictionary.result'
--- plugin/registry_dictionary/tests/r/data_dictionary.result 2011-04-03 06:02:00 +0000
+++ plugin/registry_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
@@ -15,7 +15,7 @@
15 `MODULE_LIBRARY` VARCHAR(254) NOT NULL,15 `MODULE_LIBRARY` VARCHAR(254) NOT NULL,
16 `MODULE_DESCRIPTION` VARCHAR(254) NOT NULL,16 `MODULE_DESCRIPTION` VARCHAR(254) NOT NULL,
17 `MODULE_LICENSE` VARCHAR(80) NOT NULL17 `MODULE_LICENSE` VARCHAR(80) NOT NULL
18) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM18) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
19show create table PLUGINS ;19show create table PLUGINS ;
20Table Create Table20Table Create Table
21PLUGINS CREATE TABLE `PLUGINS` (21PLUGINS CREATE TABLE `PLUGINS` (
@@ -23,4 +23,4 @@
23 `PLUGIN_TYPE` VARCHAR(256) NOT NULL,23 `PLUGIN_TYPE` VARCHAR(256) NOT NULL,
24 `IS_ACTIVE` BOOLEAN NOT NULL,24 `IS_ACTIVE` BOOLEAN NOT NULL,
25 `MODULE_NAME` VARCHAR(256) NOT NULL25 `MODULE_NAME` VARCHAR(256) NOT NULL
26) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM26) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
2727
=== modified file 'plugin/replication_dictionary/tests/r/data_dictionary.result'
--- plugin/replication_dictionary/tests/r/data_dictionary.result 2011-04-03 06:02:00 +0000
+++ plugin/replication_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
@@ -7,4 +7,4 @@
7REPLICATION_STREAMS CREATE TABLE `REPLICATION_STREAMS` (7REPLICATION_STREAMS CREATE TABLE `REPLICATION_STREAMS` (
8 `REPLICATOR` VARCHAR(256) NOT NULL,8 `REPLICATOR` VARCHAR(256) NOT NULL,
9 `APPLIER` VARCHAR(256) NOT NULL9 `APPLIER` VARCHAR(256) NOT NULL
10) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM10) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
1111
=== modified file 'plugin/schema_dictionary/tests/r/data_dictionary.result'
--- plugin/schema_dictionary/tests/r/data_dictionary.result 2011-04-04 21:37:55 +0000
+++ plugin/schema_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
@@ -633,7 +633,7 @@
633 `ENUM_VALUES` VARCHAR(1024) DEFAULT NULL,633 `ENUM_VALUES` VARCHAR(1024) DEFAULT NULL,
634 `COLLATION_NAME` VARCHAR(256) NOT NULL,634 `COLLATION_NAME` VARCHAR(256) NOT NULL,
635 `COLUMN_COMMENT` VARCHAR(1024) DEFAULT NULL635 `COLUMN_COMMENT` VARCHAR(1024) DEFAULT NULL
636) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM636) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
637show create table INDEXES ;637show create table INDEXES ;
638Table Create Table638Table Create Table
639INDEXES CREATE TABLE `INDEXES` (639INDEXES CREATE TABLE `INDEXES` (
@@ -646,7 +646,7 @@
646 `KEY_LENGTH` BIGINT NOT NULL,646 `KEY_LENGTH` BIGINT NOT NULL,
647 `INDEX_TYPE` VARCHAR(256) NOT NULL,647 `INDEX_TYPE` VARCHAR(256) NOT NULL,
648 `INDEX_COMMENT` VARCHAR(1024) DEFAULT NULL648 `INDEX_COMMENT` VARCHAR(1024) DEFAULT NULL
649) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM649) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
650show create table INDEX_PARTS ;650show create table INDEX_PARTS ;
651Table Create Table651Table Create Table
652INDEX_PARTS CREATE TABLE `INDEX_PARTS` (652INDEX_PARTS CREATE TABLE `INDEX_PARTS` (
@@ -661,7 +661,7 @@
661 `IS_USED_IN_PRIMARY` BOOLEAN NOT NULL,661 `IS_USED_IN_PRIMARY` BOOLEAN NOT NULL,
662 `IS_UNIQUE` BOOLEAN NOT NULL,662 `IS_UNIQUE` BOOLEAN NOT NULL,
663 `IS_NULLABLE` BOOLEAN NOT NULL663 `IS_NULLABLE` BOOLEAN NOT NULL
664) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM664) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
665show create table REFERENTIAL_CONSTRAINTS ;665show create table REFERENTIAL_CONSTRAINTS ;
666ERROR 42S02: Unknown table 'data_dictionary.REFERENTIAL_CONSTRAINTS'666ERROR 42S02: Unknown table 'data_dictionary.REFERENTIAL_CONSTRAINTS'
667show create table SCHEMAS ;667show create table SCHEMAS ;
@@ -676,7 +676,7 @@
676 `SCHEMA_USE_COUNT` BIGINT DEFAULT NULL,676 `SCHEMA_USE_COUNT` BIGINT DEFAULT NULL,
677 `IS_REPLICATED` BOOLEAN NOT NULL,677 `IS_REPLICATED` BOOLEAN NOT NULL,
678 `SCHEMA_DEFINER` VARCHAR(64) DEFAULT NULL678 `SCHEMA_DEFINER` VARCHAR(64) DEFAULT NULL
679) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM679) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
680show create table TABLES ;680show create table TABLES ;
681Table Create Table681Table Create Table
682TABLES CREATE TABLE `TABLES` (682TABLES CREATE TABLE `TABLES` (
@@ -695,7 +695,7 @@
695 `TABLE_VERSION` BIGINT DEFAULT NULL,695 `TABLE_VERSION` BIGINT DEFAULT NULL,
696 `IS_REPLICATED` BOOLEAN NOT NULL,696 `IS_REPLICATED` BOOLEAN NOT NULL,
697 `TABLE_DEFINER` VARCHAR(64) DEFAULT NULL697 `TABLE_DEFINER` VARCHAR(64) DEFAULT NULL
698) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM698) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
699show create table TABLE_CONSTRAINTS ;699show create table TABLE_CONSTRAINTS ;
700Table Create Table700Table Create Table
701TABLE_CONSTRAINTS CREATE TABLE `TABLE_CONSTRAINTS` (701TABLE_CONSTRAINTS CREATE TABLE `TABLE_CONSTRAINTS` (
@@ -704,7 +704,7 @@
704 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,704 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,
705 `TABLE_NAME` VARCHAR(256) NOT NULL,705 `TABLE_NAME` VARCHAR(256) NOT NULL,
706 `CONSTRAINT_TYPE` VARCHAR(256) NOT NULL706 `CONSTRAINT_TYPE` VARCHAR(256) NOT NULL
707) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM707) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
708CREATE SCHEMA A;708CREATE SCHEMA A;
709use A;709use A;
710create table A (a int);710create table A (a int);
711711
=== modified file 'plugin/session_dictionary/tests/r/data_dictionary.result'
--- plugin/session_dictionary/tests/r/data_dictionary.result 2011-04-03 06:02:00 +0000
+++ plugin/session_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
@@ -11,7 +11,7 @@
11 `STATE` VARCHAR(256) DEFAULT NULL,11 `STATE` VARCHAR(256) DEFAULT NULL,
12 `INFO` VARCHAR(100) DEFAULT NULL,12 `INFO` VARCHAR(100) DEFAULT NULL,
13 `HAS_GLOBAL_LOCK` BOOLEAN NOT NULL13 `HAS_GLOBAL_LOCK` BOOLEAN NOT NULL
14) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM14) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
15SELECT ASSERT(COUNT(ID)) FROM processlist;15SELECT ASSERT(COUNT(ID)) FROM processlist;
16ASSERT(COUNT(ID))16ASSERT(COUNT(ID))
171171
1818
=== modified file 'plugin/status_dictionary/tests/r/data_dictionary.result'
--- plugin/status_dictionary/tests/r/data_dictionary.result 2011-04-03 06:02:00 +0000
+++ plugin/status_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
@@ -4,25 +4,25 @@
4GLOBAL_STATUS CREATE TABLE `GLOBAL_STATUS` (4GLOBAL_STATUS CREATE TABLE `GLOBAL_STATUS` (
5 `VARIABLE_NAME` VARCHAR(256) NOT NULL,5 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
6 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL6 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
7) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM7) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
8show create table GLOBAL_VARIABLES ;8show create table GLOBAL_VARIABLES ;
9Table Create Table9Table Create Table
10GLOBAL_VARIABLES CREATE TABLE `GLOBAL_VARIABLES` (10GLOBAL_VARIABLES CREATE TABLE `GLOBAL_VARIABLES` (
11 `VARIABLE_NAME` VARCHAR(256) NOT NULL,11 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
12 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL12 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
13) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM13) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
14show create table SESSION_STATUS;14show create table SESSION_STATUS;
15Table Create Table15Table Create Table
16SESSION_STATUS CREATE TABLE `SESSION_STATUS` (16SESSION_STATUS CREATE TABLE `SESSION_STATUS` (
17 `VARIABLE_NAME` VARCHAR(256) NOT NULL,17 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
18 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL18 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
19) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM19) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
20show create table SESSION_VARIABLES;20show create table SESSION_VARIABLES;
21Table Create Table21Table Create Table
22SESSION_VARIABLES CREATE TABLE `SESSION_VARIABLES` (22SESSION_VARIABLES CREATE TABLE `SESSION_VARIABLES` (
23 `VARIABLE_NAME` VARCHAR(256) NOT NULL,23 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
24 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL24 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
25) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM25) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
26SELECT count(*) FROM data_dictionary.GLOBAL_STATUS;26SELECT count(*) FROM data_dictionary.GLOBAL_STATUS;
27count(*)27count(*)
28#28#
2929
=== modified file 'plugin/table_cache_dictionary/tests/r/table_cache.result'
--- plugin/table_cache_dictionary/tests/r/table_cache.result 2011-04-03 06:02:00 +0000
+++ plugin/table_cache_dictionary/tests/r/table_cache.result 2011-04-28 12:13:33 +0000
@@ -10,7 +10,7 @@
10 `AVG_ROW_LENGTH` BIGINT NOT NULL,10 `AVG_ROW_LENGTH` BIGINT NOT NULL,
11 `TABLE_SIZE` BIGINT NOT NULL,11 `TABLE_SIZE` BIGINT NOT NULL,
12 `AUTO_INCREMENT` BIGINT NOT NULL12 `AUTO_INCREMENT` BIGINT NOT NULL
13) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM13) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
14select count(*) FROM data_dictionary.TABLE_CACHE;14select count(*) FROM data_dictionary.TABLE_CACHE;
15count(*)15count(*)
16#16#
1717
=== modified file 'plugin/table_cache_dictionary/tests/r/table_definition_cache.result'
--- plugin/table_cache_dictionary/tests/r/table_definition_cache.result 2011-04-03 06:02:00 +0000
+++ plugin/table_cache_dictionary/tests/r/table_definition_cache.result 2011-04-28 12:13:33 +0000
@@ -6,7 +6,7 @@
6 `VERSION` BIGINT NOT NULL,6 `VERSION` BIGINT NOT NULL,
7 `TABLE_COUNT` BIGINT NOT NULL,7 `TABLE_COUNT` BIGINT NOT NULL,
8 `IS_NAME_LOCKED` BOOLEAN NOT NULL8 `IS_NAME_LOCKED` BOOLEAN NOT NULL
9) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM9) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
10select count(*) FROM data_dictionary.TABLE_DEFINITION_CACHE;10select count(*) FROM data_dictionary.TABLE_DEFINITION_CACHE;
11count(*)11count(*)
12#12#
1313
=== modified file 'plugin/transaction_log/tests/r/schema.result'
--- plugin/transaction_log/tests/r/schema.result 2011-04-03 06:02:00 +0000
+++ plugin/transaction_log/tests/r/schema.result 2011-04-28 12:13:33 +0000
@@ -2,7 +2,7 @@
2CREATE SCHEMA my_new_warnings;2CREATE SCHEMA my_new_warnings;
3DROP SCHEMA my_new_warnings;3DROP SCHEMA my_new_warnings;
4SET AUTOCOMMIT=0;4SET AUTOCOMMIT=0;
5CREATE SCHEMA `my_new_warnings` COLLATE utf8_general_ci DEFINER root;5CREATE SCHEMA `my_new_warnings` COLLATE utf8_general_ci DEFINER 'root';
6COMMIT;6COMMIT;
7SET AUTOCOMMIT=0;7SET AUTOCOMMIT=0;
8DROP SCHEMA `my_new_warnings`;8DROP SCHEMA `my_new_warnings`;
@@ -10,7 +10,7 @@
1010
11Generating statements for innodb replication log11Generating statements for innodb replication log
12SET AUTOCOMMIT=0;12SET AUTOCOMMIT=0;
13CREATE SCHEMA `my_new_warnings` COLLATE utf8_general_ci DEFINER root;13CREATE SCHEMA `my_new_warnings` COLLATE utf8_general_ci DEFINER 'root';
14COMMIT;14COMMIT;
15SET AUTOCOMMIT=0;15SET AUTOCOMMIT=0;
16DROP SCHEMA `my_new_warnings`;16DROP SCHEMA `my_new_warnings`;
1717
=== modified file 'tests/r/create.result'
--- tests/r/create.result 2011-04-03 06:02:00 +0000
+++ tests/r/create.result 2011-04-28 12:13:33 +0000
@@ -1474,7 +1474,7 @@
1474 `STATE` VARCHAR(256) DEFAULT NULL,1474 `STATE` VARCHAR(256) DEFAULT NULL,
1475 `INFO` VARCHAR(100) DEFAULT NULL,1475 `INFO` VARCHAR(100) DEFAULT NULL,
1476 `HAS_GLOBAL_LOCK` BOOLEAN NOT NULL1476 `HAS_GLOBAL_LOCK` BOOLEAN NOT NULL
1477) ENGINE=InnoDB COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM1477) ENGINE=InnoDB COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
1478drop table t1;1478drop table t1;
1479create temporary table t1 like data_dictionary.processlist;1479create temporary table t1 like data_dictionary.processlist;
1480Got one of the listed errors1480Got one of the listed errors
@@ -1491,7 +1491,7 @@
1491 `STATE` VARCHAR(256) DEFAULT NULL,1491 `STATE` VARCHAR(256) DEFAULT NULL,
1492 `INFO` VARCHAR(100) DEFAULT NULL,1492 `INFO` VARCHAR(100) DEFAULT NULL,
1493 `HAS_GLOBAL_LOCK` BOOLEAN NOT NULL1493 `HAS_GLOBAL_LOCK` BOOLEAN NOT NULL
1494) ENGINE=MyISAM COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM1494) ENGINE=MyISAM COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
1495drop table t1;1495drop table t1;
14961496
1497# --1497# --