-
unknown authored
Fix for Bug#35335 funcs_1: Some tests fail within load_file during pushbuild runs Solution: 1. Move files with input data used in load_file, load data etc. from suite/funcs_1/<whatever> to std_data 2. Use for testsuite funcs_1 the server option --secure-file-priv=<MYSQLTEST_VARDIR> 3. Outfiles have to be stored under MYSQLTEST_VARDIR + changes according to WL#4304 Cleanup in funcs_1 tests - backport of fixes/improvements made in 5.1 to 5.0 The differences between scripts in 5.0 and 5.1 cause much additional and annoying work during any upmerge. - replace error numbers with names - improved comments - improved formatting - Unify storage engine names so that result files for storage engine variants do not differ (some tests) - remove a script no more used (tests are done in other scripts) BUILD/Makefile.am: Test case adjustments mysql-test/Makefile.am: Test case adjustments mysql-test/mysql-test-run.pl: Test case adjustments mysql-test/suite/funcs_1/README.txt: Test case adjustments mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc: Test case adjustments mysql-test/suite/funcs_1/datadict/datadict_load.inc: Test case adjustments mysql-test/suite/funcs_1/include/innodb_tb1.inc: Test case adjustments mysql-test/suite/funcs_1/include/innodb_tb2.inc: Test case adjustments mysql-test/suite/funcs_1/include/innodb_tb3.inc: Test case adjustments mysql-test/suite/funcs_1/include/innodb_tb4.inc: Test case adjustments mysql-test/suite/funcs_1/include/memory_tb1.inc: Test case adjustments mysql-test/suite/funcs_1/include/memory_tb2.inc: Test case adjustments mysql-test/suite/funcs_1/include/memory_tb3.inc: Test case adjustments mysql-test/suite/funcs_1/include/memory_tb4.inc: Test case adjustments mysql-test/suite/funcs_1/include/myisam_tb1.inc: Test case adjustments mysql-test/suite/funcs_1/include/myisam_tb2.inc: Test case adjustments mysql-test/suite/funcs_1/include/myisam_tb3.inc: Test case adjustments mysql-test/suite/funcs_1/include/myisam_tb4.inc: Test case adjustments mysql-test/suite/funcs_1/include/sp_tb.inc: Test case adjustments mysql-test/suite/funcs_1/r/innodb_func_view.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_storedproc_03.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_storedproc_06.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_trig_03.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_trig_0407.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_trig_08.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_trig_09.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_trig_frkey.result: Test case adjustments mysql-test/suite/funcs_1/r/innodb_views.result: Test case adjustments mysql-test/suite/funcs_1/r/is_columns_innodb.result: Test case adjustments mysql-test/suite/funcs_1/r/is_columns_memory.result: Test case adjustments mysql-test/suite/funcs_1/r/is_columns_myisam.result: Test case adjustments mysql-test/suite/funcs_1/r/is_columns_ndb.result: Test case adjustments mysql-test/suite/funcs_1/r/is_tables_innodb.result: Test case adjustments mysql-test/suite/funcs_1/r/is_tables_memory.result: Test case adjustments mysql-test/suite/funcs_1/r/is_tables_myisam.result: Test case adjustments mysql-test/suite/funcs_1/r/is_tables_ndb.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_func_view.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_storedproc_03.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_storedproc_06.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_trig_0102.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_trig_03.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_trig_0407.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_trig_08.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_trig_09.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_trig_1011ext.result: Test case adjustments mysql-test/suite/funcs_1/r/memory_views.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_func_view.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_storedproc_03.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_storedproc_06.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_trig_03.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_trig_0407.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_trig_08.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_trig_09.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result: Test case adjustments mysql-test/suite/funcs_1/r/myisam_views.result: Test case adjustments mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc: Test case adjustments mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc: Test case adjustments mysql-test/suite/funcs_1/storedproc/storedproc_02.inc: Test case adjustments mysql-test/suite/funcs_1/storedproc/storedproc_03.inc: Test case adjustments mysql-test/suite/funcs_1/storedproc/storedproc_06.inc: Test case adjustments mysql-test/suite/funcs_1/storedproc/storedproc_10.inc: Test case adjustments mysql-test/suite/funcs_1/t/innodb_trig_0407.test: Test case adjustments mysql-test/suite/funcs_1/t/is_basics_mixed.test: Test case adjustments mysql-test/suite/funcs_1/t/memory_storedproc_02.test: Test case adjustments mysql-test/suite/funcs_1/t/memory_storedproc_03.test: Test case adjustments mysql-test/suite/funcs_1/t/memory_storedproc_06.test: Test case adjustments mysql-test/suite/funcs_1/t/memory_storedproc_07.test: Test case adjustments mysql-test/suite/funcs_1/t/memory_storedproc_08.test: Test case adjustments mysql-test/suite/funcs_1/t/memory_storedproc_10.test: Test case adjustments mysql-test/suite/funcs_1/t/myisam_storedproc_02.test: Test case adjustments mysql-test/suite/funcs_1/t/myisam_storedproc_03.test: Test case adjustments mysql-test/suite/funcs_1/t/myisam_storedproc_06.test: Test case adjustments mysql-test/suite/funcs_1/t/myisam_storedproc_07.test: Test case adjustments mysql-test/suite/funcs_1/t/myisam_storedproc_08.test: Test case adjustments mysql-test/suite/funcs_1/t/myisam_storedproc_10.test: Test case adjustments mysql-test/suite/funcs_1/triggers/trig_frkey2.inc: Test case adjustments mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Test case adjustments mysql-test/suite/funcs_1/triggers/triggers_03.inc: Test case adjustments mysql-test/suite/funcs_1/triggers/triggers_0407.inc: Test case adjustments mysql-test/suite/funcs_1/triggers/triggers_08.inc: Test case adjustments mysql-test/suite/funcs_1/triggers/triggers_09.inc: Test case adjustments mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc: Test case adjustments mysql-test/suite/funcs_1/views/func_view.inc: Test case adjustments mysql-test/suite/funcs_1/views/views_master.inc: Test case adjustments
abcfc7b6