MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:konstantin Date:July 11 2007 9:10pm
Subject:bk commit into 5.0 tree (kostja:1.2517) BUG#25859
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-12 01:10:29+04:00, kostja@bodhi.(none) +3 -0
  A fix and a test case for Bug#25859 ALTER DATABASE works w/o parameters.
  Fix the parser to make the database options not optional.

  mysql-test/r/information_schema.result@stripped, 2007-07-12 01:10:26+04:00, kostja@bodhi.(none) +6 -1
    Update results (Bug#25859)

  mysql-test/t/information_schema.test@stripped, 2007-07-12 01:10:26+04:00, kostja@bodhi.(none) +9 -2
    Add a test case for Bug#25859 "ALTER DATABASE works w/o parameters"

  sql/sql_yacc.yy@stripped, 2007-07-12 01:10:26+04:00, kostja@bodhi.(none) +1 -1
    Fix Bug#25859 ALTER DATABASE works w/o parameters - require
    parameters in the parser.

diff -Nrup a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result	2007-06-09 15:52:36 +04:00
+++ b/mysql-test/r/information_schema.result	2007-07-12 01:10:26 +04:00
@@ -1013,7 +1013,7 @@ c	int(11)	YES		NULL	
 drop view v1;
 drop table t1;
 alter database information_schema;
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ERROR 42000: 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
 drop database information_schema;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 drop table information_schema.tables;
@@ -1326,3 +1326,8 @@ v2	YES
 delete from v1;
 drop view v1,v2;
 drop table t1,t2;
+alter database;
+ERROR 42000: 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
+alter database test;
+ERROR 42000: 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
+End of 5.0 tests.
diff -Nrup a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
--- a/mysql-test/t/information_schema.test	2007-06-09 15:52:36 +04:00
+++ b/mysql-test/t/information_schema.test	2007-07-12 01:10:26 +04:00
@@ -697,7 +697,7 @@ drop table t1;
 #
 # Bug #9846 Inappropriate error displayed while dropping table from 'INFORMATION_SCHEMA'
 #
---error 1044
+--error ER_PARSE_ERROR
 alter database information_schema;
 --error 1044
 drop database information_schema;
@@ -1038,4 +1038,11 @@ delete from v1;
 drop view v1,v2;
 drop table t1,t2;
 
-# End of 5.0 tests.
+#
+# Bug#25859    ALTER DATABASE works w/o parameters
+#
+--error ER_PARSE_ERROR
+alter database;
+--error ER_PARSE_ERROR
+alter database test;
+--echo End of 5.0 tests.
diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2007-07-05 11:34:03 +04:00
+++ b/sql/sql_yacc.yy	2007-07-12 01:10:26 +04:00
@@ -3621,7 +3621,7 @@ alter:
             Lex->create_info.default_table_charset= NULL;
             Lex->create_info.used_fields= 0;
           }
-          opt_create_database_options
+          create_database_options
 	  {
 	    LEX *lex=Lex;
 	    lex->sql_command=SQLCOM_ALTER_DB;
Thread
bk commit into 5.0 tree (kostja:1.2517) BUG#25859konstantin11 Jul