• unknown's avatar
    Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 1b185620
    unknown authored
    into  chilla.local:/home/mydev/mysql-5.1-axmrg
    
    
    configure.in:
      Auto merged
    mysql-test/r/federated.result:
      Auto merged
    mysql-test/t/federated.test:
      Auto merged
    storage/federated/ha_federated.cc:
      Auto merged
    storage/myisam/mi_dynrec.c:
      Auto merged
    1b185620
federated.result 104 KB