← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/r/func_system.result

  • Committer: Andrew Hutchings
  • Date: 2010-09-08 19:03:09 UTC
  • mfrom: (1750 staging)
  • mto: (1750.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1751.
  • Revision ID: andrew@linuxjedi.co.uk-20100908190309-mya1nu7xvo1fpvk8
Merge trunk into branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/r/func_system.result
19
19
show create table t1;
20
20
Table   Create Table
21
21
t1      CREATE TABLE `t1` (
22
 
  `database()` varbinary(136) DEFAULT NULL,
23
 
  `user()` varbinary(308) DEFAULT NULL,
24
 
  `version` varchar(60) DEFAULT NULL
 
22
  `database()` VARBINARY(136) DEFAULT NULL,
 
23
  `user()` VARBINARY(308) DEFAULT NULL,
 
24
  `version` VARCHAR(60) COLLATE utf8_general_ci DEFAULT NULL
25
25
) ENGINE=DEFAULT COLLATE = utf8_general_ci
26
26
drop table t1;
27
27
select TRUE,FALSE,NULL;