List:Commits« Previous MessageNext Message »
From:horst Date:December 19 2007 11:15am
Subject:bk commit into 5.1 tree (hhunger:1.2622)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of hhunger. When hhunger 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-12-19 12:15:13+01:00, hhunger@stripped +6 -0
  Inserted results of review to WL#4084.

  BitKeeper/etc/ignore@stripped, 2007-12-19 12:15:10+01:00, hhunger@stripped +11 -0
    Added mysql-test/home/mleich/to_horst/datadict_master.inc mysql-test/home/mleich/to_horst/func_view.inc mysql-test/home/mleich/to_horst/storedproc_10.inc mysql-test/home/mleich/to_horst/triggers_03.inc mysql-test/home/mleich/to_horst/triggers_08.inc mysql-test/home/mleich/to_horst/triggers_1011ext.inc mysql-test/home/mleich/to_horst/triggers_master.test mysql-test/home/mleich/to_horst/views_master.inc mysql-test/suite/funcs_1-5.1.tar.gz mysql-test/suite/funcs_1.txt mysql-test/suite/my_archive.tar to the ignore list

  mysql-test/suite/funcs_1/r/innodb_views.result@stripped, 2007-12-19 12:15:09+01:00, hhunger@stripped +3 -3
    Inserted results of review to WL#4084.

  mysql-test/suite/funcs_1/r/memory_views.result@stripped, 2007-12-19 12:15:09+01:00, hhunger@stripped +3 -3
    Inserted results of review to WL#4084.

  mysql-test/suite/funcs_1/r/myisam_views.result@stripped, 2007-12-19 12:15:10+01:00, hhunger@stripped +7743 -7745
    Inserted results of review to WL#4084.

  mysql-test/suite/funcs_1/r/ndb_views.result@stripped, 2007-12-19 12:15:10+01:00, hhunger@stripped +3 -3
    Inserted results of review to WL#4084.

  mysql-test/suite/funcs_1/views/views_master.inc@stripped, 2007-12-19 12:15:10+01:00, hhunger@stripped +9 -5
    Inserted results of review to WL#4084.

diff -Nrup a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
--- a/BitKeeper/etc/ignore	2007-11-27 17:40:14 +01:00
+++ b/BitKeeper/etc/ignore	2007-12-19 12:15:10 +01:00
@@ -3012,3 +3012,14 @@ win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
 mysql-test/funcs_1.log
+mysql-test/home/mleich/to_horst/datadict_master.inc
+mysql-test/home/mleich/to_horst/func_view.inc
+mysql-test/home/mleich/to_horst/storedproc_10.inc
+mysql-test/home/mleich/to_horst/triggers_03.inc
+mysql-test/home/mleich/to_horst/triggers_08.inc
+mysql-test/home/mleich/to_horst/triggers_1011ext.inc
+mysql-test/home/mleich/to_horst/triggers_master.test
+mysql-test/home/mleich/to_horst/views_master.inc
+mysql-test/suite/funcs_1-5.1.tar.gz
+mysql-test/suite/funcs_1.txt
+mysql-test/suite/my_archive.tar
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-11-28 17:56:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result	2007-12-19 12:15:09 +01:00
@@ -4281,7 +4281,7 @@ Drop view if exists test.v1 ;
 Testcase 3.3.1.22 
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
-CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3 LIMIT 2;
+CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3;
 SELECT * FROM test.v1;
 product
 1
@@ -21586,14 +21586,14 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2 FROM test1.t1;
+SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2 FROM test1.t1;
+SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
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-11-28 17:56:51 +01:00
+++ b/mysql-test/suite/funcs_1/r/memory_views.result	2007-12-19 12:15:09 +01:00
@@ -4285,7 +4285,7 @@ Drop view if exists test.v1 ;
 Testcase 3.3.1.22 
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
-CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3 LIMIT 2;
+CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3;
 SELECT * FROM test.v1;
 product
 1
@@ -21591,14 +21591,14 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2 FROM test1.t1;
+SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2 FROM test1.t1;
+SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
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-11-28 17:56:51 +01:00
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result	2007-12-19 12:15:10 +01:00
@@ -4750,7 +4750,7 @@ Drop view if exists test.v1 ;
 Testcase 3.3.1.22 
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
-CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3 LIMIT 2;
+CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3;
 SELECT * FROM test.v1;
 product
 1
@@ -23248,14 +23248,14 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v20;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v20;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2 FROM test1.t1;
+SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v20;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v20;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v20;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2 FROM test1.t1;
+SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v20;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v20;
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-11-28 17:56:51 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_views.result	2007-12-19 12:15:10 +01:00
@@ -4281,7 +4281,7 @@ Drop view if exists test.v1 ;
 Testcase 3.3.1.22 
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
-CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3 LIMIT 2;
+CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3;
 SELECT * FROM test.v1;
 product
 1
@@ -21585,14 +21585,14 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2 FROM test1.t1;
+SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2 FROM test1.t1;
+SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
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-11-28 17:56:51 +01:00
+++ b/mysql-test/suite/funcs_1/views/views_master.inc	2007-12-19 12:15:10 +01:00
@@ -1042,7 +1042,7 @@ let $message= Testcase 3.3.1.22 ;
 --disable_warnings
 DROP VIEW  IF EXISTS v1;
 --enable_warnings
-CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3 LIMIT 2;
+CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3;
 --sorted_result
 SELECT * FROM test.v1;
 CREATE OR REPLACE VIEW test.v1( product ) AS SELECT 1*2;
@@ -1597,7 +1597,7 @@ let $message= Testcase 3.3.1.41 ;
 ###############################################################################
 # Testcase 3.3.1.41: Ensure that a view definition within a stored procedure
 #                    definition cannot include references to any of the stored
-#                    procedure’s parameters.
+#                    procedures parameters.
 ###############################################################################
 --disable_warnings
 Drop view if exists test.v1 ;
@@ -2004,7 +2004,10 @@ let $message= Testcase 3.3.1.49A ;
 #       The annoying redundant
 #       eval INSERT INTO t1_results VALUES (@v3_to_v1_options,@statement,
 #                                           @v3_to_v1_violation,$mysql_errno);
-#       could not be put into a file to be sourced because of 
+#       could not be put into a file to be sourced because of the closed 
+#       Bug#10267 mysqltest, wrong number of loops when a script is sourced
+#                 within a loop
+# To be implemented later.
 
 USE test;
 --disable_warnings
@@ -3117,7 +3120,7 @@ eval EXPLAIN SELECT CAST(f1 AS SIGNED IN
                    CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;
 # 2.3.3 UCS2 string instead of common string
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2 FROM test1.t1;
+SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2 FROM test1.t1;
 eval SHOW CREATE VIEW test1.v$toplevel;
 eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
             CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;
@@ -3126,7 +3129,7 @@ eval EXPLAIN SELECT CAST(f1 AS SIGNED IN
 
 # 2.3.4 UCS2 string instead of numeric
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2 FROM test1.t1;
+SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2 FROM test1.t1;
 eval SHOW CREATE VIEW test1.v$toplevel;
 eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
             CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;
@@ -3882,6 +3885,7 @@ INSERT INTO v1 SET f1 = 0, f4x = 'ABC', 
 --error ER_VIEW_INVALID
 INSERT INTO v1 SET f1 = 0, report = 'v1 1b';
 DESCRIBE t1;
+# Bug#12533 crash on DESCRIBE <view> after renaming base table column;
 --error ER_VIEW_INVALID
 DESCRIBE v1;
 SELECT * FROM t1 order by f1, report;
Thread
• bk commit into 5.1 tree (hhunger:1.2622)horst19 Dec