diff options
| author | Varun Gupta <varunraiko1803@gmail.com> | 2017-11-23 12:36:53 +0200 |
|---|---|---|
| committer | Varun Gupta <varunraiko1803@gmail.com> | 2017-11-23 15:23:27 +0200 |
| commit | e585ddf3759c15a723c1238cb6dc0ce096d2dc9e (patch) | |
| tree | 0295c7df454811f011d8068850c2e050eb1d25df /mysql-test/t | |
| parent | dbb994cce1992de4fc4591dfd64c8989feb281af (diff) | |
| download | mariadb-git-aggregagte_functions.tar.gz | |
Updated tests and result filesaggregagte_functions
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/information_schema.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/sp-destruct.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/sp-error.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/sp_agg.test | 4 |
4 files changed, 3 insertions, 7 deletions
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test index 9c306de0e3f..dcd56c57650 100644 --- a/mysql-test/t/information_schema.test +++ b/mysql-test/t/information_schema.test @@ -867,7 +867,7 @@ drop table t1; use mysql; INSERT INTO `proc` VALUES ('test','','PROCEDURE','','SQL','CONTAINS_SQL', 'NO','DEFINER','','','BEGIN\r\n \r\nEND','root@%','2006-03-02 18:40:03', -'2006-03-02 18:40:03','','','utf8','utf8_general_ci','utf8_general_ci','n/a'); +'2006-03-02 18:40:03','','','utf8','utf8_general_ci','utf8_general_ci','n/a', 'NONE'); select routine_name from information_schema.routines where ROUTINE_SCHEMA='test'; delete from proc where name=''; use test; diff --git a/mysql-test/t/sp-destruct.test b/mysql-test/t/sp-destruct.test index 31da235d906..0cd80bd5427 100644 --- a/mysql-test/t/sp-destruct.test +++ b/mysql-test/t/sp-destruct.test @@ -10,7 +10,7 @@ -- source include/not_embedded.inc # Supress warnings written to the log file -call mtr.add_suppression("Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted"); +call mtr.add_suppression("Column count of mysql.proc is wrong. Expected 21, found 20. The table is probably corrupted"); call mtr.add_suppression("Stored routine .test...bug14233_[123].: invalid value in column mysql.proc"); # Backup proc table diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test index aa537d3596b..0e16948f438 100644 --- a/mysql-test/t/sp-error.test +++ b/mysql-test/t/sp-error.test @@ -1746,7 +1746,7 @@ drop procedure bug15091; drop function if exists bug16896; --enable_warnings ---error ER_PARSE_ERROR +--error ER_INVALID_AGGREGATE_FUNCTION create aggregate function bug16896() returns int return 1; # diff --git a/mysql-test/t/sp_agg.test b/mysql-test/t/sp_agg.test index cd1d515a390..20fcc35f39f 100644 --- a/mysql-test/t/sp_agg.test +++ b/mysql-test/t/sp_agg.test @@ -771,7 +771,3 @@ drop function f4; drop function f5; drop function f6; drop function f7; - - - - |