diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-22 17:55:18 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-22 17:55:18 +0200 |
| commit | cb30429236cb93881ed75ac64ce7be2755819b86 (patch) | |
| tree | 5c88c46555c8f2f0d49c779e6347d2d6139a84e0 /.bzrignore | |
| parent | babfc8971fb478f2d5703c103d22e6976ee72188 (diff) | |
| download | mariadb-git-cb30429236cb93881ed75ac64ce7be2755819b86.tar.gz | |
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
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 936f4c48bb0..b741024bb95 100644 --- a/.bzrignore +++ b/.bzrignore @@ -445,3 +445,4 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl +sql-bench/test-transactions |