List:Commits« Previous MessageNext Message »
From:Chad MILLER Date:October 17 2006 3:06pm
Subject:bk commit into 5.0 tree (cmiller:1.2307) BUG#14262
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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, 2006-10-17 11:06:11-04:00, cmiller@stripped +4 -0
  Fix previous bad patch for Bug#14262.
  
  Remove table engine qualification where it's unnecessary.

  mysql-test/r/view.result@stripped, 2006-10-17 11:06:08-04:00, cmiller@stripped +2 -2
    Remove requirement for innodb where not needed.  (Running this test alone
    raised warnings that it was using myisam.)

  mysql-test/t/view.test@stripped, 2006-10-17 11:06:08-04:00, cmiller@stripped +2 -2
    Remove requirement for innodb where not needed.  (Running this test alone
    raised warnings that it was using myisam.)

  sql/sql_parse.cc@stripped, 2006-10-17 11:06:08-04:00, cmiller@stripped +2 -0
    Fix previous bad re-patch.

  sql/sql_view.cc@stripped, 2006-10-17 11:06:08-04:00, cmiller@stripped +0 -1
    Fix previous bad re-patch.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.0-maint_20061016

--- 1.584/sql/sql_parse.cc	2006-10-17 11:06:16 -04:00
+++ 1.585/sql/sql_parse.cc	2006-10-17 11:06:16 -04:00
@@ -4720,6 +4720,8 @@ end_with_restore_list:
     {
       if (end_active_trans(thd))
         goto error;
+
+      res= mysql_create_view(thd, first_table, thd->lex->create_view_mode);
       break;
     }
   case SQLCOM_DROP_VIEW:

--- 1.179/mysql-test/r/view.result	2006-10-17 11:06:16 -04:00
+++ 1.180/mysql-test/r/view.result	2006-10-17 11:06:16 -04:00
@@ -1980,7 +1980,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 drop view v1;
 drop table t1;
 set sql_mode='strict_all_tables';
-CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL) ENGINE = INNODB;
+CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL);
 CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1;
 CREATE VIEW v2 (vcol1) AS SELECT col1 FROM t1 WHERE col2 > 2;
 INSERT INTO t1 (col1) VALUES(12);
@@ -2032,7 +2032,7 @@ f3	f1
 1	3
 drop view v1;
 drop table t1;
-CREATE TABLE t1 (f1 char) ENGINE = innodb;
+CREATE TABLE t1 (f1 char);
 INSERT INTO t1 VALUES ('A');
 CREATE VIEW  v1 AS SELECT * FROM t1;
 INSERT INTO t1 VALUES('B');

--- 1.166/mysql-test/t/view.test	2006-10-17 11:06:16 -04:00
+++ 1.167/mysql-test/t/view.test	2006-10-17 11:06:16 -04:00
@@ -1801,7 +1801,7 @@ drop table t1;
 # underlying tables (BUG#6443)
 #
 set sql_mode='strict_all_tables';
-CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL) ENGINE = INNODB;
+CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL);
 CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1;
 CREATE VIEW v2 (vcol1) AS SELECT col1 FROM t1 WHERE col2 > 2;
 -- error 1364
@@ -1857,7 +1857,7 @@ drop table t1;
 #
 # Test for bug #11771: wrong query_id in SELECT * FROM <view>
 #
-CREATE TABLE t1 (f1 char) ENGINE = innodb;
+CREATE TABLE t1 (f1 char);
 INSERT INTO t1 VALUES ('A');
 CREATE VIEW  v1 AS SELECT * FROM t1;
 

--- 1.97/sql/sql_view.cc	2006-10-17 11:06:16 -04:00
+++ 1.98/sql/sql_view.cc	2006-10-17 11:06:16 -04:00
@@ -1384,7 +1384,6 @@ bool mysql_drop_view(THD *thd, TABLE_LIS
           non_existant_views.append(',');
         non_existant_views.append(String(view->table_name,system_charset_info));
       }
-      VOID(pthread_mutex_unlock(&LOCK_open));
       continue;
     }
     if (my_delete(path, MYF(MY_WME)))
Thread
bk commit into 5.0 tree (cmiller:1.2307) BUG#14262Chad MILLER17 Oct