mirror of
https://github.com/MariaDB/server.git
synced 2025-11-22 17:44:29 +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:
@@ -1,29 +0,0 @@
|
||||
#### suite/funcs_1/t/a_version_check.test
|
||||
#
|
||||
# just a simple check of the version to be sure the correct server version is
|
||||
# checked against the funcs_1 tests.
|
||||
|
||||
# just show machine and version to be sure we are testing the correct files
|
||||
#
|
||||
let $message= . Just show the version string for which the results in suite
|
||||
. funcs_1 have been checked.
|
||||
.
|
||||
. I know that the .result file of this check needs to
|
||||
. updated with each new version --- THIS IS INTENDED!;
|
||||
--source include/show_msg.inc
|
||||
|
||||
--disable_query_log
|
||||
SELECT CONCAT('funcs_1 checked with version: ', SUBSTR(version(), 1, 6 ) ) AS " ";
|
||||
#SELECT CONCAT('aa = ', 'bb');
|
||||
#SELECT CONCAT('aa = ', 'bb') AS " ";
|
||||
|
||||
if (0)
|
||||
{
|
||||
# these more detailed results create differences between the OS.
|
||||
# mioght be used later when we enable OS dependent .result files
|
||||
--vertical_results
|
||||
SELECT @@version_compile_os AS 'vers_comp_os', current_date;
|
||||
SHOW VARIABLES LIKE 'vers%';
|
||||
--horizontal_results
|
||||
}
|
||||
|
||||
@@ -10,6 +10,6 @@
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
innodb_storedproc: switched off (too much changed output from WL#2984, needs to be checked)
|
||||
memory_storedproc: switched off (too much changed output from WL#2984, needs to be checked)
|
||||
myisam_storedproc: switched off (too much changed output from WL#2984, needs to be checked)
|
||||
innodb_storedproc: (changes of WL#2984, using storeproc_nn instead)
|
||||
memory_storedproc: (changes of WL#2984, using storeproc_nn instead)
|
||||
myisam_storedproc: (changes of WL#2984, using storeproc_nn instead)
|
||||
|
||||
Reference in New Issue
Block a user