Below is the list of changes that have just been committed into a local
5.2 repository of mleich. When mleich does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-10-08 16:57:13+02:00, mleich@stripped +5 -0
Post merge fix for
ChangeSet@stripped = Fix for bug
Bug#31237 Test "ndb_views" fails because of differing order of select results
mysql-test/suite/funcs_1/r/innodb_views.result@stripped, 2007-10-08 15:59:07+02:00,
mleich@stripped +22 -26
Updated result
mysql-test/suite/funcs_1/r/memory_views.result@stripped, 2007-10-08 15:59:07+02:00,
mleich@stripped +22 -26
Updated result
mysql-test/suite/funcs_1/r/myisam_views.result@stripped, 2007-10-08 15:59:07+02:00,
mleich@stripped +870 -871
Updated result
mysql-test/suite/funcs_1/r/ndb_views.result@stripped, 2007-10-08 15:59:07+02:00,
mleich@stripped +25 -28
Updated result
mysql-test/suite/funcs_1/views/views_master.inc@stripped, 2007-10-08 15:59:07+02:00,
mleich@stripped +2 -2
Reduce number of tables used in join via VIEW to avoid
NDBCLUSTER limit MaxNoOfConcurrentTransactions.
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_views.result
b/mysql-test/suite/funcs_1/r/innodb_views.result
--- a/mysql-test/suite/funcs_1/r/innodb_views.result 2007-10-05 20:06:35 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result 2007-10-08 15:59:07 +02:00
@@ -10319,14 +10319,13 @@ ERROR HY000: View 'test3.v32' references
EXPLAIN SELECT * FROM test3.v32;
ERROR HY000: View 'test3.v32' references invalid table(s) or column(s) or function(s) or
definer/invoker of view lack rights to use them
-FIXME - Setting join_limit to 28 - hangs for higher values
+FIXME - Setting join_limit to 27 - hangs for higher values
----------------------------------------------------------
-SET @join_limit = 28;
+SET @join_limit = 27;
SET @max_level = @join_limit - 1;
DROP DATABASE IF EXISTS test3;
DROP TABLE IF EXISTS test1.t1;
DROP TABLE IF EXISTS test2.t1;
-DROP VIEW IF EXISTS test1.v27;
DROP VIEW IF EXISTS test1.v26;
DROP VIEW IF EXISTS test1.v25;
DROP VIEW IF EXISTS test1.v24;
@@ -10430,13 +10429,11 @@ CREATE OR REPLACE VIEW test1.v25 AS SELE
FROM test2.t1 tab1 NATURAL JOIN test1.v24 tab2;
CREATE OR REPLACE VIEW test1.v26 AS SELECT f1, f2
FROM test3.t1 tab1 NATURAL JOIN test1.v25 tab2;
-CREATE OR REPLACE VIEW test1.v27 AS SELECT f1, f2
-FROM test1.t1 tab1 NATURAL JOIN test1.v26 tab2;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
View Create View character_set_client collation_connection
-v27 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v27` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test1`.`t1` `tab1`
join `test1`.`v26` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
+v26 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v26` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1`
join `test1`.`v25` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
f1 f2
5 five
@@ -10445,14 +10442,14 @@ differs on some platforms
FIXME Is this a bug ?
--------------------------------------------------------------------------------
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
-CREATE VIEW test1.v28 AS SELECT f1, f2
-FROM test3.t1 tab1 NATURAL JOIN test1.v27 tab2;
-SHOW CREATE VIEW test1.v28;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
+CREATE VIEW test1.v27 AS SELECT f1, f2
+FROM test3.t1 tab1 NATURAL JOIN test1.v26 tab2;
+SHOW CREATE VIEW test1.v27;
View Create View character_set_client collation_connection
-v28 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v28` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1`
join `test1`.`v27` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
+v27 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v27` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1`
join `test1`.`v26` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v28;
+CAST(f2 AS CHAR) AS f2 FROM test1.v27;
f1 f2
5 five
@@ -10461,32 +10458,31 @@ differs on some platforms
FIXME Is this a bug ?
--------------------------------------------------------------------------------
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v28;
-DROP VIEW IF EXISTS test1.v28;
+CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+DROP VIEW IF EXISTS test1.v27;
CREATE OR REPLACE VIEW test1.v0 AS
SELECT f1 as f2, f2 as f1 FROM test2.t1;
CREATE OR REPLACE VIEW test2.v0 AS
SELECT CAST('0001-01-01' AS DATE) as f1, f2 FROM test3.t1;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
CREATE OR REPLACE VIEW test3.v0 AS
SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2
FROM test1.t1;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
CREATE OR REPLACE VIEW test3.v0 AS
SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2
FROM test1.t1;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
-DROP VIEW IF EXISTS test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
DROP VIEW IF EXISTS test1.v26;
DROP VIEW IF EXISTS test1.v25;
DROP VIEW IF EXISTS test1.v24;
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_views.result
b/mysql-test/suite/funcs_1/r/memory_views.result
--- a/mysql-test/suite/funcs_1/r/memory_views.result 2007-10-05 20:06:35 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_views.result 2007-10-08 15:59:07 +02:00
@@ -10324,14 +10324,13 @@ ERROR HY000: View 'test3.v32' references
EXPLAIN SELECT * FROM test3.v32;
ERROR HY000: View 'test3.v32' references invalid table(s) or column(s) or function(s) or
definer/invoker of view lack rights to use them
-FIXME - Setting join_limit to 28 - hangs for higher values
+FIXME - Setting join_limit to 27 - hangs for higher values
----------------------------------------------------------
-SET @join_limit = 28;
+SET @join_limit = 27;
SET @max_level = @join_limit - 1;
DROP DATABASE IF EXISTS test3;
DROP TABLE IF EXISTS test1.t1;
DROP TABLE IF EXISTS test2.t1;
-DROP VIEW IF EXISTS test1.v27;
DROP VIEW IF EXISTS test1.v26;
DROP VIEW IF EXISTS test1.v25;
DROP VIEW IF EXISTS test1.v24;
@@ -10435,13 +10434,11 @@ CREATE OR REPLACE VIEW test1.v25 AS SELE
FROM test2.t1 tab1 NATURAL JOIN test1.v24 tab2;
CREATE OR REPLACE VIEW test1.v26 AS SELECT f1, f2
FROM test3.t1 tab1 NATURAL JOIN test1.v25 tab2;
-CREATE OR REPLACE VIEW test1.v27 AS SELECT f1, f2
-FROM test1.t1 tab1 NATURAL JOIN test1.v26 tab2;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
View Create View character_set_client collation_connection
-v27 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v27` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test1`.`t1` `tab1`
join `test1`.`v26` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
+v26 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v26` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1`
join `test1`.`v25` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
f1 f2
5 five
@@ -10450,14 +10447,14 @@ differs on some platforms
FIXME Is this a bug ?
--------------------------------------------------------------------------------
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
-CREATE VIEW test1.v28 AS SELECT f1, f2
-FROM test3.t1 tab1 NATURAL JOIN test1.v27 tab2;
-SHOW CREATE VIEW test1.v28;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
+CREATE VIEW test1.v27 AS SELECT f1, f2
+FROM test3.t1 tab1 NATURAL JOIN test1.v26 tab2;
+SHOW CREATE VIEW test1.v27;
View Create View character_set_client collation_connection
-v28 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v28` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1`
join `test1`.`v27` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
+v27 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v27` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1`
join `test1`.`v26` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v28;
+CAST(f2 AS CHAR) AS f2 FROM test1.v27;
f1 f2
5 five
@@ -10466,32 +10463,31 @@ differs on some platforms
FIXME Is this a bug ?
--------------------------------------------------------------------------------
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v28;
-DROP VIEW IF EXISTS test1.v28;
+CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+DROP VIEW IF EXISTS test1.v27;
CREATE OR REPLACE VIEW test1.v0 AS
SELECT f1 as f2, f2 as f1 FROM test2.t1;
CREATE OR REPLACE VIEW test2.v0 AS
SELECT CAST('0001-01-01' AS DATE) as f1, f2 FROM test3.t1;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
CREATE OR REPLACE VIEW test3.v0 AS
SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2
FROM test1.t1;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
CREATE OR REPLACE VIEW test3.v0 AS
SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2
FROM test1.t1;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
-DROP VIEW IF EXISTS test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
DROP VIEW IF EXISTS test1.v26;
DROP VIEW IF EXISTS test1.v25;
DROP VIEW IF EXISTS test1.v24;
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_views.result
b/mysql-test/suite/funcs_1/r/myisam_views.result
--- a/mysql-test/suite/funcs_1/r/myisam_views.result 2007-10-05 20:06:35 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result 2007-10-08 15:59:07 +02:00
@@ -10341,14 +10341,13 @@ ERROR HY000: View 'test3.v32' references
EXPLAIN SELECT * FROM test3.v32;
ERROR HY000: View 'test3.v32' references invalid table(s) or column(s) or function(s) or
definer/invoker of view lack rights to use them
-FIXME - Setting join_limit to 28 - hangs for higher values
+FIXME - Setting join_limit to 27 - hangs for higher values
----------------------------------------------------------
-SET @join_limit = 28;
+SET @join_limit = 27;
SET @max_level = @join_limit - 1;
DROP DATABASE IF EXISTS test3;
DROP TABLE IF EXISTS test1.t1;
DROP TABLE IF EXISTS test2.t1;
-DROP VIEW IF EXISTS test1.v27;
DROP VIEW IF EXISTS test1.v26;
DROP VIEW IF EXISTS test1.v25;
DROP VIEW IF EXISTS test1.v24;
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_views.result
b/mysql-test/suite/funcs_1/r/ndb_views.result
--- a/mysql-test/suite/funcs_1/r/ndb_views.result 2007-10-05 20:06:35 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_views.result 2007-10-08 15:59:07 +02:00
@@ -10319,14 +10319,13 @@ ERROR HY000: View 'test3.v32' references
EXPLAIN SELECT * FROM test3.v32;
ERROR HY000: View 'test3.v32' references invalid table(s) or column(s) or function(s) or
definer/invoker of view lack rights to use them
-FIXME - Setting join_limit to 28 - hangs for higher values
+FIXME - Setting join_limit to 27 - hangs for higher values
----------------------------------------------------------
-SET @join_limit = 28;
+SET @join_limit = 27;
SET @max_level = @join_limit - 1;
DROP DATABASE IF EXISTS test3;
DROP TABLE IF EXISTS test1.t1;
DROP TABLE IF EXISTS test2.t1;
-DROP VIEW IF EXISTS test1.v27;
DROP VIEW IF EXISTS test1.v26;
DROP VIEW IF EXISTS test1.v25;
DROP VIEW IF EXISTS test1.v24;
@@ -10430,13 +10429,11 @@ CREATE OR REPLACE VIEW test1.v25 AS SELE
FROM test2.t1 tab1 NATURAL JOIN test1.v24 tab2;
CREATE OR REPLACE VIEW test1.v26 AS SELECT f1, f2
FROM test3.t1 tab1 NATURAL JOIN test1.v25 tab2;
-CREATE OR REPLACE VIEW test1.v27 AS SELECT f1, f2
-FROM test1.t1 tab1 NATURAL JOIN test1.v26 tab2;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
View Create View character_set_client collation_connection
-v27 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v27` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test1`.`t1` `tab1`
join `test1`.`v26` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
+v26 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v26` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1`
join `test1`.`v25` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
f1 f2
5 five
@@ -10445,47 +10442,47 @@ differs on some platforms
FIXME Is this a bug ?
--------------------------------------------------------------------------------
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
-CREATE VIEW test1.v28 AS SELECT f1, f2
-FROM test3.t1 tab1 NATURAL JOIN test1.v27 tab2;
-SHOW CREATE VIEW test1.v28;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
+CREATE VIEW test1.v27 AS SELECT f1, f2
+FROM test3.t1 tab1 NATURAL JOIN test1.v26 tab2;
+SHOW CREATE VIEW test1.v27;
View Create View character_set_client collation_connection
-v28 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v28` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1`
join `test1`.`v27` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
+v27 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW
`test1`.`v27` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1`
join `test1`.`v26` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` =
`tab2`.`f2`)))) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v28;
-ERROR HY000: Got temporary error 4006 'Connect failure - out of connection objects
(increase MaxNoOfConcurrentTransactions)' from NDBCLUSTER
+CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+f1 f2
+5 five
The output of following EXPLAIN is deactivated, because the result
differs on some platforms
FIXME Is this a bug ?
--------------------------------------------------------------------------------
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v28;
-DROP VIEW IF EXISTS test1.v28;
+CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+DROP VIEW IF EXISTS test1.v27;
CREATE OR REPLACE VIEW test1.v0 AS
SELECT f1 as f2, f2 as f1 FROM test2.t1;
CREATE OR REPLACE VIEW test2.v0 AS
SELECT CAST('0001-01-01' AS DATE) as f1, f2 FROM test3.t1;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
CREATE OR REPLACE VIEW test3.v0 AS
SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2
FROM test1.t1;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
CREATE OR REPLACE VIEW test3.v0 AS
SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2
FROM test1.t1;
-SHOW CREATE VIEW test1.v27;
+SHOW CREATE VIEW test1.v26;
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
-CAST(f2 AS CHAR) AS f2 FROM test1.v27;
-DROP VIEW IF EXISTS test1.v27;
+CAST(f2 AS CHAR) AS f2 FROM test1.v26;
DROP VIEW IF EXISTS test1.v26;
DROP VIEW IF EXISTS test1.v25;
DROP VIEW IF EXISTS test1.v24;
@@ -11090,7 +11087,7 @@ f1 f2 f4 report
ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(8);
Warnings:
Warning 1265 Data truncated for column 'f4' at row 2
-Warning 1265 Data truncated for column 'f4' at row 5
+Warning 1265 Data truncated for column 'f4' at row 4
INSERT INTO t1 SET f1 = 3, f4 = '<-- 10 -->', report = 't1 3';
Warnings:
Warning 1265 Data truncated for column 'f4' at row 1
diff -Nrup a/mysql-test/suite/funcs_1/views/views_master.inc
b/mysql-test/suite/funcs_1/views/views_master.inc
--- a/mysql-test/suite/funcs_1/views/views_master.inc 2007-10-05 20:06:35 +02:00
+++ b/mysql-test/suite/funcs_1/views/views_master.inc 2007-10-08 15:59:07 +02:00
@@ -2902,14 +2902,14 @@ eval EXPLAIN SELECT * FROM test3.v$tople
# and OBN's box performs excessive paging.
# (RAM: OBN ~384MB RAM, mleich 1 GB)
#++++++++++++++++++++++++++++++++++++++++++++++
-let $message= FIXME - Setting join_limit to 28 - hangs for higher values;
+let $message= FIXME - Setting join_limit to 27 - hangs for higher values;
--source include/show_msg.inc
# OBN - Reduced from 30 in 5.1.21 to avoid hitting the ndbcluster limit
# of "ERROR HY000: Got temporary error 4006 'Connect failure
# - out of connection objects (increase MaxNoOfConcurrentTransactions)'
# from NDBCLUSTER " to early;
#SET @join_limit = 61;
-SET @join_limit = 28; # OBN - see above
+SET @join_limit = 27; # OBN - see above
SET @max_level = @join_limit - 1;
--enable_query_log
| Thread |
|---|
| • bk commit into 5.2 tree (mleich:1.2605) BUG#31237 | mleich | 8 Oct |