Commit e715019f authored by unknown's avatar unknown
Browse files

after merge fix

parent d663a343
Loading
Loading
Loading
Loading
+14 −17
Original line number Diff line number Diff line
@@ -2946,6 +2946,20 @@ SELECT * FROM v;

DROP VIEW v;

#                                                                                                        
# BUG#24293: '\Z' token is not handled correctly in views                                                
#                                                                                                        
                                                                                                         
--disable_warnings                                                                                       
DROP VIEW IF EXISTS v1;                                                                                  
--enable_warnings                                                                                        
                                                                                                         
CREATE VIEW v1 AS SELECT 'The\ZEnd';                                                                     
SELECT * FROM v1;                                                                                        
                                                                                                         
SHOW CREATE VIEW v1;                                                                                     
                                                                                                         
DROP VIEW v1;

--echo End of 5.0 tests.

@@ -2999,23 +3013,6 @@ SELECT * FROM t1;
DROP VIEW v1, v2;
DROP TABLE t1;

#
# BUG#24293: '\Z' token is not handled correctly in views
#

--disable_warnings
DROP VIEW IF EXISTS v1;
--enable_warnings

CREATE VIEW v1 AS SELECT 'The\ZEnd';
SELECT * FROM v1;

SHOW CREATE VIEW v1;

DROP VIEW v1;

--echo End of 5.0 tests.

#
# Bug#21370 View renaming lacks tablename_to_filename encoding
#