Below is the list of changes that have just been committed into a local
5.1 repository of omer. When omer 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-05-02 12:30:35-07:00, omer@stripped +19 -0
Merge linux.site:/home/omer/source/bld50_tmp
into linux.site:/home/omer/source/bld51_2
MERGE: 1.1810.2893.3
BitKeeper/deleted/.del-a_version_check.result@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.1
BitKeeper/deleted/.del-a_version_check.test@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.1
BitKeeper/deleted/.del-datadict_load.inc@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-datadict_load.inc@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/datadict/datadict_load.inc -> BitKeeper/deleted/.del-datadict_load.inc
BitKeeper/deleted/.del-datadict_master.inc@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.3
BitKeeper/deleted/.del-datadict_master.inc@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/datadict/datadict_master.inc -> BitKeeper/deleted/.del-datadict_master.inc
BitKeeper/deleted/.del-datadict_show_schema.inc@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-datadict_show_schema.inc@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc -> BitKeeper/deleted/.del-datadict_show_schema.inc
BitKeeper/deleted/.del-disabled.def~1@stripped, 2007-05-02 12:27:03-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-disabled.def~1@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/t/disabled.def -> BitKeeper/deleted/.del-disabled.def~1
BitKeeper/deleted/.del-innodb__datadict.result@stripped, 2007-05-02 12:27:03-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-innodb__datadict.result@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/innodb__datadict.result -> BitKeeper/deleted/.del-innodb__datadict.result
BitKeeper/deleted/.del-innodb_func_view.result@stripped, 2007-05-02 12:30:29-07:00, omer@stripped +1179 -1173
manual merge - using local file
MERGE: 1.1.1.2
BitKeeper/deleted/.del-innodb_func_view.result@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/innodb_func_view.result -> BitKeeper/deleted/.del-innodb_func_view.result
BitKeeper/deleted/.del-innodb_trig_08.result@stripped, 2007-05-02 12:27:03-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-innodb_trig_08.result@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/innodb_trig_08.result -> BitKeeper/deleted/.del-innodb_trig_08.result
BitKeeper/deleted/.del-innodb_views.result@stripped, 2007-05-02 12:27:03-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-innodb_views.result@stripped, 2007-05-02 12:27:01-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/innodb_views.result -> BitKeeper/deleted/.del-innodb_views.result
BitKeeper/deleted/.del-memory__datadict.result@stripped, 2007-05-02 12:27:03-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-memory__datadict.result@stripped, 2007-05-02 12:27:01-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/memory__datadict.result -> BitKeeper/deleted/.del-memory__datadict.result
BitKeeper/deleted/.del-memory_func_view.result@stripped, 2007-05-02 12:30:29-07:00, omer@stripped +1179 -1173
manual merge - using local file
MERGE: 1.1.1.2
BitKeeper/deleted/.del-memory_func_view.result@stripped, 2007-05-02 12:27:01-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/memory_func_view.result -> BitKeeper/deleted/.del-memory_func_view.result
BitKeeper/deleted/.del-memory_trig_08.result@stripped, 2007-05-02 12:27:04-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-memory_trig_08.result@stripped, 2007-05-02 12:27:01-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/memory_trig_08.result -> BitKeeper/deleted/.del-memory_trig_08.result
BitKeeper/deleted/.del-memory_views.result@stripped, 2007-05-02 12:27:04-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-memory_views.result@stripped, 2007-05-02 12:27:01-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/memory_views.result -> BitKeeper/deleted/.del-memory_views.result
BitKeeper/deleted/.del-myisam__datadict.result@stripped, 2007-05-02 12:27:04-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-myisam__datadict.result@stripped, 2007-05-02 12:27:01-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/myisam__datadict.result -> BitKeeper/deleted/.del-myisam__datadict.result
BitKeeper/deleted/.del-myisam_func_view.result@stripped, 2007-05-02 12:30:29-07:00, omer@stripped +1179 -1173
manual merge - using local file
MERGE: 1.1.1.2
BitKeeper/deleted/.del-myisam_func_view.result@stripped, 2007-05-02 12:27:01-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/myisam_func_view.result -> BitKeeper/deleted/.del-myisam_func_view.result
BitKeeper/deleted/.del-myisam_trig_08.result@stripped, 2007-05-02 12:27:05-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-myisam_trig_08.result@stripped, 2007-05-02 12:27:01-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/myisam_trig_08.result -> BitKeeper/deleted/.del-myisam_trig_08.result
BitKeeper/deleted/.del-myisam_views.result@stripped, 2007-05-02 12:30:30-07:00, omer@stripped +8158 -8162
manual merge - using local file
MERGE: 1.1.1.2
BitKeeper/deleted/.del-myisam_views.result@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/r/myisam_views.result -> BitKeeper/deleted/.del-myisam_views.result
BitKeeper/deleted/.del-views_master.inc@stripped, 2007-05-02 12:27:05-07:00, omer@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
BitKeeper/deleted/.del-views_master.inc@stripped, 2007-05-02 12:27:02-07:00, omer@stripped +0 -0
Merge rename: mysql-test/suite/funcs_1/views/views_master.inc -> BitKeeper/deleted/.del-views_master.inc
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: omer
# Host: linux.site
# Root: /home/omer/source/bld51_2/RESYNC
--- 1.1.1.1/mysql-test/suite/funcs_1/r/innodb_func_view.result 2007-05-02 12:30:51 -07:00
+++ 1.3/BitKeeper/deleted/.del-innodb_func_view.result 2007-05-02 12:30:51 -07:00
@@ -3814,11 +3814,13 @@
NULL NULL 1
0000-00-00 00:00:00 -838:59:59 2
0000-00-00 00:00:00 838:59:59 3
-0000-00-00 13:00:00 13:00:00 4
-0000-00-00 10:00:00 10:00:00 5
+0000-00-00 00:00:00 13:00:00 4
+0000-00-00 00:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:00:00'
SHOW CREATE VIEW v1;
View Create View
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -3829,11 +3831,13 @@
NULL NULL 1
0000-00-00 00:00:00 -838:59:59 2
0000-00-00 00:00:00 838:59:59 3
-0000-00-00 13:00:00 13:00:00 4
-0000-00-00 10:00:00 10:00:00 5
+0000-00-00 00:00:00 13:00:00 4
+0000-00-00 00:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:00:00'
DROP VIEW v1;
--- 1.1.1.1/mysql-test/suite/funcs_1/r/memory_func_view.result 2007-05-02 12:30:51 -07:00
+++ 1.3/BitKeeper/deleted/.del-memory_func_view.result 2007-05-02 12:30:51 -07:00
@@ -3814,11 +3814,13 @@
NULL NULL 1
0000-00-00 00:00:00 -838:59:59 2
0000-00-00 00:00:00 838:59:59 3
-0000-00-00 13:00:00 13:00:00 4
-0000-00-00 10:00:00 10:00:00 5
+0000-00-00 00:00:00 13:00:00 4
+0000-00-00 00:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:00:00'
SHOW CREATE VIEW v1;
View Create View
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -3829,11 +3831,13 @@
NULL NULL 1
0000-00-00 00:00:00 -838:59:59 2
0000-00-00 00:00:00 838:59:59 3
-0000-00-00 13:00:00 13:00:00 4
-0000-00-00 10:00:00 10:00:00 5
+0000-00-00 00:00:00 13:00:00 4
+0000-00-00 00:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:00:00'
DROP VIEW v1;
--- 1.1.1.1/mysql-test/suite/funcs_1/r/myisam_func_view.result 2007-05-02 12:30:51 -07:00
+++ 1.3/BitKeeper/deleted/.del-myisam_func_view.result 2007-05-02 12:30:51 -07:00
@@ -3814,11 +3814,13 @@
NULL NULL 1
0000-00-00 00:00:00 -838:59:59 2
0000-00-00 00:00:00 838:59:59 3
-0000-00-00 13:00:00 13:00:00 4
-0000-00-00 10:00:00 10:00:00 5
+0000-00-00 00:00:00 13:00:00 4
+0000-00-00 00:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:00:00'
SHOW CREATE VIEW v1;
View Create View
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -3829,11 +3831,13 @@
NULL NULL 1
0000-00-00 00:00:00 -838:59:59 2
0000-00-00 00:00:00 838:59:59 3
-0000-00-00 13:00:00 13:00:00 4
-0000-00-00 10:00:00 10:00:00 5
+0000-00-00 00:00:00 13:00:00 4
+0000-00-00 00:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
Warning 1292 Truncated incorrect datetime value: '0000-00-00 838:59:59'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 13:00:00'
+Warning 1292 Truncated incorrect datetime value: '0000-00-00 10:00:00'
DROP VIEW v1;
--- 1.1.1.1/mysql-test/suite/funcs_1/r/myisam_views.result 2007-05-02 12:30:51 -07:00
+++ 1.3/BitKeeper/deleted/.del-myisam_views.result 2007-05-02 12:30:51 -07:00
@@ -470,8 +470,7 @@
CREATE or REPLACE VIEW v1 AS Select 1 INTO @x;
ERROR HY000: View's SELECT contains a 'INTO' clause
Select @x;
-@x
-0
+ERROR HY000: View's SELECT contains a variable or parameter
CREATE or REPLACE VIEW v1 AS Select 1
FROM (SELECT 1 FROM t1) my_table;
ERROR HY000: View's SELECT contains a subquery in the FROM clause
@@ -608,9 +607,7 @@
CREATE or REPLACE view v1 as Select f59, f60
from tb2 by group f59 ;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by group f59' at line 2
-
-Testcase 3.3.1.5
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
DROP VIEW IF EXISTS v1 ;
CREATE VIEW v1 SELECT * FROM tb2 limit 100 ;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT * FROM tb2 limit 100' at line 1
@@ -630,9 +627,7 @@
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1' at line 1
CREATE VIEW v1 AS ;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
-
-Testcase 3.3.1.6
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
DROP VIEW IF EXISTS v1 ;
CREATE or REPLACE VIEW v1
as SELECT * from tb2 limit 100 ;
@@ -1817,9 +1812,7 @@
SELECT * FROM test.v1 ;
ERROR 42S02: Table 'test.v1' doesn't exist
Drop view if exists test.v1 ;
-
-Testcase 3.3.1.40
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
Drop view if exists test.v1 ;
Set @var1 = 'ABC' ;
Set @var2 = 'XYZ' ;
@@ -1828,9 +1821,7 @@
CREATE VIEW test.v1 AS SELECT @@global.sort_buffer_size;
ERROR HY000: View's SELECT contains a variable or parameter
Drop view if exists test.v1 ;
-
-Testcase 3.3.1.41
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
Drop view if exists test.v1 ;
Drop procedure if exists sp1 ;
Create procedure sp1() DETERMINISTIC
@@ -1847,9 +1838,7 @@
Note 1051 Unknown table 'test.v1'
Drop procedure sp1 ;
ERROR 42000: PROCEDURE test.sp1 does not exist
-
-Testcase 3.3.1.42
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
Drop VIEW if exists test.v1 ;
CREATE TEMPORARY VIEW test.v1 AS
SELECT * FROM test.tb2 limit 2 ;
@@ -1861,9 +1850,7 @@
SELECT * FROM test.tb2 limit 2' at line 1
Drop view if exists test.v1 ;
Use test;
-
-Testcase 3.3.1.43
---------------------------------------------------------------------------------
+ERROR HY000: View's SELECT contains a variable or parameter
Drop view if exists test.v1 ;
CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2;
INSERT INTO test.v1 values(122,432);
| Thread |
|---|
| • bk commit into 5.1 tree (omer:1.2510) | omer | 2 May |
