• unknown's avatar
    Merge five.local.lan:/work/merge/mysql-5.0-Bug · 4e4684ce
    unknown authored
    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
    4e4684ce
innodb_trig_frkey.result 4.36 KB