• unknown's avatar
    Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 69bfcd9c
    unknown authored
    into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
    
    
    client/mysql.cc:
      Auto merged
    client/mysqltest.c:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/mysqltest.result:
      Auto merged
    mysql-test/t/mysqltest.test:
      Auto merged
    mysys/my_init.c:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    Makefile.am:
      Manual merge
    mysql-test/r/cast.result:
      Manual merge
    mysql-test/t/cast.test:
      Manual merge
    ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
      Manual merge
    sql/ha_ndbcluster.cc:
      Manual merge
    sql/item.h:
      Manual merge
    sql/opt_sum.cc:
      Manual merge
    sql/sql_delete.cc:
      Manual merge
    sql/sql_lex.cc:
      Manual merge
    sql/sql_load.cc:
      Manual merge
    sql/sql_prepare.cc:
      Manual merge
    69bfcd9c
mysqltest.test 24.6 KB