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

Merge bodhi.local:/opt/local/work/mysql-5.1-root

Browse source 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
This commit is contained in:
kostja@bodhi.local 2007-01-16 14:54:43 +03:00
commit 717452fec9
3 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3014,6 +3014,15 @@ i j
6 3 6 3
DROP VIEW v1, v2; DROP VIEW v1, v2;
DROP TABLE t1; DROP TABLE t1;
DROP VIEW IF EXISTS v1;
CREATE VIEW v1 AS SELECT 'The\ZEnd';
SELECT * FROM v1;
TheEnd
TheEnd
SHOW CREATE VIEW v1;
View Create View
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select _latin1'The\ZEnd' AS `TheEnd`
DROP VIEW v1;
End of 5.0 tests. End of 5.0 tests.
DROP DATABASE IF EXISTS `d-1`; DROP DATABASE IF EXISTS `d-1`;
CREATE DATABASE `d-1`; CREATE DATABASE `d-1`;

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

@ -2906,6 +2906,7 @@ DROP FUNCTION f1;
DROP VIEW v1; DROP VIEW v1;
DROP TABLE t1; DROP TABLE t1;
#
# Bug #16813 (WITH CHECK OPTION doesn't work with UPDATE) # Bug #16813 (WITH CHECK OPTION doesn't work with UPDATE)
# #
CREATE TABLE t1(id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, val INT UNSIGNED NOT NULL); CREATE TABLE t1(id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, val INT UNSIGNED NOT NULL);
@ -2919,7 +2920,6 @@ UPDATE v1 SET val=6 WHERE id=2;
DROP VIEW v1; DROP VIEW v1;
DROP TABLE t1; DROP TABLE t1;
# #
# BUG#22584: last_insert_id not updated after inserting a record # BUG#22584: last_insert_id not updated after inserting a record
# through a updatable view # through a updatable view
@ -2957,6 +2957,20 @@ SELECT * FROM t1;
DROP VIEW v1, v2; DROP VIEW v1, v2;
DROP TABLE t1; 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. --echo End of 5.0 tests.

4
sql/sql_string.cc
View file

@ -1022,8 +1022,8 @@ void String::print(String *str)
case '\r': case '\r':
str->append(STRING_WITH_LEN("\\r")); str->append(STRING_WITH_LEN("\\r"));
break; break;
case 26: //Ctrl-Z case '\032': // Ctrl-Z
str->append(STRING_WITH_LEN("\\z")); str->append(STRING_WITH_LEN("\\Z"));
break; break;
default: default:
str->append(c); str->append(c);