← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/session_dictionary/tests/r/data_dictionary.result

  • Committer: Lee Bieber
  • Date: 2011-01-18 20:05:06 UTC
  • mfrom: (2094.1.6 build)
  • Revision ID: kalebral@gmail.com-20110118200506-r1v72y174j5x7j0i
Merge Brian - fix processlist test, was failing under lcov
Merge Marisa - fix bug 684803: Need to update Drizzledump documentation with migration conversions / caveats
Merge Marisa - fix bug #686641: Need to document removal of multi-table update/delete from Drizzle
Merge Monty - fix bug 567387: quotes now appearing around module name and author in data_dicionary view
Merge Monty - fix bug 658752: Incorrect datadir value being stored
Merge Andrew - fix bug 680872: max-connect-errors appears to be unused 
Merge Stewart - Haildb updates, ANALYZE table as well as improved index statistics

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/session_dictionary/tests/r/data_dictionary.result
12
12
  `INFO` VARCHAR(100) DEFAULT NULL,
13
13
  `HAS_GLOBAL_LOCK` BOOLEAN NOT NULL
14
14
) ENGINE=FunctionEngine COLLATE = utf8_general_ci
15
 
SELECT ID FROM processlist;
16
 
ID
17
 
#
 
15
SELECT ASSERT(COUNT(ID)) FROM processlist;
 
16
ASSERT(COUNT(ID))
 
17
1
 
18
SELECT ASSERT(COUNT(ID)) FROM processlist ORDER BY ID;
 
19
ASSERT(COUNT(ID))
 
20
1
 
21
SELECT ASSERT(ID) FROM processlist;
18
22
SELECT ID FROM processlist ORDER BY ID;
19
 
ID
20
 
#
21
23
SELECT a.ID FROM processlist as a, processlist as b ORDER BY ID;
22
 
ID
23
 
#
24
24
SELECT a.ID FROM processlist as a, data_dictionary.processlist as b;
25
 
ID
26
 
#