mirror of
https://github.com/MariaDB/server.git
synced 2025-12-07 17:42:39 +03:00
ChangeSet@1.2561, 2008-03-07 17:44:03+01:00, mleich@five.local.lan +132 -0 Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 into five.local.lan:/work/merge/mysql-5.1-funcs_1 MERGE: 1.1810.3473.24 ChangeSet@1.1810.3473.24, 2008-03-07 WL#4203 Reorganize and fix the data dictionary tests of testsuite funcs_1 1. Adjustment of expected results to modified server properties 2. Add some tests of information_schema views 3. Minor corrections and improvements BitKeeper/deleted/.del-ndb__datadict.result: Delete: mysql-test/suite/funcs_1/r/ndb__datadict.result BitKeeper/deleted/.del-ndb__datadict.test: Delete: mysql-test/suite/funcs_1/t/ndb__datadict.test BitKeeper/deleted/.del-ndb__load.test: Delete: mysql-test/suite/funcs_1/t/ndb__load.test BitKeeper/deleted/.del-ndb__load.result: Delete: mysql-test/suite/funcs_1/r/ndb__load.result mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_03.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_03.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_03.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Change mode to -rw-rw-r-- mysql-test/suite/funcs_1/datadict/processlist_priv.inc: Make the results independend of amount of preceding tests. mysql-test/suite/funcs_1/datadict/processlist_val.inc: Correct the cleanup mysql-test/suite/funcs_1/r/charset_collation_1.result: Updated results mysql-test/suite/funcs_1/r/charset_collation_2.result: Updated results mysql-test/suite/funcs_1/r/innodb_func_view.result: Updated results mysql-test/suite/funcs_1/r/innodb_storedproc.result: Updated results mysql-test/suite/funcs_1/r/is_basics_mixed.result: Updated results mysql-test/suite/funcs_1/r/is_character_sets.result: Updated results mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result: Updated results mysql-test/suite/funcs_1/r/is_collations.result: Updated results mysql-test/suite/funcs_1/r/is_column_privileges.result: Updated results mysql-test/suite/funcs_1/r/is_columns.result: Updated results mysql-test/suite/funcs_1/r/is_columns_innodb.result: Updated results mysql-test/suite/funcs_1/r/is_columns_is.result: Updated results mysql-test/suite/funcs_1/r/is_columns_memory.result: Updated results mysql-test/suite/funcs_1/r/is_columns_myisam.result: Updated results mysql-test/suite/funcs_1/r/is_columns_mysql.result: Updated results mysql-test/suite/funcs_1/r/is_key_column_usage.result: Updated results mysql-test/suite/funcs_1/r/is_routines.result: Updated results mysql-test/suite/funcs_1/r/is_schema_privileges.result: Updated results mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result: Updated results mysql-test/suite/funcs_1/r/is_schemata.result: Updated results mysql-test/suite/funcs_1/r/is_statistics.result: Updated results mysql-test/suite/funcs_1/r/is_statistics_mysql.result: Updated results mysql-test/suite/funcs_1/r/is_table_constraints.result: Updated results mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result: Updated results mysql-test/suite/funcs_1/r/is_table_privileges.result: Updated results mysql-test/suite/funcs_1/r/is_tables.result: Updated results mysql-test/suite/funcs_1/r/is_tables_is.result: Updated results mysql-test/suite/funcs_1/r/is_tables_mysql.result: Updated results mysql-test/suite/funcs_1/r/is_tables_ndb.result: Updated results mysql-test/suite/funcs_1/r/is_triggers.result: Updated results mysql-test/suite/funcs_1/r/is_user_privileges.result: Updated results mysql-test/suite/funcs_1/r/is_views.result: Updated results mysql-test/suite/funcs_1/r/memory_func_view.result: Updated results mysql-test/suite/funcs_1/r/memory_storedproc.result: Updated results mysql-test/suite/funcs_1/r/myisam_func_view.result: Updated results mysql-test/suite/funcs_1/r/myisam_storedproc.result: Updated results mysql-test/suite/funcs_1/r/myisam_views.result: Updated results mysql-test/suite/funcs_1/r/ndb_func_view.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc_02.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc_03.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc_07.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc_08.result: Updated results mysql-test/suite/funcs_1/r/ndb_storedproc_10.result: Updated results mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result: Updated results mysql-test/suite/funcs_1/r/processlist_priv_ps.result: Updated results mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Updated results mysql-test/suite/funcs_1/r/processlist_val_ps.result: Updated results mysql-test/suite/funcs_1/storedproc/storedproc_master.inc: Set subtest checking a no more reserved keyword to comment. mysql-test/suite/funcs_1/t/disabled.def: ndb__datadict is dropped. The checks are done in other scripts. mysql-test/suite/funcs_1/t/is_routines.test: Correction of comment mysql-test/suite/funcs_1/t/is_triggers.test: Adjustment to changes in privilege system between MySQL 5.0 and 5.1. mysql-test/suite/funcs_1/t/is_views.test: Correction of comment. mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test: Correction of comment. mysql-test/suite/funcs_1/t/processlist_priv_ps.test: Correction of comment. mysql-test/suite/funcs_1/t/processlist_val_no_prot.test: Correction of comment. mysql-test/suite/funcs_1/t/processlist_val_ps.test: Correction of comment. mysql-test/suite/funcs_1/r/is_engines.result: Expected results mysql-test/suite/funcs_1/r/is_engines_archive.result: Expected results mysql-test/suite/funcs_1/r/is_engines_blackhole.result: Expected results mysql-test/suite/funcs_1/r/is_engines_csv.result: Expected results mysql-test/suite/funcs_1/r/is_engines_federated.result: Expected results mysql-test/suite/funcs_1/r/is_engines_innodb.result: Expected results mysql-test/suite/funcs_1/r/is_engines_memory.result: Expected results mysql-test/suite/funcs_1/r/is_engines_merge.result: Expected results mysql-test/suite/funcs_1/r/is_engines_myisam.result: Expected results mysql-test/suite/funcs_1/t/is_engines.test: Test of information_schema.engines mysql-test/suite/funcs_1/t/is_engines_archive.test: Test of information_schema.engines Variant for ARCHIVE mysql-test/suite/funcs_1/t/is_engines_blackhole.test: Test of information_schema.engines Variant for BLACKHOLE mysql-test/suite/funcs_1/t/is_engines_csv.test: Test of information_schema.engines Variant for CSV mysql-test/suite/funcs_1/t/is_engines_federated.test: Test of information_schema.engines Variant for FEDERATED mysql-test/suite/funcs_1/t/is_engines_innodb.test: Test of information_schema.engines Variant for InnoDB mysql-test/suite/funcs_1/t/is_engines_memory.test: Test of information_schema.engines Variant for MEMORY mysql-test/suite/funcs_1/t/is_engines_merge.test: Test of information_schema.engines Variant for MERGGE mysql-test/suite/funcs_1/t/is_engines_myisam.test: Test of information_schema.engines Variant for MyISAM mysql-test/suite/funcs_1/t/is_engines_ndb.test: Test of information_schema.engines Variant for NDB mysql-test/suite/funcs_1/t/is_events.test: Test for information_schema.events mysql-test/suite/funcs_1/r/is_engines_ndb.result: Expected results mysql-test/suite/funcs_1/r/is_events.result: Expected results
171 lines
7.6 KiB
Plaintext
171 lines
7.6 KiB
Plaintext
|
|
--source suite/funcs_1/storedproc/load_sp_tb.inc
|
|
--------------------------------------------------------------------------------
|
|
|
|
--source suite/funcs_1/storedproc/cleanup_sp_tb.inc
|
|
--------------------------------------------------------------------------------
|
|
DROP DATABASE IF EXISTS db_storedproc;
|
|
DROP DATABASE IF EXISTS db_storedproc_1;
|
|
CREATE DATABASE db_storedproc;
|
|
CREATE DATABASE db_storedproc_1;
|
|
USE db_storedproc;
|
|
create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
|
|
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
|
|
create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
|
|
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
|
|
create table t3(f1 char(20),f2 char(20),f3 integer) engine = ndb;
|
|
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
|
|
create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
|
|
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
|
|
USE db_storedproc_1;
|
|
create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
|
|
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
|
|
USE db_storedproc;
|
|
create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = ndb;
|
|
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
|
|
Warnings:
|
|
Warning 1265 Data truncated for column 'f3' at row 1
|
|
Warning 1265 Data truncated for column 'f3' at row 2
|
|
Warning 1265 Data truncated for column 'f3' at row 3
|
|
Warning 1265 Data truncated for column 'f3' at row 4
|
|
Warning 1265 Data truncated for column 'f3' at row 5
|
|
Warning 1265 Data truncated for column 'f3' at row 6
|
|
Warning 1265 Data truncated for column 'f3' at row 7
|
|
Warning 1265 Data truncated for column 'f3' at row 8
|
|
Warning 1265 Data truncated for column 'f3' at row 9
|
|
Warning 1265 Data truncated for column 'f3' at row 10
|
|
create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = ndb;
|
|
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
|
|
Warnings:
|
|
Warning 1265 Data truncated for column 'f3' at row 1
|
|
Warning 1265 Data truncated for column 'f3' at row 2
|
|
Warning 1265 Data truncated for column 'f3' at row 3
|
|
Warning 1265 Data truncated for column 'f3' at row 4
|
|
Warning 1265 Data truncated for column 'f3' at row 5
|
|
Warning 1265 Data truncated for column 'f3' at row 6
|
|
Warning 1265 Data truncated for column 'f3' at row 7
|
|
Warning 1265 Data truncated for column 'f3' at row 8
|
|
Warning 1265 Data truncated for column 'f3' at row 9
|
|
Warning 1265 Data truncated for column 'f3' at row 10
|
|
create table t9(f1 int, f2 char(25), f3 int) engine = ndb;
|
|
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
|
|
create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
|
|
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
|
|
create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
|
|
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
|
|
|
|
Section 3.1.7 - SQL mode checks:
|
|
--------------------------------------------------------------------------------
|
|
USE db_storedproc;
|
|
|
|
Testcase 3.1.7.1:
|
|
-----------------
|
|
Ensure that the sql_mode setting in effect at the time a stored procedure is
|
|
created is the same setting under which the stored procedure runs when it is
|
|
called/executed.
|
|
--------------------------------------------------------------------------------
|
|
DROP PROCEDURE IF EXISTS sp1;
|
|
DROP TABLE IF EXISTS temp_tbl;
|
|
DROP TABLE IF EXISTS result;
|
|
CREATE TABLE temp_tbl (f1 tinyint);
|
|
CREATE TABLE result (f1 text(200), f2 char(20));
|
|
set @@sql_mode='traditional';
|
|
SHOW VARIABLES LIKE 'sql_mode';
|
|
Variable_name Value
|
|
sql_mode STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
|
|
CREATE PROCEDURE sp1()
|
|
BEGIN
|
|
declare a tinyint;
|
|
declare count_ int default 1;
|
|
declare continue handler for sqlstate '22003' set count_=1000;
|
|
SHOW VARIABLES LIKE 'sql_mode';
|
|
SELECT @@sql_mode into @cur_val_sql_mode;
|
|
insert into temp_tbl values (1000);
|
|
if count_ = 1000 THEN
|
|
INSERT INTO result VALUES (@cur_val_sql_mode, 'value restored');
|
|
ELSE
|
|
INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored');
|
|
END if;
|
|
END//
|
|
SHOW CREATE PROCEDURE sp1;
|
|
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
|
|
sp1 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
|
|
BEGIN
|
|
declare a tinyint;
|
|
declare count_ int default 1;
|
|
declare continue handler for sqlstate '22003' set count_=1000;
|
|
SHOW VARIABLES LIKE 'sql_mode';
|
|
SELECT @@sql_mode into @cur_val_sql_mode;
|
|
insert into temp_tbl values (1000);
|
|
if count_ = 1000 THEN
|
|
INSERT INTO result VALUES (@cur_val_sql_mode, 'value restored');
|
|
ELSE
|
|
INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored');
|
|
END if;
|
|
END latin1 latin1_swedish_ci latin1_swedish_ci
|
|
set @@sql_mode='';
|
|
SHOW VARIABLES LIKE 'sql_mode';
|
|
Variable_name Value
|
|
sql_mode
|
|
CALL sp1();
|
|
Variable_name Value
|
|
sql_mode STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
|
|
SELECT * from result;
|
|
f1 f2
|
|
STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER value restored
|
|
SHOW VARIABLES LIKE 'sql_mode';
|
|
Variable_name Value
|
|
sql_mode
|
|
SELECT @@sql_mode;
|
|
@@sql_mode
|
|
|
|
SET @@sql_mode='TRADITIONAL';
|
|
DROP PROCEDURE sp1;
|
|
DROP TABLE temp_tbl;
|
|
DROP TABLE result;
|
|
|
|
Testcase 3.1.7.2:
|
|
-----------------
|
|
Ensure that if the sql_mode setting is changed when a stored procedure is run,
|
|
that the original setting is restored as soon as the stored procedure execution
|
|
is complete.
|
|
--------------------------------------------------------------------------------
|
|
DROP PROCEDURE IF EXISTS sp2;
|
|
... show initial value
|
|
SHOW VARIABLES LIKE 'sql_mode';
|
|
Variable_name Value
|
|
sql_mode STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
|
|
CREATE PROCEDURE sp2()
|
|
BEGIN
|
|
SET @@sql_mode='MAXDB';
|
|
SHOW VARIABLES LIKE 'sql_mode';
|
|
END//
|
|
SHOW CREATE PROCEDURE sp2;
|
|
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
|
|
sp2 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
|
|
BEGIN
|
|
SET @@sql_mode='MAXDB';
|
|
SHOW VARIABLES LIKE 'sql_mode';
|
|
END latin1 latin1_swedish_ci latin1_swedish_ci
|
|
... show value prior calling procedure
|
|
SHOW VARIABLES LIKE 'sql_mode';
|
|
Variable_name Value
|
|
sql_mode STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
|
|
... call procedure that changes sql_mode
|
|
CALL sp2();
|
|
Variable_name Value
|
|
sql_mode PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
|
|
... check whether old value is re-set
|
|
SHOW VARIABLES LIKE 'sql_mode';
|
|
Variable_name Value
|
|
sql_mode STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
|
|
DROP PROCEDURE sp2;
|
|
|
|
--source suite/funcs_1/storedproc/cleanup_sp_tb.inc
|
|
--------------------------------------------------------------------------------
|
|
DROP DATABASE IF EXISTS db_storedproc;
|
|
DROP DATABASE IF EXISTS db_storedproc_1;
|
|
|
|
. +++ END OF SCRIPT +++
|
|
--------------------------------------------------------------------------------
|