• unknown's avatar
    Merge bk-internal:/home/bk/mysql-5.0-engines · 01d3a61f
    unknown authored
    into  mysql.com:/home/jimw/my/mysql-5.0-16494
    
    
    sql/ha_federated.cc:
      Auto merged
    mysql-test/r/federated.result:
      Resolve conflict
    mysql-test/t/federated.test:
      Resolve conflict
    01d3a61f
federated.result 99.9 KB