Commit 8546ddd3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-6903 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/view.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  Merge
mysql-test/t/sql_mode.test:
  Merge
parents 6efca84f ed483fcd

mysql-test/r/sql_mode.result

+37 −0
Original line number Diff line number Diff line
@@ -420,4 +420,41 @@ t1 CREATE TABLE `t1` ( 
  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

SET @@SQL_MODE='';

create function `foo` () returns int return 5;

show create function `foo`;

Function	sql_mode	Create Function

foo		CREATE FUNCTION `test`.`foo`() RETURNS int(11)

return 5

SET @@SQL_MODE='ANSI_QUOTES';

show create function `foo`;

Function	sql_mode	Create Function

foo		CREATE FUNCTION `test`.`foo`() RETURNS int(11)

return 5

drop function `foo`;

create function `foo` () returns int return 5;

show create function `foo`;

Function	sql_mode	Create Function

foo	ANSI_QUOTES	CREATE FUNCTION "test"."foo"() RETURNS int(11)

return 5

SET @@SQL_MODE='';

show create function `foo`;

Function	sql_mode	Create Function

foo	ANSI_QUOTES	CREATE FUNCTION "test"."foo"() RETURNS int(11)

return 5

drop function `foo`;

SET @@SQL_MODE='';

create table t1 (a int);

create table t2 (a int);

create view v1 as select a from t1;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select `test`.`t1`.`a` AS `a` from `test`.`t1`

SET @@SQL_MODE='ANSI_QUOTES';

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW "test"."v1" AS select "test"."t1"."a" AS "a" from "test"."t1"

create view v2 as select a from t2 where a in (select a from v1);

drop view v2, v1;

drop table t1, t2;

SET @@SQL_MODE=@OLD_SQL_MODE;

mysql-test/r/view.result

+2 −2
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ create table t1 ("a*b" int); 
create view v1 as select "a*b" from t1;

show create view v1;

View	Create View

v1	CREATE VIEW "test"."v1" AS select `test`.`t1`.`a*b` AS `a*b` from `test`.`t1`

v1	CREATE VIEW "test"."v1" AS select "test"."t1"."a*b" AS "a*b" from "test"."t1"

drop view v1;

drop table t1;

set sql_mode=default;
@@ -760,7 +760,7 @@ a b 
1	1

show create view v3;

View	Create View

v3	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v3` AS select `v1`.`col1` AS `a`,`v2`.`col1` AS `b` from `test`.`v1` join `test`.`v2` where (`v1`.`col1` = `v2`.`col1`)

v3	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v3` AS select `v1`.`col1` AS `a`,`v2`.`col1` AS `b` from (`test`.`v1` join `test`.`v2`) where (`v1`.`col1` = `v2`.`col1`)

drop view v3, v2, v1;

drop table t2, t1;

create function `f``1` () returns int return 5;

mysql-test/t/sql_mode.test

+32 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ SET @@SQL_MODE=''; 
SELECT 'a\\b', 'a\\\"b', 'a''\\b', 'a''\\\"b';

SELECT "a\\b", "a\\\'b", "a""\\b", "a""\\\'b";





#

# Bug#6877: MySQL should give an error if the requested table type 

#           is not available
@@ -208,5 +207,37 @@ create table t1 (a int) engine=isam; 
show create table t1;

drop table t1;



#

# Bug #6903: ANSI_QUOTES does not come into play with SHOW CREATE FUNCTION

# or PROCEDURE because it displays the SQL_MODE used to create the routine.

#

SET @@SQL_MODE='';

create function `foo` () returns int return 5;

show create function `foo`;

SET @@SQL_MODE='ANSI_QUOTES';

show create function `foo`;

drop function `foo`;



create function `foo` () returns int return 5;

show create function `foo`;

SET @@SQL_MODE='';

show create function `foo`;

drop function `foo`;



# 

# Bug #6903: ANSI_QUOTES should have effect for SHOW CREATE VIEW (Bug #6903)

#

SET @@SQL_MODE='';

create table t1 (a int);

create table t2 (a int);

create view v1 as select a from t1;

show create view v1;

SET @@SQL_MODE='ANSI_QUOTES';

show create view v1;

# Test a view with a subselect, which will get shown incorrectly without

# thd->lex->view_prepare_mode set properly.

create view v2 as select a from t2 where a in (select a from v1);

drop view v2, v1;

drop table t1, t2;



SET @@SQL_MODE=@OLD_SQL_MODE;

sql/sql_show.cc

+10 −1
Original line number Diff line number Diff line
@@ -347,6 +347,9 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) 
  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))

  {
@@ -1068,7 +1071,13 @@ view_store_create_info(THD *thd, TABLE_LIST *table, String *buff) 
  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)