1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Fix a bad BitKeeper dependency structure for the "funcs_1" suite:

Step 2:
Restore the 5.1 contents in the 5.0-dependent files.


mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_views.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_views.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_views.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/views/func_view.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/views/views_master.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
This commit is contained in:
unknown
2007-07-27 15:41:27 +02:00
parent 072db2f2e4
commit 39f3cda7c7
51 changed files with 12413 additions and 6985 deletions

View File

@ -1926,7 +1926,7 @@ f1 f2
2 two
4 four
INSERT INTO v1 VALUES(2,'two');
ERROR 23000: Duplicate entry '2' for key 1
ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
INSERT INTO v1 VALUES(3,'three');
affected rows: 1
INSERT INTO v1 VALUES(6,'six');
@ -1945,7 +1945,7 @@ f1 f2
3 three
4 four
UPDATE v1 SET f1 = 2 WHERE f1 = 3;
ERROR 23000: Duplicate entry '2' for key 1
ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
affected rows: 1
info: Rows matched: 1 Changed: 1 Warnings: 0
@ -1992,12 +1992,12 @@ DROP VIEW IF EXISTS test.v1;
CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
ENGINE = innodb;
INSERT INTO t1 VALUES ('A', 1);
SELECT * FROM t1;
SELECT * FROM t1 order by f1, f2;
f1 f2
A 1
CREATE VIEW v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
WITH CASCADED CHECK OPTION ;
SELECT * FROM v1;
SELECT * FROM v1 order by f1, f2;
f1 f2
A 1
UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@ -2005,7 +2005,7 @@ affected rows: 1
info: Rows matched: 1 Changed: 1 Warnings: 0
INSERT INTO v1 VALUES('B',2);
affected rows: 1
SELECT * FROM v1;
SELECT * FROM v1 order by f1, f2;
f1 f2
A 2
B 2
@ -2013,7 +2013,7 @@ UPDATE v1 SET f2 = 4;
ERROR HY000: CHECK OPTION failed 'test.v1'
INSERT INTO v1 VALUES('B',3);
ERROR HY000: CHECK OPTION failed 'test.v1'
SELECT * FROM v1;
SELECT * FROM v1 order by f1, f2;
f1 f2
A 2
B 2
@ -10580,7 +10580,7 @@ f1 f2 f3 f4
DELETE FROM t1;
INSERT INTO v1 SET f2 = 'ABC';
INSERT INTO v1 SET f2 = 'ABC';
ERROR 23000: Duplicate entry '0' for key 1
ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
SELECT * from t1;
f1 f2 f3 f4
0 ABC NULL NULL
@ -10649,7 +10649,7 @@ DROP VIEW v1;
CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
INSERT INTO v1 SET f2 = 'ABC';
INSERT INTO v1 SET f2 = 'ABC';
ERROR 23000: Duplicate entry '0' for key 1
ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
SELECT * from t1;
f1 f2 f3 f4
0 ABC NULL NULL
@ -10984,11 +10984,11 @@ f1 bigint(20) YES NULL
f2 date YES NULL
f4 char(5) YES NULL
report char(10) YES NULL
SELECT * FROM t1;
SELECT * FROM t1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
SELECT * FROM v1;
SELECT * FROM v1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
@ -11008,12 +11008,12 @@ f4x char(5) YES NULL
report char(10) YES NULL
DESCRIBE v1;
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
SELECT * FROM t1;
SELECT * FROM t1 order by f1, report;
f1 f2 f4x report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
0 NULL ABC t1 1
SELECT * FROM v1;
SELECT * FROM v1 order by f1, report;
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(10);
@ -11031,14 +11031,14 @@ f1 bigint(20) YES NULL
f2 date YES NULL
f4 char(10) YES NULL
report char(10) YES NULL
SELECT * FROM t1;
SELECT * FROM t1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
0 NULL ABC t1 1
2 NULL <-- 10 --> t1 2
2 NULL <-- 10 --> v1 2
SELECT * FROM v1;
SELECT * FROM v1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
@ -11067,7 +11067,7 @@ f1 bigint(20) YES NULL
f2 date YES NULL
f4 char(8) YES NULL
report char(10) YES NULL
SELECT * FROM t1;
SELECT * FROM t1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
@ -11076,7 +11076,7 @@ f1 f2 f4 report
2 NULL <-- 10 - v1 2
3 NULL <-- 10 - t1 3
3 NULL <-- 10 - v1 3
SELECT * FROM v1;
SELECT * FROM v1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
@ -11100,7 +11100,7 @@ f1 bigint(20) YES NULL
f2 date YES NULL
f4 varchar(20) YES NULL
report char(10) YES NULL
SELECT * FROM t1;
SELECT * FROM t1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
@ -11111,7 +11111,7 @@ f1 f2 f4 report
3 NULL <-- 10 - v1 3
4 NULL <------ 20 --------> t1 4
4 NULL <------ 20 --------> v1 4
SELECT * FROM v1;
SELECT * FROM v1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
@ -11139,7 +11139,7 @@ f1 varchar(30) YES NULL
f2 date YES NULL
f4 varchar(20) YES NULL
report char(10) YES NULL
SELECT * FROM t1;
SELECT * FROM t1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
@ -11152,7 +11152,7 @@ f1 f2 f4 report
4 NULL <------ 20 --------> v1 4
<------------- 30 -----------> NULL <------ 20 --------> t1 5
<------------- 30 -----------> NULL <------ 20 --------> v1 5
SELECT * FROM v1;
SELECT * FROM v1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
@ -11176,7 +11176,7 @@ f4 varchar(20) YES NULL
report char(10) YES NULL
DESCRIBE v1;
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
SELECT * FROM t1;
SELECT * FROM t1 order by f1, report;
f1 f4 report
-1 ABC t1 0
-1 ABC v1 0
@ -11190,7 +11190,7 @@ f1 f4 report
<------------- 30 -----------> <------ 20 --------> t1 5
<------------- 30 -----------> <------ 20 --------> v1 5
ABC <------ 20 --------> t1 6
SELECT * FROM v1;
SELECT * FROM v1 order by f1, report;
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
INSERT INTO t1 SET f1 = 'ABC', f2 = '1500-12-04',
@ -11209,7 +11209,7 @@ f1 varchar(30) YES NULL
f2 date YES NULL
f4 varchar(20) YES NULL
report char(10) YES NULL
SELECT * FROM t1;
SELECT * FROM t1 order by f1, report;
f1 f4 report f2
-1 ABC t1 0 NULL
-1 ABC v1 0 NULL
@ -11225,7 +11225,7 @@ f1 f4 report f2
ABC <------ 20 --------> t1 6 NULL
ABC <------ 20 --------> t1 7 1500-12-04
ABC <------ 20 --------> v1 7 1500-12-04
SELECT * FROM v1;
SELECT * FROM v1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
@ -11259,7 +11259,7 @@ f1 varchar(30) YES NULL
f2 float YES NULL
f4 varchar(20) YES NULL
report char(10) YES NULL
SELECT * FROM t1;
SELECT * FROM t1 order by f1, report;
f1 f4 report f2
-1 ABC t1 0 NULL
-1 ABC v1 0 NULL
@ -11274,10 +11274,10 @@ f1 f4 report f2
<------------- 30 -----------> <------ 20 --------> v1 5 NULL
ABC <------ 20 --------> t1 6 NULL
ABC <------ 20 --------> t1 7 NULL
ABC <------ 20 --------> v1 7 NULL
ABC <------ 20 --------> t1 8 -0.00033
ABC <------ 20 --------> v1 7 NULL
ABC <------ 20 --------> v1 8 -0.00033
SELECT * FROM v1;
SELECT * FROM v1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
@ -11292,8 +11292,8 @@ f1 f2 f4 report
<------------- 30 -----------> NULL <------ 20 --------> v1 5
ABC NULL <------ 20 --------> t1 6
ABC NULL <------ 20 --------> t1 7
ABC NULL <------ 20 --------> v1 7
ABC -0.00033 <------ 20 --------> t1 8
ABC NULL <------ 20 --------> v1 7
ABC -0.00033 <------ 20 --------> v1 8
ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
@ -11316,7 +11316,7 @@ f1 varchar(30) YES NULL
f2 float YES NULL
f4 varchar(20) YES NULL
report char(10) YES NULL
SELECT * FROM t1;
SELECT * FROM t1 order by f1, report;
f1 f4 report f2 f3
-1 ABC t1 0 NULL NULL
-1 ABC v1 0 NULL NULL
@ -11331,12 +11331,12 @@ f1 f4 report f2 f3
<------------- 30 -----------> <------ 20 --------> v1 5 NULL NULL
ABC <------ 20 --------> t1 6 NULL NULL
ABC <------ 20 --------> t1 7 NULL NULL
ABC <------ 20 --------> v1 7 NULL NULL
ABC <------ 20 --------> t1 8 -0.00033 NULL
ABC <------ 20 --------> v1 8 -0.00033 NULL
ABC <------ 20 --------> t1 9 -0.00033 -2.20
ABC <------ 20 --------> v1 7 NULL NULL
ABC <------ 20 --------> v1 8 -0.00033 NULL
ABC <------ 20 --------> v1 9a -0.00033 NULL
SELECT * FROM v1;
SELECT * FROM v1 order by f1, report;
f1 f2 f4 report
-1 NULL ABC t1 0
-1 NULL ABC v1 0
@ -11351,10 +11351,10 @@ f1 f2 f4 report
<------------- 30 -----------> NULL <------ 20 --------> v1 5
ABC NULL <------ 20 --------> t1 6
ABC NULL <------ 20 --------> t1 7
ABC NULL <------ 20 --------> v1 7
ABC -0.00033 <------ 20 --------> t1 8
ABC -0.00033 <------ 20 --------> v1 8
ABC -0.00033 <------ 20 --------> t1 9
ABC NULL <------ 20 --------> v1 7
ABC -0.00033 <------ 20 --------> v1 8
ABC -0.00033 <------ 20 --------> v1 9a
DROP TABLE t1;
DROP VIEW v1;
@ -11369,10 +11369,10 @@ DESCRIBE v1;
Field Type Null Key Default Extra
f1 char(10) YES NULL
my_sqrt double YES NULL
SELECT * FROM t1;
SELECT * FROM t1 order by f1, f2;
f1 f2
ABC 3
SELECT * FROM v1;
SELECT * FROM v1 order by 2;
f1 my_sqrt
ABC 1.7320508075689
ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
@ -11385,21 +11385,21 @@ DESCRIBE v1;
Field Type Null Key Default Extra
f1 char(10) YES NULL
my_sqrt double YES NULL
SELECT * FROM t1;
SELECT * FROM t1 order by f1, f2;
f1 f2
ABC 3
ABC DEF
SELECT * FROM v1;
SELECT * FROM v1 order by 2;
f1 my_sqrt
ABC 1.7320508075689
ABC 0
ABC 1.7320508075689
SELECT SQRT('DEF');
SQRT('DEF')
0
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'DEF'
CREATE VIEW v2 AS SELECT SQRT('DEF');
SELECT * FROM v2;
SELECT * FROM v2 order by 1;
SQRT('DEF')
0
Warnings:
@ -11409,27 +11409,27 @@ DESCRIBE v2;
Field Type Null Key Default Extra
f1 char(10) YES NULL
my_sqrt double YES NULL
SELECT * FROM v2;
SELECT * FROM v2 order by 2;
f1 my_sqrt
ABC 0
ABC 1.7320508075689
ABC 0
CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
SELECT * FROM t2;
SELECT * FROM t2 order by 2;
f1 my_sqrt
ABC 1.73205080756888
ABC 0
ABC 1.73205080756888
DROP TABLE t2;
CREATE TABLE t2 AS SELECT * FROM v1;
SELECT * FROM t2;
SELECT * FROM t2 order by 2;
f1 my_sqrt
ABC 1.73205080756888
ABC 0
ABC 1.73205080756888
DROP TABLE t2;
CREATE TABLE t2 AS SELECT * FROM v2;
SELECT * FROM t2;
SELECT * FROM t2 order by 2;
f1 my_sqrt
ABC 1.73205080756888
ABC 0
ABC 1.73205080756888
DROP TABLE t1;
DROP TABLE t2;
DROP VIEW v1;