• unknown's avatar
    Post merge fix for · 93f2e395
    unknown authored
       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
    93f2e395