bk commit into 5.0 tree (igor:1.1965)

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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.1965 05/11/02 22:13:10 igor@stripped +4 -0
  Post review fixes.

  sql/sql_table.cc
    1.280 05/11/02 22:12:08 igor@stripped +6 -6
    Post review fixes

  sql/share/errmsg.txt
    1.53 05/11/02 22:12:08 igor@stripped +1 -1
    Post review fixes.

  mysql-test/t/view.test
    1.119 05/11/02 22:12:08 igor@stripped +1 -1
    Post review fixes.

  mysql-test/r/view.result
    1.128 05/11/02 22:12:08 igor@stripped +1 -1
    Post review fixes.

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-5.0-0

--- 1.279/sql/sql_table.cc	2005-11-02 13:44:53 -08:00
+++ 1.280/sql/sql_table.cc	2005-11-02 22:12:08 -08:00
@@ -2326,11 +2326,11 @@
 
     case HA_ADMIN_NOT_BASE_TABLE:
       {
-	char buf[ERRMSGSIZE+20];
-	uint length=my_snprintf(buf, ERRMSGSIZE,
-				ER(ER_CHECK_NOT_BASE_TABLE), operator_name);
-	protocol->store("note", 4, system_charset_info);
-	protocol->store(buf, length, system_charset_info);
+        char buf[ERRMSGSIZE+20];
+        uint length= my_snprintf(buf, ERRMSGSIZE,
+				 ER(ER_CHECK_NOT_BASE_TABLE), operator_name);
+        protocol->store("note", 4, system_charset_info);
+        protocol->store(buf, length, system_charset_info);
       }
       break;
 
@@ -2442,7 +2442,7 @@
       {
         pthread_mutex_lock(&LOCK_open);
         remove_table_from_cache(thd, table->table->s->db,
-			        table->table->s->table_name, RTFC_NO_FLAG);
+                                table->table->s->table_name, RTFC_NO_FLAG);
         pthread_mutex_unlock(&LOCK_open);
         /* Something may be modified, that's why we have to invalidate cache */
         query_cache_invalidate3(thd, table->table, 0);

--- 1.52/sql/share/errmsg.txt	2005-11-02 13:44:52 -08:00
+++ 1.53/sql/share/errmsg.txt	2005-11-02 22:12:08 -08:00
@@ -5421,5 +5421,5 @@
 	eng "Cannot add or update a child row: a foreign key constraint fails (%.192s)"
 ER_SP_BAD_VAR_SHADOW 42000
 	eng "Variable '%-.64s' must be quoted with `...`, or renamed"
-ER_CHECK_NOT_BASE_TABLE 4200
+ER_CHECK_NOT_BASE_TABLE 42000
         eng "You cannot apply %s to a view"

--- 1.127/mysql-test/r/view.result	2005-11-02 13:44:52 -08:00
+++ 1.128/mysql-test/r/view.result	2005-11-02 22:12:08 -08:00
@@ -2323,7 +2323,7 @@
 1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	3	Using where
 DROP VIEW v1,v2;
 DROP TABLE t1,t2,t3;
-CREATE TABLE t1(id INT) ENGINE=MyISAM;
+CREATE TABLE t1(id INT);
 CREATE VIEW v1 AS SELECT id FROM t1;
 OPTIMIZE TABLE v1;
 Table	Op	Msg_type	Msg_text

--- 1.118/mysql-test/t/view.test	2005-11-02 13:44:52 -08:00
+++ 1.119/mysql-test/t/view.test	2005-11-02 22:12:08 -08:00
@@ -2193,7 +2193,7 @@
 # Bug #14540: OPTIMIZE, ANALYZE, REPAIR applied to not a view
 #
 
-CREATE TABLE t1(id INT) ENGINE=MyISAM;
+CREATE TABLE t1(id INT);
 CREATE VIEW v1 AS SELECT id FROM t1;
 
 OPTIMIZE TABLE v1;