• unknown's avatar
    Fixed fulltext after merge from 3.23.45 · cb304292
    unknown authored
    First (incomplete) version of transaction and as3ap tests.
    
    
    BitKeeper/etc/ignore:
      Added sql-bench/test-transactions to the ignore list
    mysql-test/r/fulltext.result:
      Update fulltext results after merge
    sql-bench/Makefile.am:
      Added transaction test
    sql-bench/run-all-tests.sh:
      Added transaction test
    sql-bench/server-cfg.sh:
      Added transaction test
    sql-bench/test-ATIS.sh:
      Cleanup
    sql/item_func.cc:
      Fix bad merge
    sql/mysqld.cc:
      Cleanup
    sql/sql_base.cc:
      Fix bad merge
    sql/sql_delete.cc:
      Cleanup
    sql/sql_parse.cc:
      Fix bad merge
    sql/sql_select.cc:
      Fix bad merge
    sql/sql_union.cc:
      Fix bad merge
    tools/mysqlmanager.c:
      C
    cb304292
item_func.cc 49.3 KB