diff options
author | unknown <mleich@five.local.lan> | 2008-04-01 13:18:31 +0200 |
---|---|---|
committer | unknown <mleich@five.local.lan> | 2008-04-01 13:18:31 +0200 |
commit | 93f2e39529c000fb3dd1d81277f48f4b28814153 (patch) | |
tree | 9bef45d8b668a4fe201899b632c37c94f9198bc3 /mysql-test/t/tmpdir_basic.test | |
parent | 2c4f9bd4866f446428c09f9e615950a8f1c2ccc9 (diff) | |
download | mariadb-git-93f2e39529c000fb3dd1d81277f48f4b28814153.tar.gz |
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
Diffstat (limited to 'mysql-test/t/tmpdir_basic.test')
0 files changed, 0 insertions, 0 deletions