• unknown's avatar
    Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 655a58d8
    unknown authored
    into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
    
    
    sql/ha_ndbcluster.h:
      Auto merged
    sql/sql_trigger.h:
      Auto merged
    mysql-test/r/ndb_trigger.result:
      Using local, will re-generate.
    include/my_base.h:
      Merge
    mysql-test/t/ndb_trigger.test:
      Merge
    sql/ha_ndbcluster.cc:
      Merge
    sql/mysql_priv.h:
      Merge
    sql/sql_delete.cc:
      Merge
    sql/sql_insert.cc:
      Merge
    sql/sql_load.cc:
      Merge
    sql/sql_update.cc:
      Merge
    655a58d8
my_base.h 19.2 KB