• unknown's avatar
    Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 · 56cdc1f3
    unknown authored
    into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
    
    
    Makefile.am:
      Auto merged
    client/mysqltest.c:
      Auto merged
    configure.in:
      Auto merged
    extra/Makefile.am:
      Auto merged
    include/Makefile.am:
      Auto merged
    include/my_global.h:
      Auto merged
    libmysqld/examples/Makefile.am:
      Auto merged
    mysql-test/Makefile.am:
      Auto merged
    mysql-test/r/ndb_alter_table.result:
      Auto merged
    mysql-test/t/ndb_alter_table.test:
      Auto merged
    scripts/Makefile.am:
      Auto merged
    sql/Makefile.am:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/ha_federated.cc:
      Auto merged
    sql/ha_federated.h:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    sql/ha_myisammrg.cc:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item_subselect.cc:
      Auto merged
    sql/key.cc:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/opt_range.cc:
      Auto merged
    sq...
    56cdc1f3
Makefile.am 4.27 KB