mysql-test/t/federated.test · 650e65047a85dde24d96a28e281285951b866554 · nexedi / MariaDB

Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-merge1 · 650e6504

unknown authored Jul 06, 2006

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-merge1


mysql-test/r/federated.result:
  BUG #19773
  
  Hand-merge conflicts from 5.0 to 5.1
mysql-test/t/federated.test:
  BUG #19773
  
  Hand-merge conflicts from 5.0 to 5.1
sql/ha_federated.cc:
  BUG #19773
  
  Hand-merge conflicts from 5.0 to 5.1
sql/ha_federated.h:
  BUG #19773
  
  Hand-merge conflicts from 5.0 to 5.1

650e6504

federated.test 61.7 KB

Replace federated.test