~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/r/join.result

  • Committer: Brian Aker
  • Date: 2011-01-05 07:43:57 UTC
  • mto: (2060.2.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2063.
  • Revision ID: brian@tangent.org-20110105074357-9zf9j38hf52xjvef
Merge in work for reserved words in SQL standard.

Show diffs side-by-side

added added

removed removed

Lines of Context:
74
74
count int DEFAULT '0' NOT NULL,
75
75
qty int,
76
76
phone char(1) DEFAULT '' NOT NULL,
77
 
timestamp datetime,
 
77
timestamp_arg datetime,
78
78
PRIMARY KEY (id),
79
79
KEY token (token(15)),
80
 
KEY timestamp (timestamp),
 
80
KEY timestamp_arg (timestamp_arg),
81
81
UNIQUE token_2 (token(75),count,phone)
82
82
);
83
83
INSERT INTO t1 VALUES (21,'e45703b64de71482360de8fec94c3ade',3,7800,'n','1999-12-23 17:22:21');