• unknown's avatar
    Merge bodhi.local:/opt/local/work/mysql-5.0-root · a1dbe3ac
    unknown authored
    into  bodhi.local:/opt/local/work/mysql-5.0-runtime
    
    
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/sql_update.cc:
      Manual merge.
    a1dbe3ac
ha_ndbcluster.cc 225 KB