Commit 665d1692 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016


sql/sql_parse.cc:
  Auto merged
parents e7274571 48dfeb4d

mysql-test/r/view.result

+2 −2
Original line number Diff line number Diff line
@@ -1980,7 +1980,7 @@ v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI 
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');

mysql-test/t/view.test

+2 −2
Original line number Diff line number Diff line
@@ -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;

sql/sql_parse.cc

+2 −0
Original line number Diff line number Diff line
@@ -4722,6 +4722,8 @@ mysql_execute_command(THD *thd) 
    {

      if (end_active_trans(thd))

        goto error;



      res= mysql_create_view(thd, first_table, thd->lex->create_view_mode);

      break;

    }

  case SQLCOM_DROP_VIEW:

sql/sql_view.cc

+0 −1
Original line number Diff line number Diff line
@@ -1384,7 +1384,6 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode) 
          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)))