Matthias Leich mleich@mysql.com
672cb2c950
1. Upmerge of fix for the bugs
...
37167 funcs_1: Many tests fail if the embedded
server is used.
37164 funcs_1: Some tests fail if an optional
character set is missing.
+ some cleanup within the testsuite related to the
fixes above
+ some adjustments to open bugs on Mac OS X
2. Skip tests which suffer from bug
37456 funcs_1: Several tests crash when used
with embedded server
3. Minor cleanup in some tests
2008-06-18 19:23:55 +02:00
Patrick Crews
914bb34b38
Bug#36721 - Test funcs1.<engine>_func_view failing for multiple engines
...
Bug#36724 - Test funcs_1.<engine>_storedproc_02 needs to be updated
Bug#36726 - Test funcs_1.<engine>_storedproc failing - Needs to be updated on 5.1+
func_view bug: re-records .result files to account for addition of charset and collation data
to SHOW CREATE VIEW output
storedproc bugs: Added expected errors for those storedprocs that use SQLSTATE:00000
in their handlers. re-recorded .result files to account for these
expected errors.
mysql-test/suite/funcs_1/r/innodb_func_view.result:
Update result set for changes to SHOW CREATE VIEW output
mysql-test/suite/funcs_1/r/memory_func_view.result:
Updated result set due to changes in SHOW CREATE VIEW output
mysql-test/suite/funcs_1/r/myisam_func_view.result:
Updated result set due to changes in SHOW CREATE VIEW output
2008-05-27 19:30:07 -04:00
unknown
93f2e39529
Post merge fix for
...
ChangeSet@1.2583 , 2008-03-31
Merge five.local.lan:/work/merge/mysql-5.0-Bug
into five.local.lan:/work/merge/mysql-5.1-Bug
Addditional manual fixes will be needed.
MERGE: 1.1810.3667.16
Which contains
ChangeSet@1.1810.3667.16 , 2008-03-31
Fix for Bug
#35335 funcs_1: Some tests fail within load_file during
pushbuild runs
...
mysql-test/std_data/funcs_1/ndb_tb1.txt:
Rename: mysql-test/suite/funcs_1/data/ndb_tb1.txt -> mysql-test/std_data/funcs_1/ndb_tb1.txt
mysql-test/std_data/funcs_1/ndb_tb2.txt:
Rename: mysql-test/suite/funcs_1/data/ndb_tb2.txt -> mysql-test/std_data/funcs_1/ndb_tb2.txt
mysql-test/std_data/funcs_1/ndb_tb3.txt:
Rename: mysql-test/suite/funcs_1/data/ndb_tb3.txt -> mysql-test/std_data/funcs_1/ndb_tb3.txt
mysql-test/std_data/funcs_1/ndb_tb4.txt:
Rename: mysql-test/suite/funcs_1/data/ndb_tb4.txt -> mysql-test/std_data/funcs_1/ndb_tb4.txt
2008-04-01 13:18:31 +02:00
unknown
633cc34ca7
Post merge fixes after
...
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
2008-03-07 20:18:14 +01:00
unknown
8c8c0efd41
fixes for bug#34190.
...
BitKeeper/etc/ignore:
Added libmysqld/sql_profile.cc to the ignore list
2008-01-31 16:12:54 +01:00
unknown
68eb3c9421
WL#4084: Code changes due to enabled the disabled tests (including other improvements).
...
BitKeeper/etc/ignore:
Added mysql-test/funcs_1.log to the ignore list
2008-01-08 13:56:01 +01:00
unknown
630091fed4
copy from test-extra-5.0 to main tree
...
BitKeeper/etc/ignore:
Added mysql-test/mysql-test-run-shell to the ignore list
mysql-test/suite/funcs_2/include/check_charset.inc:
finished files with newline
2007-02-06 19:07:48 +01:00
unknown
ee5eb8bbe1
copy from test-extra-5.1 to main tree
...
BitKeeper/etc/ignore:
Added mysql-test/suite/funcs_1/r/innodb_views.warnings mysql-test/suite/funcs_1/r/memory_trig_03e.warnings mysql-test/suite/funcs_1/r/memory_views.warnings mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings mysql-test/suite/funcs_1/r/ndb_views.warnings mysql-test/suite/partitions/r/diff mysql-test/suite/partitions/r/partition_bit_ndb.warnings mysql-test/suite/partitions/r/partition_special_innodb.warnings mysql-test/suite/partitions/r/partition_special_myisam.warnings storage/archive/archive_reader mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings to the ignore list
mysql-test/suite/funcs_2/include/check_charset.inc:
inserted newline at the end of file.
mysql-test/suite/objects/include/drop_all.inc:
inserted newline at the end of file.
mysql-test/suite/partitions/include/partition_key_32col.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/data/rpl_mixed.dat:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_event.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_select.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_user.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_view.inc:
inserted newline at the end of file.
2007-02-06 13:35:54 +01:00