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
1=== modified file 'drizzled/message/statement_transform.cc'
2--- drizzled/message/statement_transform.cc 2011-04-20 22:18:30 +0000
3+++ drizzled/message/statement_transform.cc 2011-04-28 12:13:33 +0000
4@@ -894,7 +894,9 @@
5 if (message::has_definer(schema))
6 {
7 destination.append(" DEFINER ");
8+ destination.push_back('\'');
9 destination.append(message::definer(schema));
10+ destination.push_back('\'');
11 }
12
13 return NONE;
14@@ -1098,7 +1100,9 @@
15 if (message::has_definer(table))
16 {
17 destination.append(" DEFINER ");
18+ destination.push_back('\'');
19 destination.append(message::definer(table));
20+ destination.push_back('\'');
21 }
22
23 return NONE;
24
25=== modified file 'drizzled/sql_yacc.yy'
26--- drizzled/sql_yacc.yy 2011-04-13 22:07:01 +0000
27+++ drizzled/sql_yacc.yy 2011-04-28 12:13:33 +0000
28@@ -980,12 +980,15 @@
29
30 opt_create_database_options:
31 /* empty */ {}
32- | default_collation_schema {}
33- | opt_database_custom_options {}
34+ | default_collation_schema
35+ | default_collation_schema opt_database_custom_options
36+ | default_collation_schema ',' opt_database_custom_options
37+ | opt_database_custom_options
38 ;
39
40 opt_database_custom_options:
41 custom_database_option
42+ | custom_database_option opt_database_custom_options
43 | custom_database_option ',' opt_database_custom_options
44 ;
45
46
47=== modified file 'plugin/collation_dictionary/tests/r/data_dictionary.result'
48--- plugin/collation_dictionary/tests/r/data_dictionary.result 2011-04-03 06:02:00 +0000
49+++ plugin/collation_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
50@@ -6,7 +6,7 @@
51 `DEFAULT_COLLATE_NAME` VARCHAR(256) NOT NULL,
52 `DESCRIPTION` VARCHAR(256) NOT NULL,
53 `MAXLEN` BIGINT NOT NULL
54-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
55+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
56 show create table COLLATIONS ;
57 Table Create Table
58 COLLATIONS CREATE TABLE `COLLATIONS` (
59@@ -17,7 +17,7 @@
60 `IS_DEFAULT` BOOLEAN NOT NULL,
61 `IS_COMPILED` BOOLEAN NOT NULL,
62 `SORTLEN` BIGINT NOT NULL
63-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
64+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
65 SELECT * FROM character_sets ORDER BY CHARACTER_SET_NAME;
66 CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN
67 binary binary 1
68
69=== modified file 'plugin/filtered_replicator/tests/r/var_filteredschemas.result'
70--- plugin/filtered_replicator/tests/r/var_filteredschemas.result 2011-04-03 06:02:00 +0000
71+++ plugin/filtered_replicator/tests/r/var_filteredschemas.result 2011-04-28 12:13:33 +0000
72@@ -11,7 +11,7 @@
73 We should only see the 'bar' schema in the log
74
75 SET AUTOCOMMIT=0;
76-CREATE SCHEMA `bar` COLLATE utf8_general_ci DEFINER root;
77+CREATE SCHEMA `bar` COLLATE utf8_general_ci DEFINER 'root';
78 COMMIT;
79 SET AUTOCOMMIT=0;
80 DROP SCHEMA `bar`;
81
82=== modified file 'plugin/filtered_replicator/tests/r/var_schemaregex.result'
83--- plugin/filtered_replicator/tests/r/var_schemaregex.result 2011-04-03 06:02:00 +0000
84+++ plugin/filtered_replicator/tests/r/var_schemaregex.result 2011-04-28 12:13:33 +0000
85@@ -13,7 +13,7 @@
86 We should only see the 'bar' schema in the log
87
88 SET AUTOCOMMIT=0;
89-CREATE SCHEMA `bar` COLLATE utf8_general_ci DEFINER root;
90+CREATE SCHEMA `bar` COLLATE utf8_general_ci DEFINER 'root';
91 COMMIT;
92 SET AUTOCOMMIT=0;
93 DROP SCHEMA `bar`;
94
95=== modified file 'plugin/information_schema_dictionary/tests/r/show_create_table.result'
96--- plugin/information_schema_dictionary/tests/r/show_create_table.result 2011-04-03 06:02:00 +0000
97+++ plugin/information_schema_dictionary/tests/r/show_create_table.result 2011-04-28 12:13:33 +0000
98@@ -6,7 +6,7 @@
99 `CONSTRAINT_SCHEMA` VARCHAR(256) NOT NULL,
100 `CONSTRAINT_NAME` VARCHAR(256) NOT NULL,
101 `CHECK_CLAUSE` VARCHAR(256) NOT NULL
102-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
103+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
104 SHOW CREATE TABLE `COLUMNS`;
105 Table Create Table
106 COLUMNS CREATE TABLE `COLUMNS` (
107@@ -33,7 +33,7 @@
108 `DOMAIN_CATALOG` VARCHAR(256) DEFAULT NULL,
109 `DOMAIN_SCHEMA` VARCHAR(256) DEFAULT NULL,
110 `DOMAIN_NAME` VARCHAR(256) DEFAULT NULL
111-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
112+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
113 SHOW CREATE TABLE `COLUMN_DOMAIN_USAGE`;
114 Table Create Table
115 COLUMN_DOMAIN_USAGE CREATE TABLE `COLUMN_DOMAIN_USAGE` (
116@@ -44,7 +44,7 @@
117 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,
118 `TABLE_NAME` VARCHAR(256) NOT NULL,
119 `COLUMN_NAME` VARCHAR(256) NOT NULL
120-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
121+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
122 SHOW CREATE TABLE `COLUMN_PRIVILEGES`;
123 Table Create Table
124 COLUMN_PRIVILEGES CREATE TABLE `COLUMN_PRIVILEGES` (
125@@ -56,7 +56,7 @@
126 `COLUMN_NAME` VARCHAR(256) NOT NULL,
127 `PRIVILEGE_TYPE` VARCHAR(256) NOT NULL,
128 `IS_GRANTABLE` VARCHAR(256) NOT NULL
129-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
130+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
131 SHOW CREATE TABLE `CONSTRAINT_COLUMN_USAGE`;
132 Table Create Table
133 CONSTRAINT_COLUMN_USAGE CREATE TABLE `CONSTRAINT_COLUMN_USAGE` (
134@@ -67,7 +67,7 @@
135 `CONSTRAINT_CATALOG` VARCHAR(256) NOT NULL,
136 `CONSTRAINT_SCHEMA` VARCHAR(256) NOT NULL,
137 `CONSTRAINT_NAME` VARCHAR(256) NOT NULL
138-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
139+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
140 SHOW CREATE TABLE `CONSTRAINT_TABLE_USAGE`;
141 Table Create Table
142 CONSTRAINT_TABLE_USAGE CREATE TABLE `CONSTRAINT_TABLE_USAGE` (
143@@ -77,7 +77,7 @@
144 `CONSTRAINT_CATALOG` VARCHAR(256) NOT NULL,
145 `CONSTRAINT_SCHEMA` VARCHAR(256) NOT NULL,
146 `CONSTRAINT_NAME` VARCHAR(256) NOT NULL
147-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
148+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
149 SHOW CREATE TABLE `DOMAINS`;
150 Table Create Table
151 DOMAINS CREATE TABLE `DOMAINS` (
152@@ -98,7 +98,7 @@
153 `NUMERIC_SCALE` VARCHAR(256) NOT NULL,
154 `DATETIME_PRECISION` VARCHAR(256) NOT NULL,
155 `DOMAIN_DEFAULT` VARCHAR(256) NOT NULL
156-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
157+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
158 SHOW CREATE TABLE `DOMAIN_CONSTRAINTS`;
159 Table Create Table
160 DOMAIN_CONSTRAINTS CREATE TABLE `DOMAIN_CONSTRAINTS` (
161@@ -110,7 +110,7 @@
162 `DOMAIN_NAME` VARCHAR(256) NOT NULL,
163 `IS_DEFERRABLE` BOOLEAN NOT NULL,
164 `INITIALLY_DEFERRED` BOOLEAN NOT NULL
165-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
166+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
167 SHOW CREATE TABLE `KEY_COLUMN_USAGE`;
168 Table Create Table
169 KEY_COLUMN_USAGE CREATE TABLE `KEY_COLUMN_USAGE` (
170@@ -122,7 +122,7 @@
171 `TABLE_NAME` VARCHAR(256) NOT NULL,
172 `COLUMN_NAME` VARCHAR(256) NOT NULL,
173 `ORDINAL_POSITION` BIGINT NOT NULL
174-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
175+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
176 SHOW CREATE TABLE `PARAMETERS`;
177 Table Create Table
178 PARAMETERS CREATE TABLE `PARAMETERS` (
179@@ -156,7 +156,7 @@
180 `SCOPE_CATALOG` VARCHAR(256) NOT NULL,
181 `SCOPE_SCHEMA` VARCHAR(256) NOT NULL,
182 `SCOPE_NAME` VARCHAR(256) NOT NULL
183-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
184+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
185 SHOW CREATE TABLE `REFERENTIAL_CONSTRAINTS`;
186 Table Create Table
187 REFERENTIAL_CONSTRAINTS CREATE TABLE `REFERENTIAL_CONSTRAINTS` (
188@@ -169,7 +169,7 @@
189 `MATCH_OPTION` VARCHAR(256) NOT NULL,
190 `UPDATE_RULE` VARCHAR(256) NOT NULL,
191 `DELETE_RULE` VARCHAR(256) NOT NULL
192-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
193+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
194 SHOW CREATE TABLE `ROUTINES`;
195 Table Create Table
196 ROUTINES CREATE TABLE `ROUTINES` (
197@@ -226,7 +226,7 @@
198 `IS_IMPLICITLY_INVOCABLE` VARCHAR(256) NOT NULL,
199 `CREATED` VARCHAR(256) NOT NULL,
200 `LAST_ALTERED` VARCHAR(256) NOT NULL
201-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
202+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
203 SHOW CREATE TABLE `ROUTINE_COLUMNS`;
204 Table Create Table
205 ROUTINE_COLUMNS CREATE TABLE `ROUTINE_COLUMNS` (
206@@ -253,7 +253,7 @@
207 `DOMAIN_CATALOG` VARCHAR(256) NOT NULL,
208 `DOMAIN_SCHEMA` VARCHAR(256) NOT NULL,
209 `DOMAIN_NAME` VARCHAR(256) NOT NULL
210-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
211+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
212 SHOW CREATE TABLE `SCHEMATA`;
213 Table Create Table
214 SCHEMATA CREATE TABLE `SCHEMATA` (
215@@ -263,7 +263,7 @@
216 `DEFAULT_CHARACTER_SET_CATALOG` VARCHAR(256) DEFAULT NULL,
217 `DEFAULT_CHARACTER_SET_SCHEMA` VARCHAR(256) DEFAULT NULL,
218 `DEFAULT_CHARACTER_SET_NAME` VARCHAR(256) DEFAULT NULL
219-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
220+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
221 SHOW CREATE TABLE `TABLES`;
222 Table Create Table
223 TABLES CREATE TABLE `TABLES` (
224@@ -271,7 +271,7 @@
225 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,
226 `TABLE_NAME` VARCHAR(256) NOT NULL,
227 `TABLE_TYPE` VARCHAR(256) NOT NULL
228-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
229+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
230 SHOW CREATE TABLE `TABLE_CONSTRAINTS`;
231 Table Create Table
232 TABLE_CONSTRAINTS CREATE TABLE `TABLE_CONSTRAINTS` (
233@@ -284,7 +284,7 @@
234 `CONSTRAINT_TYPE` VARCHAR(256) NOT NULL,
235 `IS_DEFERRABLE` BOOLEAN NOT NULL,
236 `INITIALLY_DEFERRED` BOOLEAN NOT NULL
237-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
238+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
239 SHOW CREATE TABLE `TABLE_PRIVILEGES`;
240 Table Create Table
241 TABLE_PRIVILEGES CREATE TABLE `TABLE_PRIVILEGES` (
242@@ -296,7 +296,7 @@
243 `COLUMN_NAME` VARCHAR(256) NOT NULL,
244 `PRIVILEGE_TYPE` VARCHAR(256) NOT NULL,
245 `IS_GRANTABLE` VARCHAR(256) NOT NULL
246-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
247+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
248 SHOW CREATE TABLE `VIEWS`;
249 Table Create Table
250 VIEWS CREATE TABLE `VIEWS` (
251@@ -306,7 +306,7 @@
252 `TABLE_CATALOG` VARCHAR(256) NOT NULL,
253 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,
254 `TABLE_NAME` VARCHAR(256) NOT NULL
255-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
256+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
257 SHOW CREATE TABLE `VIEW_COLUMN_USAGE`;
258 Table Create Table
259 VIEW_COLUMN_USAGE CREATE TABLE `VIEW_COLUMN_USAGE` (
260@@ -317,7 +317,7 @@
261 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,
262 `TABLE_NAME` VARCHAR(256) NOT NULL,
263 `COLUMN_NAME` VARCHAR(256) NOT NULL
264-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
265+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
266 SHOW CREATE TABLE `VIEW_TABLE_USAGE`;
267 Table Create Table
268 VIEW_TABLE_USAGE CREATE TABLE `VIEW_TABLE_USAGE` (
269@@ -327,4 +327,4 @@
270 `VIEW_DEFINITION` VARCHAR(256) NOT NULL,
271 `CHECK_OPTION` VARCHAR(256) NOT NULL,
272 `IS_UPDATABLE` VARCHAR(256) NOT NULL
273-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
274+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
275
276=== modified file 'plugin/innobase/tests/r/innodb_cmp.result'
277--- plugin/innobase/tests/r/innodb_cmp.result 2011-04-03 06:02:00 +0000
278+++ plugin/innobase/tests/r/innodb_cmp.result 2011-04-28 12:13:33 +0000
279@@ -15,4 +15,4 @@
280 `COMPRESS_TIME` BIGINT NOT NULL,
281 `UNCOMPRESS_OPS` BIGINT NOT NULL,
282 `UNCOMPRESS_TIME` BIGINT NOT NULL
283-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
284+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
285
286=== modified file 'plugin/innobase/tests/r/innodb_cmp_reset.result'
287--- plugin/innobase/tests/r/innodb_cmp_reset.result 2011-04-03 06:02:00 +0000
288+++ plugin/innobase/tests/r/innodb_cmp_reset.result 2011-04-28 12:13:33 +0000
289@@ -15,4 +15,4 @@
290 `COMPRESS_TIME` BIGINT NOT NULL,
291 `UNCOMPRESS_OPS` BIGINT NOT NULL,
292 `UNCOMPRESS_TIME` BIGINT NOT NULL
293-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
294+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
295
296=== modified file 'plugin/innobase/tests/r/innodb_cmpmem.result'
297--- plugin/innobase/tests/r/innodb_cmpmem.result 2011-04-03 06:02:00 +0000
298+++ plugin/innobase/tests/r/innodb_cmpmem.result 2011-04-28 12:13:33 +0000
299@@ -18,4 +18,4 @@
300 `PAGES_FREE` BIGINT NOT NULL,
301 `RELOCATION_OPS` BIGINT NOT NULL,
302 `RELOCATION_TIME` BIGINT NOT NULL
303-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
304+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
305
306=== modified file 'plugin/innobase/tests/r/innodb_cmpmem_reset.result'
307--- plugin/innobase/tests/r/innodb_cmpmem_reset.result 2011-04-03 06:02:00 +0000
308+++ plugin/innobase/tests/r/innodb_cmpmem_reset.result 2011-04-28 12:13:33 +0000
309@@ -18,4 +18,4 @@
310 `PAGES_FREE` BIGINT NOT NULL,
311 `RELOCATION_OPS` BIGINT NOT NULL,
312 `RELOCATION_TIME` BIGINT NOT NULL
313-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
314+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
315
316=== modified file 'plugin/innobase/tests/r/innodb_lock_waits.result'
317--- plugin/innobase/tests/r/innodb_lock_waits.result 2011-04-03 06:02:00 +0000
318+++ plugin/innobase/tests/r/innodb_lock_waits.result 2011-04-28 12:13:33 +0000
319@@ -8,4 +8,4 @@
320 `REQUESTED_LOCK_ID` VARCHAR(256) NOT NULL,
321 `BLOCKING_TRX_ID` VARCHAR(256) NOT NULL,
322 `BLOCKING_LOCK_ID` VARCHAR(256) NOT NULL
323-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
324+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
325
326=== modified file 'plugin/innobase/tests/r/innodb_locks.result'
327--- plugin/innobase/tests/r/innodb_locks.result 2011-04-03 06:02:00 +0000
328+++ plugin/innobase/tests/r/innodb_locks.result 2011-04-28 12:13:33 +0000
329@@ -14,4 +14,4 @@
330 `LOCK_PAGE` BIGINT NOT NULL,
331 `LOCK_REC` BIGINT NOT NULL,
332 `LOCK_DATA` VARCHAR(256) NOT NULL
333-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
334+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
335
336=== modified file 'plugin/innobase/tests/r/innodb_replication_log.result'
337--- plugin/innobase/tests/r/innodb_replication_log.result 2011-04-03 06:02:00 +0000
338+++ plugin/innobase/tests/r/innodb_replication_log.result 2011-04-28 12:13:33 +0000
339@@ -12,7 +12,7 @@
340 `END_TIMESTAMP` BIGINT NOT NULL,
341 `TRANSACTION_MESSAGE_STRING` TEXT COLLATE utf8_general_ci NOT NULL,
342 `TRANSACTION_LENGTH` BIGINT NOT NULL
343-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
344+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
345 select count(*) >= 3 from data_dictionary.INNODB_REPLICATION_LOG;
346 count(*) >= 3
347 1
348
349=== modified file 'plugin/innobase/tests/r/innodb_status.result'
350--- plugin/innobase/tests/r/innodb_status.result 2011-04-03 06:02:00 +0000
351+++ plugin/innobase/tests/r/innodb_status.result 2011-04-28 12:13:33 +0000
352@@ -7,4 +7,4 @@
353 INNODB_STATUS CREATE TABLE `INNODB_STATUS` (
354 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
355 `VARIABLE_VALUE` VARCHAR(256) NOT NULL
356-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
357+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
358
359=== modified file 'plugin/innobase/tests/r/innodb_trx.result'
360--- plugin/innobase/tests/r/innodb_trx.result 2011-04-03 06:02:00 +0000
361+++ plugin/innobase/tests/r/innodb_trx.result 2011-04-28 12:13:33 +0000
362@@ -25,7 +25,7 @@
363 `TRX_LAST_FOREIGN_KEY_ERROR` VARCHAR(256) DEFAULT NULL,
364 `TRX_ADAPTIVE_HASH_LATCHED` BIGINT NOT NULL,
365 `TRX_ADAPTIVE_HASH_TIMEOUT` BIGINT NOT NULL
366-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
367+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
368 use test;
369 create table t1 (a int);
370 start transaction;
371
372=== modified file 'plugin/logging_stats/tests/r/command.result'
373--- plugin/logging_stats/tests/r/command.result 2011-04-03 06:02:00 +0000
374+++ plugin/logging_stats/tests/r/command.result 2011-04-28 12:13:33 +0000
375@@ -23,7 +23,7 @@
376 SESSION_STATEMENTS CREATE TABLE `SESSION_STATEMENTS` (
377 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
378 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
379-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
380+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
381 SELECT count(*) FROM data_dictionary.SESSION_STATEMENTS;
382 count(*)
383 #
384
385=== modified file 'plugin/logging_stats/tests/r/max_user.result'
386--- plugin/logging_stats/tests/r/max_user.result 2011-04-03 06:02:00 +0000
387+++ plugin/logging_stats/tests/r/max_user.result 2011-04-28 12:13:33 +0000
388@@ -524,7 +524,7 @@
389 GLOBAL_STATEMENTS CREATE TABLE `GLOBAL_STATEMENTS` (
390 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
391 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
392-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
393+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
394 SELECT count(*) FROM data_dictionary.GLOBAL_STATEMENTS;
395 count(*)
396 #
397
398=== modified file 'plugin/registry_dictionary/tests/r/data_dictionary.result'
399--- plugin/registry_dictionary/tests/r/data_dictionary.result 2011-04-03 06:02:00 +0000
400+++ plugin/registry_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
401@@ -15,7 +15,7 @@
402 `MODULE_LIBRARY` VARCHAR(254) NOT NULL,
403 `MODULE_DESCRIPTION` VARCHAR(254) NOT NULL,
404 `MODULE_LICENSE` VARCHAR(80) NOT NULL
405-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
406+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
407 show create table PLUGINS ;
408 Table Create Table
409 PLUGINS CREATE TABLE `PLUGINS` (
410@@ -23,4 +23,4 @@
411 `PLUGIN_TYPE` VARCHAR(256) NOT NULL,
412 `IS_ACTIVE` BOOLEAN NOT NULL,
413 `MODULE_NAME` VARCHAR(256) NOT NULL
414-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
415+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
416
417=== modified file 'plugin/replication_dictionary/tests/r/data_dictionary.result'
418--- plugin/replication_dictionary/tests/r/data_dictionary.result 2011-04-03 06:02:00 +0000
419+++ plugin/replication_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
420@@ -7,4 +7,4 @@
421 REPLICATION_STREAMS CREATE TABLE `REPLICATION_STREAMS` (
422 `REPLICATOR` VARCHAR(256) NOT NULL,
423 `APPLIER` VARCHAR(256) NOT NULL
424-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
425+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
426
427=== modified file 'plugin/schema_dictionary/tests/r/data_dictionary.result'
428--- plugin/schema_dictionary/tests/r/data_dictionary.result 2011-04-04 21:37:55 +0000
429+++ plugin/schema_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
430@@ -633,7 +633,7 @@
431 `ENUM_VALUES` VARCHAR(1024) DEFAULT NULL,
432 `COLLATION_NAME` VARCHAR(256) NOT NULL,
433 `COLUMN_COMMENT` VARCHAR(1024) DEFAULT NULL
434-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
435+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
436 show create table INDEXES ;
437 Table Create Table
438 INDEXES CREATE TABLE `INDEXES` (
439@@ -646,7 +646,7 @@
440 `KEY_LENGTH` BIGINT NOT NULL,
441 `INDEX_TYPE` VARCHAR(256) NOT NULL,
442 `INDEX_COMMENT` VARCHAR(1024) DEFAULT NULL
443-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
444+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
445 show create table INDEX_PARTS ;
446 Table Create Table
447 INDEX_PARTS CREATE TABLE `INDEX_PARTS` (
448@@ -661,7 +661,7 @@
449 `IS_USED_IN_PRIMARY` BOOLEAN NOT NULL,
450 `IS_UNIQUE` BOOLEAN NOT NULL,
451 `IS_NULLABLE` BOOLEAN NOT NULL
452-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
453+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
454 show create table REFERENTIAL_CONSTRAINTS ;
455 ERROR 42S02: Unknown table 'data_dictionary.REFERENTIAL_CONSTRAINTS'
456 show create table SCHEMAS ;
457@@ -676,7 +676,7 @@
458 `SCHEMA_USE_COUNT` BIGINT DEFAULT NULL,
459 `IS_REPLICATED` BOOLEAN NOT NULL,
460 `SCHEMA_DEFINER` VARCHAR(64) DEFAULT NULL
461-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
462+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
463 show create table TABLES ;
464 Table Create Table
465 TABLES CREATE TABLE `TABLES` (
466@@ -695,7 +695,7 @@
467 `TABLE_VERSION` BIGINT DEFAULT NULL,
468 `IS_REPLICATED` BOOLEAN NOT NULL,
469 `TABLE_DEFINER` VARCHAR(64) DEFAULT NULL
470-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
471+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
472 show create table TABLE_CONSTRAINTS ;
473 Table Create Table
474 TABLE_CONSTRAINTS CREATE TABLE `TABLE_CONSTRAINTS` (
475@@ -704,7 +704,7 @@
476 `TABLE_SCHEMA` VARCHAR(256) NOT NULL,
477 `TABLE_NAME` VARCHAR(256) NOT NULL,
478 `CONSTRAINT_TYPE` VARCHAR(256) NOT NULL
479-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
480+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
481 CREATE SCHEMA A;
482 use A;
483 create table A (a int);
484
485=== modified file 'plugin/session_dictionary/tests/r/data_dictionary.result'
486--- plugin/session_dictionary/tests/r/data_dictionary.result 2011-04-03 06:02:00 +0000
487+++ plugin/session_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
488@@ -11,7 +11,7 @@
489 `STATE` VARCHAR(256) DEFAULT NULL,
490 `INFO` VARCHAR(100) DEFAULT NULL,
491 `HAS_GLOBAL_LOCK` BOOLEAN NOT NULL
492-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
493+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
494 SELECT ASSERT(COUNT(ID)) FROM processlist;
495 ASSERT(COUNT(ID))
496 1
497
498=== modified file 'plugin/status_dictionary/tests/r/data_dictionary.result'
499--- plugin/status_dictionary/tests/r/data_dictionary.result 2011-04-03 06:02:00 +0000
500+++ plugin/status_dictionary/tests/r/data_dictionary.result 2011-04-28 12:13:33 +0000
501@@ -4,25 +4,25 @@
502 GLOBAL_STATUS CREATE TABLE `GLOBAL_STATUS` (
503 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
504 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
505-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
506+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
507 show create table GLOBAL_VARIABLES ;
508 Table Create Table
509 GLOBAL_VARIABLES CREATE TABLE `GLOBAL_VARIABLES` (
510 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
511 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
512-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
513+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
514 show create table SESSION_STATUS;
515 Table Create Table
516 SESSION_STATUS CREATE TABLE `SESSION_STATUS` (
517 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
518 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
519-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
520+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
521 show create table SESSION_VARIABLES;
522 Table Create Table
523 SESSION_VARIABLES CREATE TABLE `SESSION_VARIABLES` (
524 `VARIABLE_NAME` VARCHAR(256) NOT NULL,
525 `VARIABLE_VALUE` VARCHAR(1024) NOT NULL
526-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
527+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
528 SELECT count(*) FROM data_dictionary.GLOBAL_STATUS;
529 count(*)
530 #
531
532=== modified file 'plugin/table_cache_dictionary/tests/r/table_cache.result'
533--- plugin/table_cache_dictionary/tests/r/table_cache.result 2011-04-03 06:02:00 +0000
534+++ plugin/table_cache_dictionary/tests/r/table_cache.result 2011-04-28 12:13:33 +0000
535@@ -10,7 +10,7 @@
536 `AVG_ROW_LENGTH` BIGINT NOT NULL,
537 `TABLE_SIZE` BIGINT NOT NULL,
538 `AUTO_INCREMENT` BIGINT NOT NULL
539-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
540+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
541 select count(*) FROM data_dictionary.TABLE_CACHE;
542 count(*)
543 #
544
545=== modified file 'plugin/table_cache_dictionary/tests/r/table_definition_cache.result'
546--- plugin/table_cache_dictionary/tests/r/table_definition_cache.result 2011-04-03 06:02:00 +0000
547+++ plugin/table_cache_dictionary/tests/r/table_definition_cache.result 2011-04-28 12:13:33 +0000
548@@ -6,7 +6,7 @@
549 `VERSION` BIGINT NOT NULL,
550 `TABLE_COUNT` BIGINT NOT NULL,
551 `IS_NAME_LOCKED` BOOLEAN NOT NULL
552-) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
553+) ENGINE=FunctionEngine COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
554 select count(*) FROM data_dictionary.TABLE_DEFINITION_CACHE;
555 count(*)
556 #
557
558=== modified file 'plugin/transaction_log/tests/r/schema.result'
559--- plugin/transaction_log/tests/r/schema.result 2011-04-03 06:02:00 +0000
560+++ plugin/transaction_log/tests/r/schema.result 2011-04-28 12:13:33 +0000
561@@ -2,7 +2,7 @@
562 CREATE SCHEMA my_new_warnings;
563 DROP SCHEMA my_new_warnings;
564 SET AUTOCOMMIT=0;
565-CREATE SCHEMA `my_new_warnings` COLLATE utf8_general_ci DEFINER root;
566+CREATE SCHEMA `my_new_warnings` COLLATE utf8_general_ci DEFINER 'root';
567 COMMIT;
568 SET AUTOCOMMIT=0;
569 DROP SCHEMA `my_new_warnings`;
570@@ -10,7 +10,7 @@
571
572 Generating statements for innodb replication log
573 SET AUTOCOMMIT=0;
574-CREATE SCHEMA `my_new_warnings` COLLATE utf8_general_ci DEFINER root;
575+CREATE SCHEMA `my_new_warnings` COLLATE utf8_general_ci DEFINER 'root';
576 COMMIT;
577 SET AUTOCOMMIT=0;
578 DROP SCHEMA `my_new_warnings`;
579
580=== modified file 'tests/r/create.result'
581--- tests/r/create.result 2011-04-03 06:02:00 +0000
582+++ tests/r/create.result 2011-04-28 12:13:33 +0000
583@@ -1474,7 +1474,7 @@
584 `STATE` VARCHAR(256) DEFAULT NULL,
585 `INFO` VARCHAR(100) DEFAULT NULL,
586 `HAS_GLOBAL_LOCK` BOOLEAN NOT NULL
587-) ENGINE=InnoDB COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
588+) ENGINE=InnoDB COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
589 drop table t1;
590 create temporary table t1 like data_dictionary.processlist;
591 Got one of the listed errors
592@@ -1491,7 +1491,7 @@
593 `STATE` VARCHAR(256) DEFAULT NULL,
594 `INFO` VARCHAR(100) DEFAULT NULL,
595 `HAS_GLOBAL_LOCK` BOOLEAN NOT NULL
596-) ENGINE=MyISAM COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER SYSTEM
597+) ENGINE=MyISAM COLLATE = utf8_general_ci REPLICATE = FALSE DEFINER 'SYSTEM'
598 drop table t1;
599
600 # --