Commit 1cf65f31 authored by unknown's avatar unknown
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
parents a5812433 759027d1

client/mysql.cc

+2 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,8 @@ static bool add_line(String &buffer,char *line,char *in_string, 
      continue;

    }

#endif

    if (!*ml_comment && inchar == '\\')

    if (!*ml_comment && inchar == '\\' &&

        !(mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES))

    {

      // Found possbile one character command like \c

mysql-test/r/mysql_client.result

+4 −0
Original line number Diff line number Diff line
@@ -2,3 +2,7 @@ 
1

ERROR 1064 (42000) at line 3: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

ERROR at line 1: USE must be followed by a database name

\

\\

';

';

mysql-test/r/view.result

+31 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ c d 
2	5

3	10

drop view v100;

ERROR 42S02: Unknown table 'test.v100'

ERROR 42S02: Unknown table 'v100'

drop view t1;

ERROR HY000: 'test.t1' is not VIEW

drop table v1;
@@ -2807,6 +2807,17 @@ yadda 
yad

DROP VIEW v1;

DROP TABLE t1;

CREATE TABLE t1 (x INT, y INT);

CREATE ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW v1 AS SELECT x FROM t1;

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `v1` AS select `t1`.`x` AS `x` from `t1`

ALTER VIEW v1 AS SELECT x, y FROM t1;

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `v1` AS select `t1`.`x` AS `x`,`t1`.`y` AS `y` from `t1`

DROP VIEW v1;

DROP TABLE t1;

CREATE TABLE t1 (s1 char);

INSERT INTO t1 VALUES ('Z');

CREATE VIEW v1 AS SELECT s1 collate latin1_german1_ci AS col FROM t1;
@@ -2820,3 +2831,22 @@ b 
c

DROP VIEW v1, v2;

DROP TABLE t1;

CREATE TABLE t1 (id INT);

CREATE VIEW v1 AS SELECT id FROM t1;

SHOW TABLES;

Tables_in_test

t1

v1

DROP VIEW v2,v1;

ERROR 42S02: Unknown table 'v2'

SHOW TABLES;

Tables_in_test

t1

CREATE VIEW v1 AS SELECT id FROM t1;

DROP VIEW t1,v1;

ERROR HY000: 'test.t1' is not VIEW

SHOW TABLES;

Tables_in_test

t1

DROP TABLE t1;

DROP VIEW IF EXISTS v1;

mysql-test/t/mysql_client.test

+11 −0
Original line number Diff line number Diff line
@@ -27,3 +27,14 @@ 
# client comment recognized, but parameter missing => error

--exec echo "use"         >  $MYSQLTEST_VARDIR/tmp/bug20432.sql

--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1



#

# Bug #20103: Escaping with backslash does not work

#

--exec echo "SET SQL_MODE = 'NO_BACKSLASH_ESCAPES';"  > $MYSQLTEST_VARDIR/tmp/bug20103.sql

--exec echo "SELECT '\';" >> $MYSQLTEST_VARDIR/tmp/bug20103.sql

--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20103.sql 2>&1



--exec echo "SET SQL_MODE = '';"  > $MYSQLTEST_VARDIR/tmp/bug20103.sql

--exec echo "SELECT '\';';" >> $MYSQLTEST_VARDIR/tmp/bug20103.sql

--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20103.sql 2>&1

mysql-test/t/view.test

+32 −0
Original line number Diff line number Diff line
@@ -2669,6 +2669,17 @@ DROP VIEW v1; 
DROP TABLE t1;



#

#Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM

#

CREATE TABLE t1 (x INT, y INT);

CREATE ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW v1 AS SELECT x FROM t1;

SHOW CREATE VIEW v1;



ALTER VIEW v1 AS SELECT x, y FROM t1;

SHOW CREATE VIEW v1;



DROP VIEW v1;

DROP TABLE t1;

# Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE 

# clause is called

#
@@ -2686,3 +2697,24 @@ INSERT INTO v2 (col) VALUES ('c'); 
SELECT s1 FROM t1;

DROP VIEW v1, v2;

DROP TABLE t1;



#

# Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE

#

CREATE TABLE t1 (id INT);

CREATE VIEW v1 AS SELECT id FROM t1;

SHOW TABLES;



--error 1051

DROP VIEW v2,v1;

SHOW TABLES;



CREATE VIEW v1 AS SELECT id FROM t1;

--error 1347

DROP VIEW t1,v1;

SHOW TABLES;



DROP TABLE t1;

--disable_warnings

DROP VIEW IF EXISTS v1;

--enable_warnings