Merge ltantony.dsl-verizon.net:/usr/home/antony/work/mysql-4.0

into ltantony.dsl-verizon.net:/usr/home/antony/work/bug3481


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged

8 files changed, 24 insertions, 7 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 6be8e34c334..dd20ffa2dbb 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,
diff --git a/mysql-test/t/alias.test b/mysql-test/t/alias.test
index 57b46181fa1..982bd8b2a45 100644
--- a/mysql-test/t/alias.test
+++ b/mysql-test/t/alias.test
@@ -71,8 +71,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);
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 94c2f24dffc..c71a1e0c177 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -191,3 +191,15 @@ create table `t1 `(a int);
 create database `db1 `;
 --error 1166;
 create table t1(`a ` int);
+
+#
+# Test for Bug #3481 
+#   "Parser permits multiple commas without syntax error"
+#
+
+--error 1064
+create table t1 (a int,);
+--error 1064
+create table t1 (a int,,b int);
+--error 1064
+create table t1 (,b int);
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test
index 4043a238f0b..d6255e4d93c 100644
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
@@ -133,7 +133,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');
diff --git a/mysql-test/t/rpl_multi_update.test b/mysql-test/t/rpl_multi_update.test
index c44239594dd..cefa9face12 100644
--- a/mysql-test/t/rpl_multi_update.test
+++ b/mysql-test/t/rpl_multi_update.test
@@ -3,7 +3,7 @@ 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 (