• unknown's avatar
    Merge mysql.com:/home/hf/work/mrg/my50-mrg · 51f5ac6b
    unknown authored
    into  mysql.com:/home/hf/work/mrg/my51-mrg
    
    
    sql/mysqld.cc:
      Auto merged
    sql/protocol.cc:
      Auto merged
    storage/federated/ha_federated.cc:
      Auto merged
    tests/mysql_client_test.c:
      Auto merged
    include/mysql_com.h:
      merging
    libmysqld/lib_sql.cc:
      merging
    mysql-test/r/federated.result:
      merging
    mysql-test/t/federated.test:
      merging
    storage/federated/ha_federated.h:
      mergin
    51f5ac6b
lib_sql.cc 26.9 KB