bk commit into 5.0 tree (jimw:1.1945)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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
  1.1945 05/06/15 13:09:42 jimw@stripped +3 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-6903

  sql/sql_show.cc
    1.251 05/06/15 13:09:38 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/sql_mode.test
    1.11 05/06/15 13:09:38 jimw@stripped +0 -0
    Auto merged

  mysql-test/r/sql_mode.result
    1.20 05/06/15 13:09:38 jimw@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-6903/RESYNC

--- 1.250/sql/sql_show.cc	2005-06-10 05:34:41 -07:00
+++ 1.251/sql/sql_show.cc	2005-06-15 13:09:38 -07:00
@@ -347,6 +347,9 @@
   DBUG_PRINT("enter",("db: %s  table: %s",table_list->db,
                       table_list->table_name));
 
+  /* We want to preserve the tree for views. */
+  thd->lex->view_prepare_mode= TRUE;
+
   /* Only one table for now, but VIEW can involve several tables */
   if (open_normal_and_derived_tables(thd, table_list))
   {
@@ -1061,7 +1064,13 @@
   buff->append('.');
   append_identifier(thd, buff, table->view_name.str, table->view_name.length);
   buff->append(" AS ", 4);
-  buff->append(table->query.str, table->query.length);
+
+  /*
+    We can't just use table->query, because our SQL_MODE may trigger
+    a different syntax, like when ANSI_QUOTES is defined.
+  */
+  table->view->unit.print(buff);
+
   if (table->with_check != VIEW_CHECK_NONE)
   {
     if (table->with_check == VIEW_CHECK_LOCAL)

--- 1.19/mysql-test/r/sql_mode.result	2005-06-01 12:02:23 -07:00
+++ 1.20/mysql-test/r/sql_mode.result	2005-06-15 13:09:38 -07:00
@@ -138,6 +138,8 @@
   `min_num` decimal(7,6) default '0.000001'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1 ;
+set @@SQL_MODE=NULL;
+ERROR 42000: Variable 'sql_mode' can't be set to the value of 'NULL'
 SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE='';
 show local variables like 'SQL_MODE';
 Variable_name	Value

--- 1.10/mysql-test/t/sql_mode.test	2005-06-01 12:02:23 -07:00
+++ 1.11/mysql-test/t/sql_mode.test	2005-06-15 13:09:38 -07:00
@@ -80,6 +80,11 @@
 show create table t1;
 drop table t1 ;
 
+#
+# Bug #10732: Set SQL_MODE to NULL gives garbled error message
+#
+--error 1231
+set @@SQL_MODE=NULL;
 
 #
 # test for