~drizzle-trunk/drizzle/development

Merge Brian - Merge in latest catalog changes
Merge Brian remove error numbers in tests

added added

removed removed

2487

INSERT INTO t1 VALUES (1),(2),(3);

2488

INSERT INTO t2 VALUES (2);

2489

INSERT INTO t3 VALUES (3);

2490

--error ER_NON_UNIQ_ERROR

2490

2491

SELECT t1.id,t3.id FROM t1 JOIN t2 ON (t2.id=t1.id) LEFT JOIN t3 USING (id);

2492

--error ER_NON_UNIQ_ERROR

2491

2493

SELECT t1.id,t3.id FROM t1 JOIN t2 ON (t2.notacolumn=t1.id) LEFT JOIN t3 USING (id);

2494

--error ER_NON_UNIQ_ERROR

2492

2495

SELECT id,t3.id FROM t1 JOIN t2 ON (t2.id=t1.id) LEFT JOIN t3 USING (id);

2496

--error ER_NON_UNIQ_ERROR

2493

2497

SELECT id,t3.id FROM (t1 JOIN t2 ON (t2.id=t1.id)) LEFT JOIN t3 USING (id);

2494

2498

2495

2499

drop table t1, t2, t3;