bk commit into 5.2 tree (malff:1.2607)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.2 repository of malff. When malff 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-10-08 19:50:38-06:00, malff@stripped. +2 -0
  Manual merge

  mysql-test/r/sp-code.result@stripped, 2007-10-08 19:50:33-06:00,
malff@stripped. +2 -2
    Manual merge

  sql/sql_lex.h@stripped, 2007-10-08 19:50:33-06:00, malff@stripped. +1 -1
    Manual merge

diff -Nrup a/mysql-test/r/sp-code.result b/mysql-test/r/sp-code.result
--- a/mysql-test/r/sp-code.result	2007-10-08 17:34:32 -06:00
+++ b/mysql-test/r/sp-code.result	2007-10-08 19:50:33 -06:00
@@ -155,11 +155,11 @@ Pos	Instruction
 0	stmt 9 "drop temporary table if exists sudoku..."
 1	stmt 1 "create temporary table sudoku_work ( ..."
 2	stmt 1 "create temporary table sudoku_schedul..."
-3	stmt 91 "call sudoku_init()"
+3	stmt 90 "call sudoku_init()"
 4	jump_if_not 7(8) p_naive@0
 5	stmt 4 "update sudoku_work set cnt = 0 where ..."
 6	jump 8
-7	stmt 91 "call sudoku_count()"
+7	stmt 90 "call sudoku_count()"
 8	stmt 6 "insert into sudoku_schedule (row,col)..."
 9	set v_scounter@2 0
 10	set v_i@3 1
diff -Nrup a/sql/sql_lex.h b/sql/sql_lex.h
--- a/sql/sql_lex.h	2007-10-08 17:34:47 -06:00
+++ b/sql/sql_lex.h	2007-10-08 19:50:33 -06:00
@@ -78,7 +78,6 @@ enum enum_sql_command {
   SQLCOM_LOAD,SQLCOM_SET_OPTION,SQLCOM_LOCK_TABLES,SQLCOM_UNLOCK_TABLES,
   SQLCOM_GRANT,
   SQLCOM_CHANGE_DB, SQLCOM_CREATE_DB, SQLCOM_DROP_DB, SQLCOM_ALTER_DB,
-  SQLCOM_RENAME_DB,
   SQLCOM_REPAIR, SQLCOM_REPLACE, SQLCOM_REPLACE_SELECT,
   SQLCOM_CREATE_FUNCTION, SQLCOM_DROP_FUNCTION,
   SQLCOM_REVOKE,SQLCOM_OPTIMIZE, SQLCOM_CHECK,
@@ -117,6 +116,7 @@ enum enum_sql_command {
   SQLCOM_CREATE_EVENT, SQLCOM_ALTER_EVENT, SQLCOM_DROP_EVENT,
   SQLCOM_SHOW_CREATE_EVENT, SQLCOM_SHOW_EVENTS,
   SQLCOM_SHOW_CREATE_TRIGGER,
+  SQLCOM_ALTER_DB_UPGRADE,
   SQLCOM_SHOW_ARCHIVE,
   SQLCOM_BACKUP, SQLCOM_RESTORE,
   /* This should be the last !!! */