mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-03 09:43:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
This commit is contained in:
dlenev@mysql.com 2006-02-27 20:00:05 +03:00
commit 6137476427
3 changed files with 28 additions and 0 deletions

10
mysql-test/r/view.result
View file

@ -2529,3 +2529,13 @@ Warnings:
Warning 1052 Column 'x' in group statement is ambiguous Warning 1052 Column 'x' in group statement is ambiguous
DROP VIEW v1; DROP VIEW v1;
DROP TABLE t1; DROP TABLE t1;
drop table if exists t1;
drop view if exists v1;
create table t1 (id int);
create view v1 as select * from t1;
drop table t1;
show create view v1;
drop view v1;
//
View Create View
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sql_no_cache `test`.`t1`.`id` AS `id` from `t1`

15
mysql-test/t/view.test
View file

@ -2370,3 +2370,18 @@ SELECT IF(x IS NULL, 'blank', 'not blank') AS x FROM v1 GROUP BY x;
DROP VIEW v1; DROP VIEW v1;
DROP TABLE t1; DROP TABLE t1;
#
# BUG#15943: mysql_next_result hangs on invalid SHOW CREATE VIEW
#
delimiter //;
drop table if exists t1;
drop view if exists v1;
create table t1 (id int);
create view v1 as select * from t1;
drop table t1;
show create view v1;
drop view v1;
//
delimiter ;//

3
sql/sql_show.cc
View file

@ -365,12 +365,15 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
{ {
if (!table_list->view || thd->net.last_errno != ER_VIEW_INVALID) if (!table_list->view || thd->net.last_errno != ER_VIEW_INVALID)
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
/* /*
Clear all messages with 'error' level status and Clear all messages with 'error' level status and
issue a warning with 'warning' level status in issue a warning with 'warning' level status in
case of invalid view and last error is ER_VIEW_INVALID case of invalid view and last error is ER_VIEW_INVALID
*/ */
mysql_reset_errors(thd, true); mysql_reset_errors(thd, true);
thd->clear_error();
push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN, push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN,
ER_VIEW_INVALID, ER_VIEW_INVALID,
ER(ER_VIEW_INVALID), ER(ER_VIEW_INVALID),