mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Updates to test/result files of funcs_1 to 5.0.40 level,
- validated current result files - forced order by and removed time stamps removed a_version files (since do not make sense now when suite is in the main tree) Note: datadict tests still fail as a result of regression bug 28181 in 5.0.42 (discovered while performing this update) - tests should run clean once bug is fixed BitKeeper/deleted/.del-a_version_check.test: Delete: mysql-test/suite/funcs_1/t/a_version_check.test BitKeeper/deleted/.del-a_version_check.result: Delete: mysql-test/suite/funcs_1/r/a_version_check.result BitKeeper/deleted/.del-innodb_views.warnings: Delete: mysql-test/suite/funcs_1/r/innodb_views.warnings BitKeeper/deleted/.del-memory_views.warnings: Delete: mysql-test/suite/funcs_1/r/memory_views.warnings BitKeeper/deleted/.del-myisam_views.warnings: Delete: mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/datadict/datadict_load.inc: Modified to correct failiure to return host name on some systems mysql-test/suite/funcs_1/datadict/datadict_master.inc: corrections to force order by on queries and replace time stamps with strings mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc: corrections to force order by on queries mysql-test/suite/funcs_1/r/innodb__datadict.result: Updated result file with order bu selects, elimination of time stamps and selects with empty user (that we don't have anymore) mysql-test/suite/funcs_1/r/innodb_func_view.result: confirming existing results as correct ones - old result file had wrong cast values returned mysql-test/suite/funcs_1/r/innodb_trig_08.result: confirming existing results as correct ones - updated error message mysql-test/suite/funcs_1/r/innodb_views.result: confirming existing results as correct ones - returned results are correct, wrong 'expected' error messages removed mysql-test/suite/funcs_1/r/memory__datadict.result: Updated result file with order bu selects, elimination of time stamps and selects with empty user (that we don't have anymore) mysql-test/suite/funcs_1/r/memory_func_view.result: confirming existing results as correct ones - old result file had wrong cast values returned mysql-test/suite/funcs_1/r/memory_trig_08.result: confirming existing results as correct ones - updated error message mysql-test/suite/funcs_1/r/memory_views.result: confirming existing results as correct ones - returned results are correct, wrong 'expected' error messages removed mysql-test/suite/funcs_1/r/myisam__datadict.result: Updated result file with order bu selects, elimination of time stamps and selects with empty user (that we don't have anymore) mysql-test/suite/funcs_1/r/myisam_func_view.result: confirming existing results as correct ones - old result file had wrong cast values returned mysql-test/suite/funcs_1/r/myisam_trig_08.result: confirming existing results as correct ones - updated error message mysql-test/suite/funcs_1/r/myisam_views.result: confirming existing results as correct ones - returned results are correct, wrong 'expected' error messages removed mysql-test/suite/funcs_1/t/disabled.def: Updated disabled messages with clearer ones mysql-test/suite/funcs_1/views/views_master.inc: removed invalid -- lines generating warning files
This commit is contained in:
@ -3036,7 +3036,9 @@ let $sublevel= `SELECT @max_level`;
|
||||
eval CREATE VIEW test1.v$level AS SELECT f1, f2
|
||||
FROM test3.t1 tab1 NATURAL JOIN test1.v$sublevel tab2;
|
||||
eval SHOW CREATE VIEW test1.v$level;
|
||||
--eror 1116
|
||||
# the following line as written as '--eror 1116' and the command
|
||||
# is successful so assuming no expected error was intended
|
||||
# --error 1116
|
||||
eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||
CAST(f2 AS CHAR) AS f2 FROM test1.v$level;
|
||||
let $message= The output of following EXPLAIN is deactivated, because the result
|
||||
@ -3047,7 +3049,9 @@ if (1)
|
||||
{
|
||||
--disable_result_log
|
||||
}
|
||||
--eror 1116
|
||||
# the following line as written as '--eror 1116' and the command
|
||||
# is successful so assuming no expected error was intended
|
||||
# --error 1116
|
||||
eval EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||
CAST(f2 AS CHAR) AS f2 FROM test1.v$level;
|
||||
if (1)
|
||||
|
Reference in New Issue
Block a user