• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 685ccf85
    unknown authored
    into  mysql.com:/home/dlenev/mysql-5.0-bg18437-3
    
    
    mysql-test/t/federated.test:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/sql_delete.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_trigger.cc:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    mysql-test/r/federated.result:
      Manual merge.
    685ccf85
mysql_priv.h 62.6 KB