← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/r/case.result

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/r/case.result
106
106
SHOW CREATE TABLE t1;
107
107
Table   Create Table
108
108
t1      CREATE TABLE `t1` (
109
 
  `c1` varchar(1) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
110
 
  `c2` varchar(1) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
 
109
  `c1` varchar(1) COLLATE utf8_bin DEFAULT NULL,
 
110
  `c2` varchar(1) COLLATE utf8_bin DEFAULT NULL,
111
111
  `c3` varbinary(4) NOT NULL,
112
112
  `c4` varbinary(4) NOT NULL,
113
113
  `c5` varbinary(4) NOT NULL,
162
162
  `COALESCE(1,1.0)` decimal(2,1) NOT NULL,
163
163
  `COALESCE(1,'1')` varbinary(4) NOT NULL,
164
164
  `COALESCE(1.1,'1')` varbinary(4) NOT NULL,
165
 
  `COALESCE('a' COLLATE utf8_bin,'b')` varchar(1) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
 
165
  `COALESCE('a' COLLATE utf8_bin,'b')` varchar(1) COLLATE utf8_bin DEFAULT NULL
166
166
) ENGINE=DEFAULT
167
167
DROP TABLE t1;
168
168
SELECT 'case+union+test'