• unknown's avatar
    Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3d7999d0
    unknown authored
    into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
    
    
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/share/errmsg.txt:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    3d7999d0
sql_class.cc 74.7 KB