• unknown's avatar
    Merge mysql.com:/home/kostja/mysql/tmp_merge · dc14ce5e
    unknown authored
    into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
    
    
    configure.in:
      Auto merged
    include/heap.h:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    mysql-test/r/date_formats.result:
      Auto merged
    mysql-test/t/date_formats.test:
      Auto merged
    sql/ha_heap.cc:
      Auto merged
    sql/ha_heap.h:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_select.h:
      Auto merged
    storage/heap/hp_create.c:
      Auto merged
    storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
      Auto merged
    storage/ndb/test/ndbapi/testBlobs.cpp:
      Auto merged
    sql/sql_update.cc:
      Manual merge
    tests/mysql_client_test.c:
      SCCS merged
    dc14ce5e
hp_create.c 8.99 KB