mirror of
https://github.com/MariaDB/server.git
synced 2026-04-28 19:25:32 +02:00
Fixed fulltext after merge from 3.23.45
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
This commit is contained in:
parent
e673b6dcf8
commit
38357b30e6
16 changed files with 1030 additions and 86 deletions
|
|
@ -21,13 +21,15 @@ benchdir_root= $(prefix)
|
|||
benchdir = $(benchdir_root)/sql-bench
|
||||
bench_SCRIPTS = test-ATIS test-connect test-create test-insert \
|
||||
test-big-tables test-select test-wisconsin \
|
||||
test-alter-table graph-compare-results \
|
||||
test-alter-table test-transactions \
|
||||
graph-compare-results \
|
||||
bench-init.pl compare-results run-all-tests \
|
||||
server-cfg crash-me copy-db bench-count-distinct
|
||||
CLEANFILES = $(bench_SCRIPTS)
|
||||
EXTRA_SCRIPTS = test-ATIS.sh test-connect.sh test-create.sh \
|
||||
test-insert.sh test-big-tables.sh test-select.sh \
|
||||
test-alter-table.sh test-wisconsin.sh \
|
||||
test-transactions.sh \
|
||||
bench-init.pl.sh compare-results.sh server-cfg.sh \
|
||||
run-all-tests.sh crash-me.sh copy-db.sh \
|
||||
bench-count-distinct.sh graph-compare-results.sh
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue