summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <antony@ltantony.dsl-verizon.net>2004-04-28 16:14:53 +0100
committerunknown <antony@ltantony.dsl-verizon.net>2004-04-28 16:14:53 +0100
commit0d07fe42c3a825e21d74f3db8efe4af1dba32f5b (patch)
tree6c92d4845efa916dd3e9c67a7bd1465826848af5 /mysql-test/r
parentd1214e2c5d17ca397588bbd1ed5de12c8396459f (diff)
downloadmariadb-git-0d07fe42c3a825e21d74f3db8efe4af1dba32f5b.tar.gz
Fix for Bug 3481
CREATE statement allowed extra unnecessary commas mysql-test/r/alias.result: Extra comma removed in CREATE statement mysql-test/r/create.result: New test for Bug 3481 mysql-test/r/func_str.result: Extra comma removed in CREATE statement mysql-test/r/rpl_multi_update.result: Extra comma removed in CREATE statement mysql-test/t/alias.test: Extra comma removed in CREATE statement mysql-test/t/create.test: New test for bug 3481 mysql-test/t/func_str.test: Extra comma removed in CREATE statement mysql-test/t/rpl_multi_update.test: Extra comma removed in CREATE statement sql/sql_yacc.yy: Fix for bug 3481 No path through the grammar which has no clauses BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/alias.result2
-rw-r--r--mysql-test/r/create.result6
-rw-r--r--mysql-test/r/func_str.result2
-rw-r--r--mysql-test/r/rpl_multi_update.result2
4 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/r/alias.result b/mysql-test/r/alias.result
index 5ed10b58929..3d6273144d0 100644
--- a/mysql-test/r/alias.result
+++ b/mysql-test/r/alias.result
@@ -63,7 +63,7 @@ CREATE TABLE t1 (
AUFNR varchar(12) NOT NULL default '',
PLNFL varchar(6) NOT NULL default '',
VORNR varchar(4) NOT NULL default '',
-xstatus_vor smallint(5) unsigned NOT NULL default '0',
+xstatus_vor smallint(5) unsigned NOT NULL default '0'
);
INSERT INTO t1 VALUES ('40004712','000001','0010',9);
INSERT INTO t1 VALUES ('40004712','000001','0020',0);
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 22743782484..7cb79d5a990 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -222,3 +222,9 @@ create database `db1 `;
Incorrect database name 'db1 '
create table t1(`a ` int);
Incorrect column name 'a '
+create table t1 (a int,);
+You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+create table t1 (a int,,b int);
+You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near 'b int)' at line 1
+create table t1 (,b int);
+You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near 'b int)' at line 1
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index 7d2668c8cf6..3205563f9ab 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -247,7 +247,7 @@ CREATE TABLE t1 (
wid int(10) unsigned NOT NULL auto_increment,
data_podp date default NULL,
status_wnio enum('nowy','podp','real','arch') NOT NULL default 'nowy',
-PRIMARY KEY(wid),
+PRIMARY KEY(wid)
);
INSERT INTO t1 VALUES (8,NULL,'real');
INSERT INTO t1 VALUES (9,NULL,'nowy');
diff --git a/mysql-test/r/rpl_multi_update.result b/mysql-test/r/rpl_multi_update.result
index 1fa1dd104d2..0cd6ea2c6f7 100644
--- a/mysql-test/r/rpl_multi_update.result
+++ b/mysql-test/r/rpl_multi_update.result
@@ -7,7 +7,7 @@ slave start;
drop table if exists t1,t2;
CREATE TABLE t1 (
a int unsigned not null auto_increment primary key,
-b int unsigned,
+b int unsigned
) TYPE=MyISAM;
CREATE TABLE t2 (
a int unsigned not null auto_increment primary key,