Commit graph

51 commits

Author SHA1 Message Date
Sergei Golubchik
87e13722a9 Merge branch '10.6' into 10.11 2024-02-01 18:36:14 +01:00
Sergei Golubchik
46e3a7658b funcs_1.innodb_views times out in --ps 2024-01-31 17:07:46 +01:00
Oleksandr Byelkin
8c5db7a187 MDEV-29587 Allowing insert into a view with columns that are not part the table
We can check only fields which take part in inserts.
2024-01-23 15:13:06 +01:00
Lena Startseva
9854fb6fa7 MDEV-31003: Second execution for ps-protocol
This patch adds for "--ps-protocol" second execution
of queries "SELECT".
Also in this patch it is added ability to disable/enable
(--disable_ps2_protocol/--enable_ps2_protocol) second
execution for "--ps-prototocol" in testcases.
2023-07-26 17:15:00 +07:00
Faustin Lammler
2df2238cb8 Lintian complains on spelling error
The lintian check complains on spelling error:
https://salsa.debian.org/mariadb-team/mariadb-10.3/-/jobs/95739
2019-12-02 12:41:13 +02:00
Monty
470c3fd98d Change error message when using DROP VIEW on a non existing view from
"Unknown table" to "Unknown view"
2017-04-07 18:22:06 +04:00
Sergei Golubchik
99e48cb1d9 restore ER_VIEW_CHECK_FAILED to be different from ER_CONSTRAINT_FAILED
collaterals:
* use %`s, not '%s'
* use correct SQLSTATE codes for these two errors
2016-06-30 11:43:02 +02:00
Michael Widenius
db7edfed17 MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard
MDEV-10134 Add full support for DEFAULT

- Added support for using tables with MySQL 5.7 virtual fields,
  including MySQL 5.7 syntax
- Better error messages also for old cases
- CREATE ... SELECT now also updates timestamp columns
- Blob can now have default values
- Added new system variable "check_constraint_checks", to turn of
  CHECK constraint checking if needed.
- Removed some engine independent tests in suite vcol to only test myisam
- Moved some tests from 'include' to 't'. Should some day be done for all tests.
- FRM version increased to 11 if one uses virtual fields or constraints
- Changed to use a bitmap to check if a field has got a value, instead of
  setting HAS_EXPLICIT_VALUE bit in field flags
- Expressions can now be up to 65K in total
- Ensure we are not refering to uninitialized fields when handling virtual fields or defaults
- Changed check_vcol_func_processor() to return a bitmap of used types
- Had to change some functions that calculated cached value in fix_fields to do
  this in val() or getdate() instead.
- store_now_in_TIME() now takes a THD argument
- fill_record() now updates default values
- Add a lookahead for NOT NULL, to be able to handle DEFAULT 1+1 NOT NULL
- Automatically generate a name for constraints that doesn't have a name
- Added support for ALTER TABLE DROP CONSTRAINT
- Ensure that partition functions register virtual fields used. This fixes
  some bugs when using virtual fields in a partitioning function
2016-06-30 11:43:02 +02:00
Oleksandr Byelkin
7166069537 MDEV-3944: Allow derived tables in VIEWS 2016-05-28 14:44:21 +02:00
Alexander Barkov
9a25c01f78 MDEV-10102 Disallow CREATE VIEW .. PROCEDURE ANALYSE() syntactically 2016-05-23 16:25:51 +04:00
Alexander Barkov
5c9c8ef1ea MDEV-3929 Add system variable explicit_defaults_for_timestamp for compatibility with MySQL 2015-09-22 14:01:54 +04:00
Monty
6b20342651 Ensure that fields declared with NOT NULL doesn't have DEFAULT values if not specified and if not timestamp or auto_increment
In original code, sometimes one got an automatic DEFAULT value in some cases, in other cases not.

For example:
create table t1 (a int primary key)      - No default
create table t2 (a int, primary key(a))  - DEFAULT 0
create table t1 SELECT ....              - Default for all fields, even if they where defined as NOT NULL
ALTER TABLE ... MODIFY could sometimes add an unexpected DEFAULT value.

The patch is quite big because we had some many test cases that used
CREATE ... SELECT or CREATE ... (...PRIMARY KEY(xxx)) which doesn't have an automatic DEFAULT anymore.

Other things:
- Removed warnings from InnoDB when waiting from semaphore (got this when testing things with --big)
2015-08-18 11:18:57 +03:00
Alexander Barkov
115904c2c8 MDEV-7824 [Bug #68041] Zero date can be inserted in strict no-zero mode through a default value 2015-06-26 10:16:51 +04:00
Sergei Golubchik
7f5e51b940 MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)
remove:
* NDB from everywhere
* IM from mtr-v1
* packaging/rpm-oel and packaging/rpm-uln
* few unused spec files
* plug.in file
* .bzrignore
2014-10-11 18:53:06 +02:00
Sergei Golubchik
edf1fbd25b MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits 2014-05-13 11:53:30 +02:00
Alexander Barkov
89e1715355 MDEV-5372 Make "CAST(time_expr AS DATETIME)" compatible with MySQL-5.6 (and the SQL Standard) 2014-03-07 00:21:25 +04:00
unknown
97ecffc8ee merge 10.0-base -> 10.0 2013-10-29 22:20:45 +02:00
unknown
e6ac94a63f MDEV-5133: Test suite tests *_func_view fail in time zones East of UTC+3
test time increased to be working on all timezones.
2013-10-23 15:22:47 +03:00
unknown
6d179d7c73 MDEV-3862 Lift limitation for merging VIEWS with Subqueries in SELECT list. 2012-11-20 15:11:22 +02:00
Sergei Golubchik
4f435bddfd 5.3 merge 2012-01-13 15:50:02 +01:00
Igor Babaev
68dad67762 Adjusted test cases of the suite funcs_1. 2011-12-16 08:05:14 -08:00
Sergei Golubchik
76f0b94bb0 merge with 5.3
sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup
2011-10-19 21:45:18 +02:00
Igor Babaev
35c35858f8 Fixed bugs causing failures fot the funcs_1 test suite.
Uncommented the failing test cases.

Commented out the failing test case from parts.partition_repair_myisam.test.
The test case has to be changed to bear the same semantics as before mwl106.
2011-06-03 21:44:37 -07:00
Igor Babaev
63d6dbc4ab Fixed 3 valgrind bugs.
Two of them (in the function make_join_statistics and in the function
sort_and_filter_keyuse) were due to bad merges while the third bug was
triggered by uninitialized values of the field JOIN_TAB::preread_init_done.

Fixed a compiler warning in mysql_priv.h.

Commented out some queries from the funcs_1 suite returning wrong
errors due to bugs concerning updatable views (see bugs 784297 and
784303).

Adjusted some results for the test cases with derived tables from
different suites.
2011-05-21 13:12:21 -07:00
Magne Mahre
32b7e60e42 WL#5349 Change default storage engine to InnoDB
The default storage engine is changed from MyISAM to
InnoDB, in all builds except for the embedded server.

In addition, the following system variables are 
changed:

  * innodb_file_per_table is enabled
  * innodb_strict_mode is enabled
  * innodb_file_format_name_update is changed
    to 'Barracuda'

The test suite is changed so that tests that do not
explicitly include the have_innodb.inc are run with
--default-storage-engine=MyISAM.  This is to ease the
transition, so that most regression tests are run
with the same engine as before.

Some tests are disabled for the embedded server
regression test, as the output of certain statements
will be different that for the regular server
(i.e SELECT @@default_storage_engine).  This is to
ease transition.



mysql-test/mysql-test-run.pl:
  The regression test suite now adds a
  --default-storage-engine=MyISAM for all non-innodb 
  tests.  This behaviour can be controlled by the
  default-myisam switch in mysql-test-run
mysql-test/t/bootstrap-master.opt:
  The bootstrap test can only be run without InnoDB
  as it starts several mysqld instances on the same
  datadir. This is possible with MyISAM, but not
  with InnoDB.
storage/innobase/CMakeLists.txt:
  Build InnoDB per default
storage/innobase/handler/ha_innodb.cc:
  Change default values for system variables
  
    Enable file_per_table
    Enable strict_mode
    Upgrade default file format to Barracuda
2010-06-17 22:51:35 +02:00
Dmitry Lenev
ef9aaa8e2e Follow-up for patch that addresses bug #53976 "ALTER TABLE
RENAME is allowed on views (not documented, broken)".

Adjusted test cases in funcs_1 suite after removing support
of ALTER TABLE RENAME for views.
2010-05-30 11:48:22 +04:00
Davi Arnaut
c5b3125f00 Rename std_data_ln to std_data. 2009-01-31 17:22:59 -02:00
Matthias Leich
32488ef0a0 Merge 5.0 -> 5.1 of fix for Bug#38427
"Data too long" in some configurations, tests "<ENGINE>_func_view" fail
2008-10-02 14:12:08 +02:00
Matthias Leich
14f372c966 Fix for Bug#38427 "Data too long" in some configurations,
tests "<ENGINE>_func_view" fail
2008-10-02 13:47:16 +02:00
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
Matthias Leich mleich@mysql.com
28f9704737 Fix for
Bug#37167 funcs_1: Many tests fail if the embedded server is used.
   Bug#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

Details:
- Remove the initial loading of data from tests if these data
  are not somewhere retrieved
- Remove any use of columns with attribute unicode
  (-> UCS2 is no more needed) from tests where unicode
  properties are not checked or somehow required
- Create a separate branch of the Character maximum length test
  (CML). If UCS2 is available than this test gets applied to
  every available type of string column with attribute unicode
  This prevents any loss of coverage by the points above.
- Disable the execution of is_tables_ndb which gives wrong
  results because of a bug. Correct the exepected results of
  this test.
- In case of tests failing when applied to the embedded server
    1) Create a variant of this test for the embedded server
  or
    2) Skip the test in case of embedded server
  depending on purpose and complexity of test.
- Skip the tests which could suffer from
  Bug 28309 First insert violates unique constraint - was "memory" table empty ?
  Bug 37380 Test funcs_1.is_columns_myisam_embedded fails on OS X
  (both bugs Mac OS X, embedded server, MySQL 5.0 only)
- Minor improvements like remove typos
2008-06-16 20:39:58 +02:00
unknown
2d7b51922a Fix for the latest instability found within funcs_1: ndb_views
Bug#31237 Test "ndb_views" fails because of differing order of select results


mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated results
mysql-test/suite/funcs_1/views/views_master.inc:
  Mangle the row numbers
2008-05-05 19:49:17 +02: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
2c4f9bd486 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.


BitKeeper/deleted/.del-triggers_master.test:
  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/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_0407.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_0407.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_0407.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_1011ext.inc:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  ul
  ul
2008-03-31 23:39:51 +02:00
unknown
004123892d 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)


BitKeeper/deleted/.del-triggers_master.test:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
mysql-test/std_data/funcs_1/innodb_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb1.txt -> mysql-test/std_data/funcs_1/innodb_tb1.txt
mysql-test/std_data/funcs_1/innodb_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb2.txt -> mysql-test/std_data/funcs_1/innodb_tb2.txt
mysql-test/std_data/funcs_1/innodb_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb3.txt -> mysql-test/std_data/funcs_1/innodb_tb3.txt
mysql-test/std_data/funcs_1/innodb_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb4.txt -> mysql-test/std_data/funcs_1/innodb_tb4.txt
mysql-test/std_data/funcs_1/memory_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb1.txt -> mysql-test/std_data/funcs_1/memory_tb1.txt
mysql-test/std_data/funcs_1/memory_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb2.txt -> mysql-test/std_data/funcs_1/memory_tb2.txt
mysql-test/std_data/funcs_1/memory_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb3.txt -> mysql-test/std_data/funcs_1/memory_tb3.txt
mysql-test/std_data/funcs_1/memory_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb4.txt -> mysql-test/std_data/funcs_1/memory_tb4.txt
mysql-test/std_data/funcs_1/myisam_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb1.txt -> mysql-test/std_data/funcs_1/myisam_tb1.txt
mysql-test/std_data/funcs_1/myisam_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb2.txt -> mysql-test/std_data/funcs_1/myisam_tb2.txt
mysql-test/std_data/funcs_1/myisam_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb3.txt -> mysql-test/std_data/funcs_1/myisam_tb3.txt
mysql-test/std_data/funcs_1/myisam_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb4.txt -> mysql-test/std_data/funcs_1/myisam_tb4.txt
mysql-test/std_data/funcs_1/t3.txt:
  Rename: mysql-test/suite/funcs_1/data/t3.txt -> mysql-test/std_data/funcs_1/t3.txt
mysql-test/std_data/funcs_1/t4.txt:
  Rename: mysql-test/suite/funcs_1/data/t4.txt -> mysql-test/std_data/funcs_1/t4.txt
mysql-test/std_data/funcs_1/t7.txt:
  Rename: mysql-test/suite/funcs_1/data/t7.txt -> mysql-test/std_data/funcs_1/t7.txt
mysql-test/std_data/funcs_1/t9.txt:
  Rename: mysql-test/suite/funcs_1/data/t9.txt -> mysql-test/std_data/funcs_1/t9.txt
mysql-test/Makefile.am:
  Introduce installation of funcs_1 files in std_data.
mysql-test/mysql-test-run.pl:
  The tests within funcs_1 need a server started with
      --secure-file-priv=<MYSQLTEST_VARDIR>
  like the main regression tests.
mysql-test/suite/funcs_1/README.txt:
  Extended description
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
  Cleanup
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Cleanup
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.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_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
  "--echo" instead of SQL command.
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Adjustment to new storage place of infile
  + correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Backport from 5.1 + correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Minor improvements + correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Backport from 5.1 + correct formatting
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Backport from 5.1. + correct formatting
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  Cleanup
mysql-test/suite/funcs_1/t/is_basics_mixed.test:
  Adjustment to new storage place of outfile.
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Cleanup
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
  Cleanup
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Cleanup
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/views/func_view.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/views/views_master.inc:
  Cleanup
mysql-test/std_data/funcs_1/load_file.txt:
  New BitKeeper file ``mysql-test/std_data/funcs_1/load_file.txt''
2008-03-31 19:48:02 +02:00
unknown
67d529ed3b Post fix for
WL#4203 Reorganize and fix the data dictionary tests of
        testsuite funcs_1
because the goal to fix
Bug#34532 Some funcs_1 tests do not clean up at end of testing
was partially missed.
Some minor additional modifications are for
   WL#4304 Cleanup in funcs_1 tests


BitKeeper/deleted/.del-innodb_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/innodb_triggers.result -> BitKeeper/deleted/.del-innodb_triggers.result
BitKeeper/deleted/.del-memory_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/memory_triggers.result -> BitKeeper/deleted/.del-memory_triggers.result
BitKeeper/deleted/.del-myisam_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/myisam_triggers.result -> BitKeeper/deleted/.del-myisam_triggers.result
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/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_07.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/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/cursors/cursors_master.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Cleanup
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.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_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/views/views_master.inc:
  Backport of file in 5.1 which got many fixes for instabilities
  and other improvements
2008-03-11 19:54:35 +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
c916a0761b Merge hh-nb.hhunger:/work/merge/mysql-5.0-32496
into  hh-nb.hhunger:/work/merge/mysql-5.1-32496


BitKeeper/etc/ignore:
  auto-union
mysql-test/suite/funcs_1/r/innodb_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_views.result:
  used ul
2007-11-26 22:19:39 +01:00
unknown
77f59b989c patch for bug#32496 (2nd) with ansi conformant and Mysql test case.
BitKeeper/etc/ignore:
  Added scripts/make_win_src_distribution_old server-tools/instance-manager/net_serv.cc to the ignore list
2007-11-26 21:28:01 +01:00
unknown
55c353dae6 1. Fix for Bug#31237 Test "ndb_views" fails because of differing order of select results
2. Cleanup of test


mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated expected results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated expected results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated expected results
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated expected results
mysql-test/suite/funcs_1/views/views_master.inc:
  1. Fix for Bug#31237
     Typical changes:
        - Move LIMIT .... from CREATE VIEW statement to the SELECT checking the VIEW content
        - Partially refine the SELECT on the VIEW to get a reproducible result
  2. Cleanup of test
        - replace error numbers by names
        - remove comments and workarounds dedicated to now fixed bugs
        - minor fixes or improvements in comments
        - remove trailing spaces
2007-10-05 20:06:41 +02:00
unknown
4cfe994ebc Updated to result files for cluster tests for version 5.1.21
Updared to 'views' test - forcing sort order
Updateds included masked results as a result of bug 30322


mysql-test/suite/funcs_1/include/ndb_tb2.inc:
  Correction to test file creating an ndb table
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/ndb_cursors.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_func_view.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_views.result:
  updated result file
mysql-test/suite/funcs_1/views/views_master.inc:
  updated test file - forcing sort order
mysql-test/suite/funcs_2/r/ndb_charset.result:
  Updated result file
2007-08-08 17:16:26 -07:00
unknown
422173a8b9 Updated funcs_1 test and result files (not including cluster) for 5.1.21
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated result file
mysql-test/suite/funcs_1/views/views_master.inc:
  updated test file
2007-08-06 18:46:00 -07:00
unknown
61b86c4f36 Merge linux.site:/home/omer/source/bld50_0724
into  linux.site:/home/omer/source/jrg51


mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.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_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.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_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.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/triggers/triggers_0102.inc:
  Auto merged
mysql-test/suite/funcs_1/views/func_view.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  manual merge
mysql-test/suite/funcs_1/r/memory_func_view.result:
  manual merge
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  manual merge
mysql-test/suite/funcs_1/r/myisam_views.result:
  manual merge
2007-07-30 08:37:33 -07:00
unknown
39f3cda7c7 Fix a bad BitKeeper dependency structure for the "funcs_1" suite:
Step 2:
Restore the 5.1 contents in the 5.0-dependent files.


mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/innodb_views.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/memory_views.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/r/myisam_views.result:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/views/func_view.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
mysql-test/suite/funcs_1/views/views_master.inc:
  Restore the 5.1 contents in the 5.0-dependent file.
2007-07-27 15:41:27 +02:00
unknown
072db2f2e4 Fix a bad BitKeeper dependency structure for the "funcs_1" suite:
The files below "mysql-test/suite/funcs_1" in version 5.1
did not depend on the equivalent ones in 5.0,
probably because they had been checked in independent of each other
in both versions.

Step 1:
Foreach file F in the suite that has a "deleted" counterpart D, use
    bk rm $F
    bk mv $D $F
to get those files into the 5.1 suite that (for BK) depend on 5.0.


BitKeeper/deleted/.del-bitdata_master.test~6c37e095e0a9add9:
  Delete: mysql-test/suite/funcs_1/bitdata/bitdata_master.test
BitKeeper/deleted/.del-cursors_master.test~9dcdbd03ab922cc0:
  Delete: mysql-test/suite/funcs_1/cursors/cursors_master.test
mysql-test/suite/funcs_1/bitdata/bitdata_master.test:
  Rename: BitKeeper/deleted/.del-bitdata_master.test -> mysql-test/suite/funcs_1/bitdata/bitdata_master.test
BitKeeper/deleted/.del-innodb_tb1.txt~7aac0fc74aa9562b:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb1.txt
BitKeeper/deleted/.del-innodb_tb2.txt~9e942b8278568a29:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb2.txt
mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Rename: BitKeeper/deleted/.del-cursors_master.test -> mysql-test/suite/funcs_1/cursors/cursors_master.test
mysql-test/suite/funcs_1/data/innodb_tb1.txt:
  Rename: BitKeeper/deleted/.del-innodb_tb1.txt -> mysql-test/suite/funcs_1/data/innodb_tb1.txt
mysql-test/suite/funcs_1/data/innodb_tb2.txt:
  Rename: BitKeeper/deleted/.del-innodb_tb2.txt -> mysql-test/suite/funcs_1/data/innodb_tb2.txt
BitKeeper/deleted/.del-innodb_tb3.txt~2799425a5cda8773:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb3.txt
BitKeeper/deleted/.del-innodb_tb4.txt~4944d7e7a6e18007:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb4.txt
mysql-test/suite/funcs_1/data/innodb_tb3.txt:
  Rename: BitKeeper/deleted/.del-innodb_tb3.txt -> mysql-test/suite/funcs_1/data/innodb_tb3.txt
mysql-test/suite/funcs_1/data/innodb_tb4.txt:
  Rename: BitKeeper/deleted/.del-innodb_tb4.txt -> mysql-test/suite/funcs_1/data/innodb_tb4.txt
BitKeeper/deleted/.del-memory_tb1.txt~6132f28bde92b74d:
  Delete: mysql-test/suite/funcs_1/data/memory_tb1.txt
BitKeeper/deleted/.del-memory_tb2.txt~e989d4cca5cc4383:
  Delete: mysql-test/suite/funcs_1/data/memory_tb2.txt
BitKeeper/deleted/.del-memory_tb3.txt~41d0c3a6f93c7943:
  Delete: mysql-test/suite/funcs_1/data/memory_tb3.txt
mysql-test/suite/funcs_1/data/memory_tb1.txt:
  Rename: BitKeeper/deleted/.del-memory_tb1.txt -> mysql-test/suite/funcs_1/data/memory_tb1.txt
mysql-test/suite/funcs_1/data/memory_tb2.txt:
  Rename: BitKeeper/deleted/.del-memory_tb2.txt -> mysql-test/suite/funcs_1/data/memory_tb2.txt
mysql-test/suite/funcs_1/data/memory_tb3.txt:
  Rename: BitKeeper/deleted/.del-memory_tb3.txt -> mysql-test/suite/funcs_1/data/memory_tb3.txt
BitKeeper/deleted/.del-memory_tb4.txt~c2e1ba0cb221343c:
  Delete: mysql-test/suite/funcs_1/data/memory_tb4.txt
BitKeeper/deleted/.del-myisam_tb1.txt~7f1338ea22ef2ddd:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb1.txt
mysql-test/suite/funcs_1/data/memory_tb4.txt:
  Rename: BitKeeper/deleted/.del-memory_tb4.txt -> mysql-test/suite/funcs_1/data/memory_tb4.txt
mysql-test/suite/funcs_1/data/myisam_tb1.txt:
  Rename: BitKeeper/deleted/.del-myisam_tb1.txt -> mysql-test/suite/funcs_1/data/myisam_tb1.txt
BitKeeper/deleted/.del-myisam_tb2.txt~274fcaf6c68cd806:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb2.txt
BitKeeper/deleted/.del-myisam_tb3.txt~79980a26498bc43:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb3.txt
BitKeeper/deleted/.del-myisam_tb4.txt~f6911545af0083a1:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb4.txt
mysql-test/suite/funcs_1/data/myisam_tb2.txt:
  Rename: BitKeeper/deleted/.del-myisam_tb2.txt -> mysql-test/suite/funcs_1/data/myisam_tb2.txt
mysql-test/suite/funcs_1/data/myisam_tb3.txt:
  Rename: BitKeeper/deleted/.del-myisam_tb3.txt -> mysql-test/suite/funcs_1/data/myisam_tb3.txt
BitKeeper/deleted/.del-t3.txt~6ae31465f2e71150:
  Delete: mysql-test/suite/funcs_1/data/t3.txt
BitKeeper/deleted/.del-t4.txt~ea4aa3bb29a89198:
  Delete: mysql-test/suite/funcs_1/data/t4.txt
mysql-test/suite/funcs_1/data/myisam_tb4.txt:
  Rename: BitKeeper/deleted/.del-myisam_tb4.txt -> mysql-test/suite/funcs_1/data/myisam_tb4.txt
mysql-test/suite/funcs_1/data/t3.txt:
  Rename: BitKeeper/deleted/.del-t3.txt -> mysql-test/suite/funcs_1/data/t3.txt
mysql-test/suite/funcs_1/data/t4.txt:
  Rename: BitKeeper/deleted/.del-t4.txt -> mysql-test/suite/funcs_1/data/t4.txt
BitKeeper/deleted/.del-datadict_bug_12777.inc~672dfea7d7dba2b8:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
BitKeeper/deleted/.del-t7.txt~eede0d702e02d5bf:
  Delete: mysql-test/suite/funcs_1/data/t7.txt
BitKeeper/deleted/.del-t9.txt~3df18021c8994cfa:
  Delete: mysql-test/suite/funcs_1/data/t9.txt
mysql-test/suite/funcs_1/data/t7.txt:
  Rename: BitKeeper/deleted/.del-t7.txt -> mysql-test/suite/funcs_1/data/t7.txt
mysql-test/suite/funcs_1/data/t9.txt:
  Rename: BitKeeper/deleted/.del-t9.txt -> mysql-test/suite/funcs_1/data/t9.txt
BitKeeper/deleted/.del-datadict_load.inc~ff1ec79eab8c431c:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_load.inc
BitKeeper/deleted/.del-datadict_master.inc~94ae7b735ad01d72:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
  Rename: BitKeeper/deleted/.del-datadict_bug_12777.inc -> mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Rename: BitKeeper/deleted/.del-datadict_load.inc -> mysql-test/suite/funcs_1/datadict/datadict_load.inc
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Rename: BitKeeper/deleted/.del-datadict_master.inc -> mysql-test/suite/funcs_1/datadict/datadict_master.inc
BitKeeper/deleted/.del-datadict_show_schema.inc~b6dc1e8ed481fa92:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
BitKeeper/deleted/.del-datadict_show_table_design.inc~517436f76de0716b:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  Rename: BitKeeper/deleted/.del-datadict_show_schema.inc -> mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc:
  Rename: BitKeeper/deleted/.del-datadict_show_table_design.inc -> mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
BitKeeper/deleted/.del-datadict_tables.inc~cf3c01f9d1cd0cdf:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc
BitKeeper/deleted/.del-datadict_tables_error.inc~5516c7f2d254fdee:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
BitKeeper/deleted/.del-datadict_tables_error_1.inc~18e7ad369f9eb3fd:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
BitKeeper/deleted/.del-datadict_tables_error_1044.inc~3cfe7748d18be96c:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
BitKeeper/deleted/.del-datadict_tables_error_1049.inc~61e79841bf09fc97:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1044.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1049.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
BitKeeper/deleted/.del-datadict_tables_error_1051.inc~e637de2d82fa7519:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
BitKeeper/deleted/.del-datadict_tables_error_1146.inc~3f6d5feff7f0e9d0:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
BitKeeper/deleted/.del-datadict_tables_error_1288.inc~2f5deb63fbe93e71:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1051.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1146.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
BitKeeper/deleted/.del-create_database.inc~ef2ebad71f178a1c:
  Delete: mysql-test/suite/funcs_1/include/create_database.inc
BitKeeper/deleted/.del-create_user_lowest_priv.inc~6f636433dda5160c:
  Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc:
  Rename: BitKeeper/deleted/.del-datadict_tables_error_1288.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
mysql-test/suite/funcs_1/include/create_database.inc:
  Rename: BitKeeper/deleted/.del-create_database.inc -> mysql-test/suite/funcs_1/include/create_database.inc
mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc:
  Rename: BitKeeper/deleted/.del-create_user_lowest_priv.inc -> mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
BitKeeper/deleted/.del-create_user_no_super.inc~1d0bed25cc65132f:
  Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc
BitKeeper/deleted/.del-innodb_tb1.inc~7e6d03d2ddf3b609:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb1.inc
BitKeeper/deleted/.del-innodb_tb2.inc~2ab09e131335c5ac:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb2.inc
mysql-test/suite/funcs_1/include/create_user_no_super.inc:
  Rename: BitKeeper/deleted/.del-create_user_no_super.inc -> mysql-test/suite/funcs_1/include/create_user_no_super.inc
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
  Rename: BitKeeper/deleted/.del-innodb_tb1.inc -> mysql-test/suite/funcs_1/include/innodb_tb1.inc
BitKeeper/deleted/.del-innodb_tb3.inc~ce29b178da64097:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb3.inc
BitKeeper/deleted/.del-innodb_tb4.inc~912d46a6ce99beb:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb4.inc
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
  Rename: BitKeeper/deleted/.del-innodb_tb2.inc -> mysql-test/suite/funcs_1/include/innodb_tb2.inc
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
  Rename: BitKeeper/deleted/.del-innodb_tb3.inc -> mysql-test/suite/funcs_1/include/innodb_tb3.inc
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
  Rename: BitKeeper/deleted/.del-innodb_tb4.inc -> mysql-test/suite/funcs_1/include/innodb_tb4.inc
BitKeeper/deleted/.del-memory_tb1.inc~26b9bca8492b8ef0:
  Delete: mysql-test/suite/funcs_1/include/memory_tb1.inc
BitKeeper/deleted/.del-memory_tb2.inc~9789d498ce902299:
  Delete: mysql-test/suite/funcs_1/include/memory_tb2.inc
BitKeeper/deleted/.del-memory_tb3.inc~f68852743e949b69:
  Delete: mysql-test/suite/funcs_1/include/memory_tb3.inc
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Rename: BitKeeper/deleted/.del-memory_tb1.inc -> mysql-test/suite/funcs_1/include/memory_tb1.inc
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Rename: BitKeeper/deleted/.del-memory_tb2.inc -> mysql-test/suite/funcs_1/include/memory_tb2.inc
BitKeeper/deleted/.del-memory_tb4.inc~19ec0e6953e071e6:
  Delete: mysql-test/suite/funcs_1/include/memory_tb4.inc
BitKeeper/deleted/.del-myisam_tb1.inc~9f4487705fda1b27:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb1.inc
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Rename: BitKeeper/deleted/.del-memory_tb3.inc -> mysql-test/suite/funcs_1/include/memory_tb3.inc
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Rename: BitKeeper/deleted/.del-memory_tb4.inc -> mysql-test/suite/funcs_1/include/memory_tb4.inc
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
  Rename: BitKeeper/deleted/.del-myisam_tb1.inc -> mysql-test/suite/funcs_1/include/myisam_tb1.inc
BitKeeper/deleted/.del-myisam_tb2.inc~5433401ca94057c3:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb2.inc
BitKeeper/deleted/.del-myisam_tb3.inc~8056471332f80a19:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb3.inc
BitKeeper/deleted/.del-myisam_tb4.inc~5e51596cea151c88:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb4.inc
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
  Rename: BitKeeper/deleted/.del-myisam_tb2.inc -> mysql-test/suite/funcs_1/include/myisam_tb2.inc
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
  Rename: BitKeeper/deleted/.del-myisam_tb3.inc -> mysql-test/suite/funcs_1/include/myisam_tb3.inc
BitKeeper/deleted/.del-show_connection.inc~e779f70c38f084c6:
  Delete: mysql-test/suite/funcs_1/include/show_connection.inc
BitKeeper/deleted/.del-sp_tb.inc~68c5d8cee47a7ebc:
  Delete: mysql-test/suite/funcs_1/include/sp_tb.inc
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
  Rename: BitKeeper/deleted/.del-myisam_tb4.inc -> mysql-test/suite/funcs_1/include/myisam_tb4.inc
mysql-test/suite/funcs_1/include/show_connection.inc:
  Rename: BitKeeper/deleted/.del-show_connection.inc -> mysql-test/suite/funcs_1/include/show_connection.inc
BitKeeper/deleted/.del-DataGen_local.pl~3239b01670d34dde:
  Delete: mysql-test/suite/funcs_1/lib/DataGen_local.pl
BitKeeper/deleted/.del-DataGen_modify.pl~b7fa80d2d927dae6:
  Delete: mysql-test/suite/funcs_1/lib/DataGen_modify.pl
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Rename: BitKeeper/deleted/.del-sp_tb.inc -> mysql-test/suite/funcs_1/include/sp_tb.inc
mysql-test/suite/funcs_1/lib/DataGen_local.pl:
  Rename: BitKeeper/deleted/.del-DataGen_local.pl -> mysql-test/suite/funcs_1/lib/DataGen_local.pl
mysql-test/suite/funcs_1/lib/DataGen_modify.pl:
  Rename: BitKeeper/deleted/.del-DataGen_modify.pl -> mysql-test/suite/funcs_1/lib/DataGen_modify.pl
BitKeeper/deleted/.del-innodb__datadict.result~c02e1f54796a8ca6:
  Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result
BitKeeper/deleted/.del-innodb__load.result~e93101337aed3e72:
  Delete: mysql-test/suite/funcs_1/r/innodb__load.result
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Rename: BitKeeper/deleted/.del-innodb__datadict.result -> mysql-test/suite/funcs_1/r/innodb__datadict.result
mysql-test/suite/funcs_1/r/innodb__load.result:
  Rename: BitKeeper/deleted/.del-innodb__load.result -> mysql-test/suite/funcs_1/r/innodb__load.result
BitKeeper/deleted/.del-innodb_bitdata.result~799181269a7c3f76:
  Delete: mysql-test/suite/funcs_1/r/innodb_bitdata.result
BitKeeper/deleted/.del-innodb_cursors.result~5501346a312eb2c:
  Delete: mysql-test/suite/funcs_1/r/innodb_cursors.result
BitKeeper/deleted/.del-innodb_func_view.result~40832cbc3cd01357:
  Delete: mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/innodb_bitdata.result:
  Rename: BitKeeper/deleted/.del-innodb_bitdata.result -> mysql-test/suite/funcs_1/r/innodb_bitdata.result
mysql-test/suite/funcs_1/r/innodb_cursors.result:
  Rename: BitKeeper/deleted/.del-innodb_cursors.result -> mysql-test/suite/funcs_1/r/innodb_cursors.result
BitKeeper/deleted/.del-innodb_storedproc.result~f519851b98532739:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc.result
BitKeeper/deleted/.del-innodb_storedproc_02.result~4183d0a85e3d9c3f:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Rename: BitKeeper/deleted/.del-innodb_func_view.result -> mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc.result -> mysql-test/suite/funcs_1/r/innodb_storedproc.result
BitKeeper/deleted/.del-innodb_storedproc_03.result~a27277dc4cfcd8b4:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
BitKeeper/deleted/.del-innodb_storedproc_06.result~ebc1ed638105c6a4:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_02.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_03.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_06.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
BitKeeper/deleted/.del-innodb_storedproc_07.result~aef68b204aae26a5:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
BitKeeper/deleted/.del-innodb_storedproc_08.result~110d457978e5bb08:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_07.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
BitKeeper/deleted/.del-innodb_storedproc_10.result~bac006c3f8720ff7:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
BitKeeper/deleted/.del-innodb_trig_0102.result~552e7936f9c3e8b1:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_0102.result
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_08.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_10.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_0102.result -> mysql-test/suite/funcs_1/r/innodb_trig_0102.result
BitKeeper/deleted/.del-innodb_trig_03.result~e0001f2ae0594271:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_03.result
BitKeeper/deleted/.del-innodb_trig_0407.result~30a523819cb1dbce:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_0407.result
BitKeeper/deleted/.del-innodb_trig_08.result~7fb6bf5750a72547:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_08.result
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_03.result -> mysql-test/suite/funcs_1/r/innodb_trig_03.result
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_0407.result -> mysql-test/suite/funcs_1/r/innodb_trig_0407.result
BitKeeper/deleted/.del-innodb_trig_09.result~45bdbd4e78d18c43:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_09.result
BitKeeper/deleted/.del-innodb_trig_1011ext.result~693d4af717160b0:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_08.result -> mysql-test/suite/funcs_1/r/innodb_trig_08.result
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_09.result -> mysql-test/suite/funcs_1/r/innodb_trig_09.result
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_1011ext.result -> mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
BitKeeper/deleted/.del-innodb_trig_frkey.result~f8324099abe39a:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
BitKeeper/deleted/.del-innodb_triggers.result~47d4751cc196bab9:
  Delete: mysql-test/suite/funcs_1/r/innodb_triggers.result
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Rename: BitKeeper/deleted/.del-innodb_trig_frkey.result -> mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
mysql-test/suite/funcs_1/r/innodb_triggers.result:
  Rename: BitKeeper/deleted/.del-innodb_triggers.result -> mysql-test/suite/funcs_1/r/innodb_triggers.result
BitKeeper/deleted/.del-innodb_views.result~f6ee0e22cb353b49:
  Delete: mysql-test/suite/funcs_1/r/innodb_views.result
BitKeeper/deleted/.del-memory__datadict.result~49b74301886e1847:
  Delete: mysql-test/suite/funcs_1/r/memory__datadict.result
BitKeeper/deleted/.del-memory__load.result~e759ae177d135580:
  Delete: mysql-test/suite/funcs_1/r/memory__load.result
mysql-test/suite/funcs_1/r/innodb_views.result:
  Rename: BitKeeper/deleted/.del-innodb_views.result -> mysql-test/suite/funcs_1/r/innodb_views.result
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Rename: BitKeeper/deleted/.del-memory__datadict.result -> mysql-test/suite/funcs_1/r/memory__datadict.result
BitKeeper/deleted/.del-memory_bitdata.result~cbda7481debfd3d2:
  Delete: mysql-test/suite/funcs_1/r/memory_bitdata.result
BitKeeper/deleted/.del-memory_cursors.result~ff9866fb5dfd7e3a:
  Delete: mysql-test/suite/funcs_1/r/memory_cursors.result
mysql-test/suite/funcs_1/r/memory__load.result:
  Rename: BitKeeper/deleted/.del-memory__load.result -> mysql-test/suite/funcs_1/r/memory__load.result
mysql-test/suite/funcs_1/r/memory_bitdata.result:
  Rename: BitKeeper/deleted/.del-memory_bitdata.result -> mysql-test/suite/funcs_1/r/memory_bitdata.result
mysql-test/suite/funcs_1/r/memory_cursors.result:
  Rename: BitKeeper/deleted/.del-memory_cursors.result -> mysql-test/suite/funcs_1/r/memory_cursors.result
BitKeeper/deleted/.del-memory_func_view.result~e552d7de38647c08:
  Delete: mysql-test/suite/funcs_1/r/memory_func_view.result
BitKeeper/deleted/.del-memory_storedproc.result~f448dceb2b3c0663:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc.result
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Rename: BitKeeper/deleted/.del-memory_func_view.result -> mysql-test/suite/funcs_1/r/memory_func_view.result
mysql-test/suite/funcs_1/r/memory_storedproc.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc.result -> mysql-test/suite/funcs_1/r/memory_storedproc.result
BitKeeper/deleted/.del-memory_storedproc_02.result~8fe9a1951ddcddb2:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_02.result
BitKeeper/deleted/.del-memory_storedproc_03.result~da1a54e7f7fb565c:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_03.result
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_02.result -> mysql-test/suite/funcs_1/r/memory_storedproc_02.result
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_03.result -> mysql-test/suite/funcs_1/r/memory_storedproc_03.result
BitKeeper/deleted/.del-memory_storedproc_06.result~a2f933a1c033c7a4:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_06.result
BitKeeper/deleted/.del-memory_storedproc_07.result~2bc5723a4df61278:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_07.result
BitKeeper/deleted/.del-memory_storedproc_08.result~5e68fabd8a121268:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_08.result
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_06.result -> mysql-test/suite/funcs_1/r/memory_storedproc_06.result
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_07.result -> mysql-test/suite/funcs_1/r/memory_storedproc_07.result
BitKeeper/deleted/.del-memory_storedproc_10.result~2eae10df620fed3b:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_10.result
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_08.result -> mysql-test/suite/funcs_1/r/memory_storedproc_08.result
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Rename: BitKeeper/deleted/.del-memory_storedproc_10.result -> mysql-test/suite/funcs_1/r/memory_storedproc_10.result
BitKeeper/deleted/.del-memory_trig_0102.result~6ddf339f2d5523c6:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_0102.result
BitKeeper/deleted/.del-memory_trig_03.result~843e1e88cec532e7:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_03.result
BitKeeper/deleted/.del-memory_trig_0407.result~a561a80e40cd820a:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_0407.result
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Rename: BitKeeper/deleted/.del-memory_trig_0102.result -> mysql-test/suite/funcs_1/r/memory_trig_0102.result
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Rename: BitKeeper/deleted/.del-memory_trig_03.result -> mysql-test/suite/funcs_1/r/memory_trig_03.result
BitKeeper/deleted/.del-memory_trig_08.result~3a5fc5dba5ab1378:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_08.result
BitKeeper/deleted/.del-memory_trig_09.result~f54649a13258f1f9:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_09.result
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Rename: BitKeeper/deleted/.del-memory_trig_0407.result -> mysql-test/suite/funcs_1/r/memory_trig_0407.result
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Rename: BitKeeper/deleted/.del-memory_trig_08.result -> mysql-test/suite/funcs_1/r/memory_trig_08.result
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Rename: BitKeeper/deleted/.del-memory_trig_09.result -> mysql-test/suite/funcs_1/r/memory_trig_09.result
BitKeeper/deleted/.del-memory_trig_1011ext.result~58022c2cc6d43a43:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
BitKeeper/deleted/.del-memory_triggers.result~4720213a17bd1f8b:
  Delete: mysql-test/suite/funcs_1/r/memory_triggers.result
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Rename: BitKeeper/deleted/.del-memory_trig_1011ext.result -> mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
mysql-test/suite/funcs_1/r/memory_triggers.result:
  Rename: BitKeeper/deleted/.del-memory_triggers.result -> mysql-test/suite/funcs_1/r/memory_triggers.result
BitKeeper/deleted/.del-memory_views.result~d600cc46b350d191:
  Delete: mysql-test/suite/funcs_1/r/memory_views.result
BitKeeper/deleted/.del-myisam__datadict.result~84fd7948204f0fcf:
  Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result
mysql-test/suite/funcs_1/r/memory_views.result:
  Rename: BitKeeper/deleted/.del-memory_views.result -> mysql-test/suite/funcs_1/r/memory_views.result
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Rename: BitKeeper/deleted/.del-myisam__datadict.result -> mysql-test/suite/funcs_1/r/myisam__datadict.result
BitKeeper/deleted/.del-myisam__load.result~a5cdfae657f4420a:
  Delete: mysql-test/suite/funcs_1/r/myisam__load.result
BitKeeper/deleted/.del-myisam_bitdata.result~58a8f4201386a085:
  Delete: mysql-test/suite/funcs_1/r/myisam_bitdata.result
mysql-test/suite/funcs_1/r/myisam__load.result:
  Rename: BitKeeper/deleted/.del-myisam__load.result -> mysql-test/suite/funcs_1/r/myisam__load.result
mysql-test/suite/funcs_1/r/myisam_bitdata.result:
  Rename: BitKeeper/deleted/.del-myisam_bitdata.result -> mysql-test/suite/funcs_1/r/myisam_bitdata.result
BitKeeper/deleted/.del-myisam_cursors.result~49d90d672526a743:
  Delete: mysql-test/suite/funcs_1/r/myisam_cursors.result
BitKeeper/deleted/.del-myisam_func_view.result~534db497d89b6db8:
  Delete: mysql-test/suite/funcs_1/r/myisam_func_view.result
mysql-test/suite/funcs_1/r/myisam_cursors.result:
  Rename: BitKeeper/deleted/.del-myisam_cursors.result -> mysql-test/suite/funcs_1/r/myisam_cursors.result
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Rename: BitKeeper/deleted/.del-myisam_func_view.result -> mysql-test/suite/funcs_1/r/myisam_func_view.result
BitKeeper/deleted/.del-myisam_storedproc.result~11afaec1d6691272:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc.result
BitKeeper/deleted/.del-myisam_storedproc_02.result~da54080b38b800e1:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
BitKeeper/deleted/.del-myisam_storedproc_03.result~f43705b213fa0be7:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc.result -> mysql-test/suite/funcs_1/r/myisam_storedproc.result
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_02.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
BitKeeper/deleted/.del-myisam_storedproc_06.result~82bc7661134f9251:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
BitKeeper/deleted/.del-myisam_storedproc_07.result~43793b065606447:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_03.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_06.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_07.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
BitKeeper/deleted/.del-myisam_storedproc_08.result~a41f1829cf91919d:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
BitKeeper/deleted/.del-myisam_storedproc_10.result~601f1f3b7ff82de6:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_08.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_10.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
BitKeeper/deleted/.del-myisam_trig_0102.result~aa3d68a52b9d9461:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_0102.result
BitKeeper/deleted/.del-myisam_trig_03.result~a958349fc6dbafc4:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_03.result
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_0102.result -> mysql-test/suite/funcs_1/r/myisam_trig_0102.result
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_03.result -> mysql-test/suite/funcs_1/r/myisam_trig_03.result
BitKeeper/deleted/.del-myisam_trig_0407.result~ff5d0269d6f069ac:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_0407.result
BitKeeper/deleted/.del-myisam_trig_08.result~b116c6baef5c9329:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_08.result
BitKeeper/deleted/.del-myisam_trig_09.result~f5e5181e4de57aa2:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_09.result
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_0407.result -> mysql-test/suite/funcs_1/r/myisam_trig_0407.result
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_08.result -> mysql-test/suite/funcs_1/r/myisam_trig_08.result
BitKeeper/deleted/.del-myisam_trig_1011ext.result~188c33cf34d15c28:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
BitKeeper/deleted/.del-myisam_triggers.result~5d09cc9a6e725ae0:
  Delete: mysql-test/suite/funcs_1/r/myisam_triggers.result
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_09.result -> mysql-test/suite/funcs_1/r/myisam_trig_09.result
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Rename: BitKeeper/deleted/.del-myisam_trig_1011ext.result -> mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
BitKeeper/deleted/.del-cleanup_sp_tb.inc~e56fdf367dc4920f:
  Delete: mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
BitKeeper/deleted/.del-myisam_views.result~3f58b2463d68e870:
  Delete: mysql-test/suite/funcs_1/r/myisam_views.result
mysql-test/suite/funcs_1/r/myisam_triggers.result:
  Rename: BitKeeper/deleted/.del-myisam_triggers.result -> mysql-test/suite/funcs_1/r/myisam_triggers.result
mysql-test/suite/funcs_1/r/myisam_views.result:
  Rename: BitKeeper/deleted/.del-myisam_views.result -> mysql-test/suite/funcs_1/r/myisam_views.result
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
  Rename: BitKeeper/deleted/.del-cleanup_sp_tb.inc -> mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
BitKeeper/deleted/.del-load_sp_tb.inc~874151dac20d4609:
  Delete: mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
BitKeeper/deleted/.del-storedproc_02.inc~382fa05b78862c2d:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Rename: BitKeeper/deleted/.del-load_sp_tb.inc -> mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Rename: BitKeeper/deleted/.del-storedproc_02.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
BitKeeper/deleted/.del-storedproc_03.inc~950bd5f0df49c0c0:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
BitKeeper/deleted/.del-storedproc_06.inc~3313ca46f891a104:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Rename: BitKeeper/deleted/.del-storedproc_03.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Rename: BitKeeper/deleted/.del-storedproc_06.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
BitKeeper/deleted/.del-storedproc_07.inc~8af2431ad7ef6a1:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
BitKeeper/deleted/.del-storedproc_08.inc~e2730281eff07089:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
BitKeeper/deleted/.del-storedproc_08_show.inc~756c67bd3b7d61f8:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
mysql-test/suite/funcs_1/storedproc/storedproc_07.inc:
  Rename: BitKeeper/deleted/.del-storedproc_07.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
mysql-test/suite/funcs_1/storedproc/storedproc_08.inc:
  Rename: BitKeeper/deleted/.del-storedproc_08.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
BitKeeper/deleted/.del-storedproc_10.inc~9b2eecdca3bc87e0:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
BitKeeper/deleted/.del-storedproc_master.inc~d06ed09343243344:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc:
  Rename: BitKeeper/deleted/.del-storedproc_08_show.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Rename: BitKeeper/deleted/.del-storedproc_10.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
BitKeeper/deleted/.del-disabled.def~5839f38d337055cd:
  Delete: mysql-test/suite/funcs_1/t/disabled.def
BitKeeper/deleted/.del-innodb__datadict.test~56554dd847c45d1b:
  Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
  Rename: BitKeeper/deleted/.del-storedproc_master.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
mysql-test/suite/funcs_1/t/disabled.def:
  Rename: BitKeeper/deleted/.del-disabled.def~1 -> mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/funcs_1/t/innodb__datadict.test:
  Rename: BitKeeper/deleted/.del-innodb__datadict.test -> mysql-test/suite/funcs_1/t/innodb__datadict.test
BitKeeper/deleted/.del-innodb__load.test~7085d9e6cde80a45:
  Delete: mysql-test/suite/funcs_1/t/innodb__load.test
BitKeeper/deleted/.del-innodb_bitdata.test~85aa8297cea412f0:
  Delete: mysql-test/suite/funcs_1/t/innodb_bitdata.test
BitKeeper/deleted/.del-innodb_cursors.test~b2f689e5aad9ed61:
  Delete: mysql-test/suite/funcs_1/t/innodb_cursors.test
mysql-test/suite/funcs_1/t/innodb__load.test:
  Rename: BitKeeper/deleted/.del-innodb__load.test -> mysql-test/suite/funcs_1/t/innodb__load.test
mysql-test/suite/funcs_1/t/innodb_bitdata.test:
  Rename: BitKeeper/deleted/.del-innodb_bitdata.test -> mysql-test/suite/funcs_1/t/innodb_bitdata.test
BitKeeper/deleted/.del-innodb_func_view.test~cefb7d1dd6010a54:
  Delete: mysql-test/suite/funcs_1/t/innodb_func_view.test
mysql-test/suite/funcs_1/t/innodb_cursors.test:
  Rename: BitKeeper/deleted/.del-innodb_cursors.test -> mysql-test/suite/funcs_1/t/innodb_cursors.test
mysql-test/suite/funcs_1/t/innodb_func_view.test:
  Rename: BitKeeper/deleted/.del-innodb_func_view.test -> mysql-test/suite/funcs_1/t/innodb_func_view.test
BitKeeper/deleted/.del-innodb_storedproc.test~59836b12f28c524a:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc.test
BitKeeper/deleted/.del-innodb_storedproc_02.test~b8a1d59320d17ccd:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
BitKeeper/deleted/.del-innodb_storedproc_03.test~f0a04b626962c3ae:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc.test -> mysql-test/suite/funcs_1/t/innodb_storedproc.test
mysql-test/suite/funcs_1/t/innodb_storedproc_02.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_02.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
BitKeeper/deleted/.del-innodb_storedproc_06.test~f0c4a7598abaa44:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
BitKeeper/deleted/.del-innodb_storedproc_07.test~f5fc9e0a296cff76:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
mysql-test/suite/funcs_1/t/innodb_storedproc_03.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_03.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
mysql-test/suite/funcs_1/t/innodb_storedproc_06.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_06.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
mysql-test/suite/funcs_1/t/innodb_storedproc_07.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_07.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
BitKeeper/deleted/.del-innodb_storedproc_08.test~96c9f3ecc7801edb:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
BitKeeper/deleted/.del-innodb_storedproc_10.test~368950a6728faf08:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
BitKeeper/deleted/.del-innodb_trig_0102.test~4c86148638150f86:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_0102.test
mysql-test/suite/funcs_1/t/innodb_storedproc_08.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_08.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
mysql-test/suite/funcs_1/t/innodb_storedproc_10.test:
  Rename: BitKeeper/deleted/.del-innodb_storedproc_10.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
BitKeeper/deleted/.del-innodb_trig_03.test~b90f32a29fd224d6:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_03.test
BitKeeper/deleted/.del-innodb_trig_0407.test~8b8d01c8c8b107:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_0407.test
mysql-test/suite/funcs_1/t/innodb_trig_0102.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_0102.test -> mysql-test/suite/funcs_1/t/innodb_trig_0102.test
mysql-test/suite/funcs_1/t/innodb_trig_03.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_03.test -> mysql-test/suite/funcs_1/t/innodb_trig_03.test
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_0407.test -> mysql-test/suite/funcs_1/t/innodb_trig_0407.test
BitKeeper/deleted/.del-innodb_trig_08.test~82ea213f59cf5634:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_08.test
BitKeeper/deleted/.del-innodb_trig_09.test~1407c2016d589067:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_09.test
mysql-test/suite/funcs_1/t/innodb_trig_08.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_08.test -> mysql-test/suite/funcs_1/t/innodb_trig_08.test
mysql-test/suite/funcs_1/t/innodb_trig_09.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_09.test -> mysql-test/suite/funcs_1/t/innodb_trig_09.test
BitKeeper/deleted/.del-innodb_trig_1011ext.test~8f405ef2239bcfed:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
BitKeeper/deleted/.del-innodb_trig_frkey.test~7c1c0af7c80de602:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
BitKeeper/deleted/.del-innodb_views.test~460914b9e63a58f0:
  Delete: mysql-test/suite/funcs_1/t/innodb_views.test
mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_1011ext.test -> mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test:
  Rename: BitKeeper/deleted/.del-innodb_trig_frkey.test -> mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
BitKeeper/deleted/.del-memory__datadict.test~97e67292a3c6ebd0:
  Delete: mysql-test/suite/funcs_1/t/memory__datadict.test
BitKeeper/deleted/.del-memory__load.test~a18998091ef9b001:
  Delete: mysql-test/suite/funcs_1/t/memory__load.test
mysql-test/suite/funcs_1/t/innodb_views.test:
  Rename: BitKeeper/deleted/.del-innodb_views.test -> mysql-test/suite/funcs_1/t/innodb_views.test
mysql-test/suite/funcs_1/t/memory__datadict.test:
  Rename: BitKeeper/deleted/.del-memory__datadict.test -> mysql-test/suite/funcs_1/t/memory__datadict.test
mysql-test/suite/funcs_1/t/memory__load.test:
  Rename: BitKeeper/deleted/.del-memory__load.test -> mysql-test/suite/funcs_1/t/memory__load.test
BitKeeper/deleted/.del-memory_bitdata.test~8c3293caa99e7db2:
  Delete: mysql-test/suite/funcs_1/t/memory_bitdata.test
BitKeeper/deleted/.del-memory_cursors.test~208b9d3a3b388e5a:
  Delete: mysql-test/suite/funcs_1/t/memory_cursors.test
BitKeeper/deleted/.del-memory_func_view.test~43ca20a516b29af3:
  Delete: mysql-test/suite/funcs_1/t/memory_func_view.test
mysql-test/suite/funcs_1/t/memory_bitdata.test:
  Rename: BitKeeper/deleted/.del-memory_bitdata.test -> mysql-test/suite/funcs_1/t/memory_bitdata.test
mysql-test/suite/funcs_1/t/memory_cursors.test:
  Rename: BitKeeper/deleted/.del-memory_cursors.test -> mysql-test/suite/funcs_1/t/memory_cursors.test
BitKeeper/deleted/.del-memory_storedproc.test~1b6d3856750b4103:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc.test
BitKeeper/deleted/.del-memory_storedproc_02.test~3d699d9d8cadcec:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_02.test
mysql-test/suite/funcs_1/t/memory_func_view.test:
  Rename: BitKeeper/deleted/.del-memory_func_view.test -> mysql-test/suite/funcs_1/t/memory_func_view.test
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc.test -> mysql-test/suite/funcs_1/t/memory_storedproc.test
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_02.test -> mysql-test/suite/funcs_1/t/memory_storedproc_02.test
BitKeeper/deleted/.del-memory_storedproc_03.test~b8e4f73c53d2d65c:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_03.test
BitKeeper/deleted/.del-memory_storedproc_06.test~6f0344325cdc7e47:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_06.test
BitKeeper/deleted/.del-memory_storedproc_07.test~d72c0c08d46ff3d:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_07.test
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_03.test -> mysql-test/suite/funcs_1/t/memory_storedproc_03.test
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_06.test -> mysql-test/suite/funcs_1/t/memory_storedproc_06.test
BitKeeper/deleted/.del-memory_storedproc_08.test~abb018786b9c9cc4:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_08.test
BitKeeper/deleted/.del-memory_storedproc_10.test~235432215fa35be8:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_10.test
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_07.test -> mysql-test/suite/funcs_1/t/memory_storedproc_07.test
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_08.test -> mysql-test/suite/funcs_1/t/memory_storedproc_08.test
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Rename: BitKeeper/deleted/.del-memory_storedproc_10.test -> mysql-test/suite/funcs_1/t/memory_storedproc_10.test
BitKeeper/deleted/.del-memory_trig_0102.test~14bcf15df5764973:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_0102.test
BitKeeper/deleted/.del-memory_trig_03.test~27016478f8698755:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_03.test
mysql-test/suite/funcs_1/t/memory_trig_0102.test:
  Rename: BitKeeper/deleted/.del-memory_trig_0102.test -> mysql-test/suite/funcs_1/t/memory_trig_0102.test
mysql-test/suite/funcs_1/t/memory_trig_03.test:
  Rename: BitKeeper/deleted/.del-memory_trig_03.test -> mysql-test/suite/funcs_1/t/memory_trig_03.test
BitKeeper/deleted/.del-memory_trig_0407.test~519fa098e2e89a49:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_0407.test
BitKeeper/deleted/.del-memory_trig_08.test~eb12b11ef9e956ca:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_08.test
BitKeeper/deleted/.del-memory_trig_09.test~f53b89eced332954:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_09.test
mysql-test/suite/funcs_1/t/memory_trig_0407.test:
  Rename: BitKeeper/deleted/.del-memory_trig_0407.test -> mysql-test/suite/funcs_1/t/memory_trig_0407.test
mysql-test/suite/funcs_1/t/memory_trig_08.test:
  Rename: BitKeeper/deleted/.del-memory_trig_08.test -> mysql-test/suite/funcs_1/t/memory_trig_08.test
BitKeeper/deleted/.del-memory_trig_1011ext.test~b090a0fc7f12ab08:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
BitKeeper/deleted/.del-memory_views.test~91ffafb774f67137:
  Delete: mysql-test/suite/funcs_1/t/memory_views.test
mysql-test/suite/funcs_1/t/memory_trig_09.test:
  Rename: BitKeeper/deleted/.del-memory_trig_09.test -> mysql-test/suite/funcs_1/t/memory_trig_09.test
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test:
  Rename: BitKeeper/deleted/.del-memory_trig_1011ext.test -> mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
mysql-test/suite/funcs_1/t/memory_views.test:
  Rename: BitKeeper/deleted/.del-memory_views.test -> mysql-test/suite/funcs_1/t/memory_views.test
BitKeeper/deleted/.del-myisam__datadict.test~cae9a60de78fc35d:
  Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test
BitKeeper/deleted/.del-myisam__load.test~475638485078225c:
  Delete: mysql-test/suite/funcs_1/t/myisam__load.test
BitKeeper/deleted/.del-myisam_bitdata.test~12a510e9660ace8b:
  Delete: mysql-test/suite/funcs_1/t/myisam_bitdata.test
mysql-test/suite/funcs_1/t/myisam__datadict.test:
  Rename: BitKeeper/deleted/.del-myisam__datadict.test -> mysql-test/suite/funcs_1/t/myisam__datadict.test
mysql-test/suite/funcs_1/t/myisam__load.test:
  Rename: BitKeeper/deleted/.del-myisam__load.test -> mysql-test/suite/funcs_1/t/myisam__load.test
BitKeeper/deleted/.del-myisam_cursors.test~e14ab9d55d14f27b:
  Delete: mysql-test/suite/funcs_1/t/myisam_cursors.test
BitKeeper/deleted/.del-myisam_func_view.test~1e272349f93f83f2:
  Delete: mysql-test/suite/funcs_1/t/myisam_func_view.test
mysql-test/suite/funcs_1/t/myisam_bitdata.test:
  Rename: BitKeeper/deleted/.del-myisam_bitdata.test -> mysql-test/suite/funcs_1/t/myisam_bitdata.test
mysql-test/suite/funcs_1/t/myisam_cursors.test:
  Rename: BitKeeper/deleted/.del-myisam_cursors.test -> mysql-test/suite/funcs_1/t/myisam_cursors.test
mysql-test/suite/funcs_1/t/myisam_func_view.test:
  Rename: BitKeeper/deleted/.del-myisam_func_view.test -> mysql-test/suite/funcs_1/t/myisam_func_view.test
BitKeeper/deleted/.del-myisam_storedproc.test~2ba6363d2e1a3c34:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc.test
BitKeeper/deleted/.del-myisam_storedproc_02.test~3baa154a9e7da1f9:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc.test -> mysql-test/suite/funcs_1/t/myisam_storedproc.test
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_02.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
BitKeeper/deleted/.del-myisam_storedproc_03.test~b6ca96ed3dfbe37f:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
BitKeeper/deleted/.del-myisam_storedproc_06.test~a4150b544475b75:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
BitKeeper/deleted/.del-myisam_storedproc_07.test~618a6a50ec4ad67e:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_03.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_06.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
BitKeeper/deleted/.del-myisam_storedproc_08.test~84a1b27da7087d9:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
BitKeeper/deleted/.del-myisam_storedproc_10.test~488ef8f94b0e21bd:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_07.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_08.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Rename: BitKeeper/deleted/.del-myisam_storedproc_10.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
BitKeeper/deleted/.del-myisam_trig_0102.test~ba6337bfcf06720f:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_0102.test
BitKeeper/deleted/.del-myisam_trig_03.test~26c97fd2347ce5a5:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_03.test
BitKeeper/deleted/.del-myisam_trig_0407.test~bf799febfd188363:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_0407.test
mysql-test/suite/funcs_1/t/myisam_trig_0102.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_0102.test -> mysql-test/suite/funcs_1/t/myisam_trig_0102.test
mysql-test/suite/funcs_1/t/myisam_trig_03.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_03.test -> mysql-test/suite/funcs_1/t/myisam_trig_03.test
BitKeeper/deleted/.del-myisam_trig_08.test~9dd03c9fb189a2d0:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_08.test
BitKeeper/deleted/.del-myisam_trig_09.test~4706099520d9fcff:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_09.test
mysql-test/suite/funcs_1/t/myisam_trig_0407.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_0407.test -> mysql-test/suite/funcs_1/t/myisam_trig_0407.test
mysql-test/suite/funcs_1/t/myisam_trig_08.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_08.test -> mysql-test/suite/funcs_1/t/myisam_trig_08.test
BitKeeper/deleted/.del-myisam_trig_1011ext.test~33947cfdce83359f:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
BitKeeper/deleted/.del-myisam_views.test~8191b1664f3fb073:
  Delete: mysql-test/suite/funcs_1/t/myisam_views.test
mysql-test/suite/funcs_1/t/myisam_trig_09.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_09.test -> mysql-test/suite/funcs_1/t/myisam_trig_09.test
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
  Rename: BitKeeper/deleted/.del-myisam_trig_1011ext.test -> mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
mysql-test/suite/funcs_1/t/myisam_views.test:
  Rename: BitKeeper/deleted/.del-myisam_views.test -> mysql-test/suite/funcs_1/t/myisam_views.test
BitKeeper/deleted/.del-trig_frkey.inc~ddc32f51b7efc8a7:
  Delete: mysql-test/suite/funcs_1/triggers/trig_frkey.inc
BitKeeper/deleted/.del-trig_frkey2.inc~6e45874f67bff63f:
  Delete: mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
BitKeeper/deleted/.del-triggers_0102.inc~3e3628c21eb1b6b3:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_0102.inc
mysql-test/suite/funcs_1/triggers/trig_frkey.inc:
  Rename: BitKeeper/deleted/.del-trig_frkey.inc -> mysql-test/suite/funcs_1/triggers/trig_frkey.inc
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
  Rename: BitKeeper/deleted/.del-trig_frkey2.inc -> mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
BitKeeper/deleted/.del-triggers_03.inc~952da03e2aa2e366:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_03.inc
BitKeeper/deleted/.del-triggers_0407.inc~26d5f499dcbba3dd:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_0407.inc
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Rename: BitKeeper/deleted/.del-triggers_0102.inc -> mysql-test/suite/funcs_1/triggers/triggers_0102.inc
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Rename: BitKeeper/deleted/.del-triggers_03.inc -> mysql-test/suite/funcs_1/triggers/triggers_03.inc
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Rename: BitKeeper/deleted/.del-triggers_0407.inc -> mysql-test/suite/funcs_1/triggers/triggers_0407.inc
BitKeeper/deleted/.del-triggers_08.inc~23ce6806b152b7fc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_08.inc
BitKeeper/deleted/.del-triggers_09.inc~77f09e3677536d9f:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_09.inc
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Rename: BitKeeper/deleted/.del-triggers_08.inc -> mysql-test/suite/funcs_1/triggers/triggers_08.inc
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Rename: BitKeeper/deleted/.del-triggers_09.inc -> mysql-test/suite/funcs_1/triggers/triggers_09.inc
BitKeeper/deleted/.del-func_view.inc~f237e7bc7e6cfcbc:
  Delete: mysql-test/suite/funcs_1/views/func_view.inc
BitKeeper/deleted/.del-triggers_1011ext.inc~ed096947fb03693:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
BitKeeper/deleted/.del-triggers_master.test~fc19575e956a0b72:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Rename: BitKeeper/deleted/.del-triggers_1011ext.inc -> mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
mysql-test/suite/funcs_1/triggers/triggers_master.test:
  Rename: BitKeeper/deleted/.del-triggers_master.test -> mysql-test/suite/funcs_1/triggers/triggers_master.test
BitKeeper/deleted/.del-fv1.inc~87b440f98d8b8193:
  Delete: mysql-test/suite/funcs_1/views/fv1.inc
BitKeeper/deleted/.del-fv2.inc~26896746173f9122:
  Delete: mysql-test/suite/funcs_1/views/fv2.inc
mysql-test/suite/funcs_1/views/func_view.inc:
  Rename: BitKeeper/deleted/.del-func_view.inc -> mysql-test/suite/funcs_1/views/func_view.inc
mysql-test/suite/funcs_1/views/fv1.inc:
  Rename: BitKeeper/deleted/.del-fv1.inc -> mysql-test/suite/funcs_1/views/fv1.inc
mysql-test/suite/funcs_1/views/fv2.inc:
  Rename: BitKeeper/deleted/.del-fv2.inc -> mysql-test/suite/funcs_1/views/fv2.inc
BitKeeper/deleted/.del-fv_cast.inc~ef53731c7c6dcd27:
  Delete: mysql-test/suite/funcs_1/views/fv_cast.inc
BitKeeper/deleted/.del-fv_if1.inc~86c887a184ab39eb:
  Delete: mysql-test/suite/funcs_1/views/fv_if1.inc
mysql-test/suite/funcs_1/views/fv_cast.inc:
  Rename: BitKeeper/deleted/.del-fv_cast.inc -> mysql-test/suite/funcs_1/views/fv_cast.inc
mysql-test/suite/funcs_1/views/fv_if1.inc:
  Rename: BitKeeper/deleted/.del-fv_if1.inc -> mysql-test/suite/funcs_1/views/fv_if1.inc
BitKeeper/deleted/.del-fv_if2.inc~483e3f7a24f7e55c:
  Delete: mysql-test/suite/funcs_1/views/fv_if2.inc
BitKeeper/deleted/.del-fv_ifnull.inc~fbffea1ccd756112:
  Delete: mysql-test/suite/funcs_1/views/fv_ifnull.inc
BitKeeper/deleted/.del-views_master.inc~2d2a52a68d0d77fd:
  Delete: mysql-test/suite/funcs_1/views/views_master.inc
mysql-test/suite/funcs_1/views/fv_if2.inc:
  Rename: BitKeeper/deleted/.del-fv_if2.inc -> mysql-test/suite/funcs_1/views/fv_if2.inc
mysql-test/suite/funcs_1/views/fv_ifnull.inc:
  Rename: BitKeeper/deleted/.del-fv_ifnull.inc -> mysql-test/suite/funcs_1/views/fv_ifnull.inc
BitKeeper/deleted/.del-README.txt:
  Delete: mysql-test/suite/funcs_1/README.txt
mysql-test/suite/funcs_1/README.txt:
  Rename: BitKeeper/deleted/.del-README.txt-renamed -> mysql-test/suite/funcs_1/README.txt
mysql-test/suite/funcs_1/views/views_master.inc:
  Rename: BitKeeper/deleted/.del-views_master.inc -> mysql-test/suite/funcs_1/views/views_master.inc
2007-07-27 13:32:32 +02:00
unknown
78207030bb Updated/fixed test and result files to 5.0.46
Note datadict files do not include wrong is_updatable wrong value 
     as a result of bug 30020.


mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Updated test file
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated test file
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Updated test file
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Updated test file
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Updated test file
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated test file
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Updated test file
mysql-test/suite/funcs_1/views/func_view.inc:
  Updated test file
2007-07-24 21:31:25 -07:00
unknown
f32d1e9b49 Updated funcs_1 files to 5.1.18 level
- validating current result files
 - updating with new features in information_schema / error messages
 - forced order by and removed time stamps
removed a_version files that are not needed (now that the suite is in the main tree
Note: datadict tests still fail as a result of bug 28181 (a regression introduced in 
      5.0.42 - and 5.1.18(?) - tests should runn clean once it is fixed


BitKeeper/deleted/.del-a_version_check.test~82ea7fb267df9e58:
  Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-a_version_check.result~97a8ec1e3211c26:
  Delete: mysql-test/suite/funcs_1/r/a_version_check.result
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 fooce order by on queries, replace time stamps with strings and enable the
  testing of referential_constraints table
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 by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/innodb_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated result file with order by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/memory_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/memory_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated result file with order by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/myisam_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/ndb__datadict.result:
  Updated result file with order by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/ndb_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/ndb_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/t/disabled.def:
  Updated disabled messages with clearer ones
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Added code to test for error in case of a trigger name that is to long
mysql-test/suite/funcs_1/views/views_master.inc:
  Correction to remove wrong '--eror' meaningless tag that generated warnings
2007-05-02 17:30:23 -07:00
unknown
51d6e623ff 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
2007-05-01 06:52:23 -07:00
unknown
fc71108a8b updates caused by 5.1.16
BitKeeper/etc/ignore:
  Added mysql-test/partitions.log mysql-test/rpl.log to the ignore list
2007-02-08 10:03:17 +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