mariadb/mysql-test/suite/funcs_1/r
mleich@five.local.lan 414299f4de 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
   ...
2008-04-01 13:18:31 +02:00
..
charset_collation_1.result Post merge fixes after 2008-03-07 20:18:14 +01:00
charset_collation_2.result Post merge fixes after 2008-03-07 20:18:14 +01:00
charset_collation_3.result WL#4203 Reorganize and fix the data dictionary tests of 2008-03-07 17:33:07 +01:00
innodb_bitdata.result WL#4203 Reorganize and fix the data dictionary tests of 2008-03-07 17:33:07 +01:00
innodb_cursors.result WL#4203 Reorganize and fix the data dictionary tests of 2008-03-07 17:33:07 +01:00
innodb_func_view.result Post merge fix for 2008-04-01 13:18:31 +02:00
innodb_storedproc.result Post merge fix for 2008-04-01 13:18:31 +02:00
innodb_storedproc_02.result Post merge fix for 2008-04-01 13:18:31 +02:00
innodb_storedproc_03.result Fix for 2008-03-31 19:48:02 +02:00
innodb_storedproc_06.result Fix for 2008-03-31 19:48:02 +02:00
innodb_storedproc_07.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
innodb_storedproc_08.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
innodb_storedproc_10.result Fix for 2008-03-31 19:48:02 +02:00
innodb_trig_03.result Post merge fix for 2008-04-01 13:18:31 +02:00
innodb_trig_03e.result Post merge fix for 2008-04-01 13:18:31 +02:00
innodb_trig_08.result Post merge fix for 2008-04-01 13:18:31 +02:00
innodb_trig_09.result Post merge fix for 2008-04-01 13:18:31 +02:00
innodb_trig_0102.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
innodb_trig_0407.result Fix for 2008-03-31 19:48:02 +02:00
innodb_trig_1011ext.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
innodb_trig_frkey.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
innodb_views.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
is_basics_mixed.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_character_sets.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_collation_character_set_applicability.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_collations.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_column_privileges.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_column_privileges_is_mysql_test.result WL#4203 Reorganize and fix the data dictionary tests of 2008-03-07 17:33:07 +01:00
is_columns.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_columns_innodb.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
is_columns_is.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_columns_memory.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
is_columns_myisam.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
is_columns_mysql.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_columns_ndb.result Fix for 2008-03-31 19:48:02 +02:00
is_engines.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_engines_archive.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_engines_blackhole.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_engines_csv.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_engines_federated.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_engines_innodb.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_engines_memory.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_engines_merge.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_engines_myisam.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_engines_ndb.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_events.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_key_column_usage.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_routines.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_schema_privileges.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_schema_privileges_is_mysql_test.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_schemata.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_schemata_is_mysql_test.result WL#4203 Reorganize and fix the data dictionary tests of 2008-03-07 17:33:07 +01:00
is_statistics.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_statistics_is.result WL#4203 Reorganize and fix the data dictionary tests of 2008-03-07 17:33:07 +01:00
is_statistics_mysql.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_table_constraints.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_table_constraints_is.result WL#4203 Reorganize and fix the data dictionary tests of 2008-03-07 17:33:07 +01:00
is_table_constraints_mysql.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_table_privileges.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_tables.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_tables_innodb.result Fix for 2008-03-31 19:48:02 +02:00
is_tables_is.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_tables_memory.result Fix for 2008-03-31 19:48:02 +02:00
is_tables_myisam.result Fix for 2008-03-31 19:48:02 +02:00
is_tables_mysql.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_tables_ndb.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
is_triggers.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_user_privileges.result Post merge fixes after 2008-03-07 20:18:14 +01:00
is_views.result Post merge fixes after 2008-03-07 20:18:14 +01:00
memory_bitdata.result WL#4203 Reorganize and fix the data dictionary tests of 2008-03-07 17:33:07 +01:00
memory_cursors.result WL#4203 Reorganize and fix the data dictionary tests of 2008-03-07 17:33:07 +01:00
memory_func_view.result Post merge fix for 2008-04-01 13:18:31 +02:00
memory_storedproc.result Post merge fix for 2008-04-01 13:18:31 +02:00
memory_storedproc_02.result Post merge fix for 2008-04-01 13:18:31 +02:00
memory_storedproc_03.result Fix for 2008-03-31 19:48:02 +02:00
memory_storedproc_06.result Fix for 2008-03-31 19:48:02 +02:00
memory_storedproc_07.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
memory_storedproc_08.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
memory_storedproc_10.result Fix for 2008-03-31 19:48:02 +02:00
memory_trig_03.result Post merge fix for 2008-04-01 13:18:31 +02:00
memory_trig_03e.result Post merge fix for 2008-04-01 13:18:31 +02:00
memory_trig_08.result Post merge fix for 2008-04-01 13:18:31 +02:00
memory_trig_09.result Post merge fix for 2008-04-01 13:18:31 +02:00
memory_trig_0102.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
memory_trig_0407.result Fix for 2008-03-31 19:48:02 +02:00
memory_trig_1011ext.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
memory_views.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
myisam_bitdata.result WL#4203 Reorganize and fix the data dictionary tests of 2008-03-07 17:33:07 +01:00
myisam_cursors.result WL#4203 Reorganize and fix the data dictionary tests of 2008-03-07 17:33:07 +01:00
myisam_func_view.result Post merge fix for 2008-04-01 13:18:31 +02:00
myisam_storedproc.result Post merge fix for 2008-04-01 13:18:31 +02:00
myisam_storedproc_02.result Post merge fix for 2008-04-01 13:18:31 +02:00
myisam_storedproc_03.result Fix for 2008-03-31 19:48:02 +02:00
myisam_storedproc_06.result Fix for 2008-03-31 19:48:02 +02:00
myisam_storedproc_07.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
myisam_storedproc_08.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
myisam_storedproc_10.result Fix for 2008-03-31 19:48:02 +02:00
myisam_trig_03.result Post merge fix for 2008-04-01 13:18:31 +02:00
myisam_trig_03e.result Post merge fix for 2008-04-01 13:18:31 +02:00
myisam_trig_08.result Post merge fix for 2008-04-01 13:18:31 +02:00
myisam_trig_09.result Post merge fix for 2008-04-01 13:18:31 +02:00
myisam_trig_0102.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
myisam_trig_0407.result Fix for 2008-03-31 19:48:02 +02:00
myisam_trig_1011ext.result Merge five.local.lan:/work/merge/mysql-5.0-Bug 2008-03-31 23:39:51 +02:00
myisam_views.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_bitdata.result Post merge fix for 2008-03-12 12:56:07 +01:00
ndb_cursors.result Post merge fix for 2008-03-12 12:56:07 +01:00
ndb_func_view.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_storedproc.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_storedproc_02.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_storedproc_03.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_storedproc_06.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_storedproc_07.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_storedproc_08.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_storedproc_10.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_trig_03.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_trig_03e.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_trig_08.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_trig_09.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_trig_0102.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_trig_0407.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_trig_1011ext.result Post merge fix for 2008-04-01 13:18:31 +02:00
ndb_views.result Post merge fix for 2008-04-01 13:18:31 +02:00
processlist_priv_no_prot.result Post merge fixes after 2008-03-07 20:18:14 +01:00
processlist_priv_ps.result Post merge fixes after 2008-03-07 20:18:14 +01:00
processlist_val_no_prot.result Post merge fixes after 2008-03-07 20:18:14 +01:00
processlist_val_ps.result Post merge fixes after 2008-03-07 20:18:14 +01:00