mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/suite/funcs_1/r
History
unknown 6009980ff3 Merge mysql.com:/home/kent/bk/mysql-5.0-release-merge 
into  mysql.com:/home/kent/bk/mysql-5.1


BUILD/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/t3.txt:
  Auto merged
mysql-test/std_data/funcs_1/t4.txt:
  Auto merged
mysql-test/std_data/funcs_1/t7.txt:
  Auto merged
mysql-test/std_data/funcs_1/t9.txt:
  Auto merged
mysql-test/suite/funcs_1/README.txt:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Auto merged
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Auto merged
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Auto merged
mysql-test/suite/funcs_1/views/func_view.inc:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
2008-05-13 15:56:07 +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 Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +02: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 Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +02:00
innodb_storedproc_02.result Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +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 Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +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 Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +02: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 Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +02:00
memory_storedproc_02.result Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +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 Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +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 Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +02:00
myisam_storedproc_02.result Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +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 Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +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 Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +02:00
ndb_storedproc_02.result Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +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 Fixes for failing funcs_1 tests in mysql-5.1.24-rc 2008-04-01 19:22:37 +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 Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows 2008-04-26 19:52:43 -04:00
processlist_priv_ps.result Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows 2008-04-26 19:52:43 -04:00
processlist_val_no_prot.result Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows 2008-04-26 19:52:43 -04:00
processlist_val_ps.result Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows 2008-04-26 19:52:43 -04:00