From bc18ca4a6667a40117b37a3468b7dfc54e34951d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 5 Apr 2005 13:01:16 +0200 Subject: [PATCH 1/2] Fix swedish error message sql/share/swedish/errmsg.txt: Fix length of swedish error message for "unknown table" --- sql/share/swedish/errmsg.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index 4dc42389d89..ca863df7939 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/errmsg.txt @@ -67,7 +67,7 @@ character-set=latin1 "Kolumn '%-.64s' får inte vara NULL", "Okänd databas: '%-.64s'", "Tabellen '%-.64s' finns redan", -"Okänd tabell '%-.64s'", +"Okänd tabell '%-.180s'", "Kolumn '%-.64s' i %s är inte unik", "Servern går nu ned", "Okänd kolumn '%-.64s' i %s", From 61fed028ba5278a5c9184d5a752ce021456601d5 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 8 Apr 2005 11:38:40 +0200 Subject: [PATCH 2/2] Added more tests for auto_increment --- mysql-test/r/ndb_basic.result | 42 ++++++++++++++++++++++++++++++----- mysql-test/t/ndb_basic.test | 2 ++ 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result index 12f9c3742e5..3712fa2b5ca 100644 --- a/mysql-test/r/ndb_basic.result +++ b/mysql-test/r/ndb_basic.result @@ -619,12 +619,6 @@ counter datavalue 1 newval 2 newval insert into t1 (datavalue) select datavalue from t1 where counter < 100; -select * from t1 order by counter; -counter datavalue -1 newval -2 newval -3 newval -4 newval insert into t1 (datavalue) select datavalue from t1 where counter < 100; select * from t1 order by counter; counter datavalue @@ -632,8 +626,44 @@ counter datavalue 2 newval 3 newval 4 newval +5 newval +6 newval +7 newval +8 newval +insert into t1 (datavalue) select datavalue from t1 where counter < 100; +insert into t1 (datavalue) select datavalue from t1 where counter < 100; +select * from t1 order by counter; +counter datavalue +1 newval +2 newval +3 newval +4 newval +5 newval +6 newval +7 newval +8 newval 35 newval 36 newval 37 newval 38 newval +39 newval +40 newval +41 newval +42 newval +43 newval +44 newval +45 newval +46 newval +47 newval +48 newval +49 newval +50 newval +51 newval +52 newval +53 newval +54 newval +55 newval +56 newval +57 newval +58 newval drop table t1; diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test index 35e1ddc5ebf..66300f61fc3 100644 --- a/mysql-test/t/ndb_basic.test +++ b/mysql-test/t/ndb_basic.test @@ -596,9 +596,11 @@ insert into t1 (datavalue) values ('newval'); insert into t1 (datavalue) values ('newval'); select * from t1 order by counter; insert into t1 (datavalue) select datavalue from t1 where counter < 100; +insert into t1 (datavalue) select datavalue from t1 where counter < 100; select * from t1 order by counter; connection con2; insert into t1 (datavalue) select datavalue from t1 where counter < 100; +insert into t1 (datavalue) select datavalue from t1 where counter < 100; select * from t1 order by counter; drop table t1;