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 | 38357b30e6ccf4278807cbd8b91ca14efe3fff15 (patch) | |
| tree | 5c88c46555c8f2f0d49c779e6347d2d6139a84e0 /sql-bench/test-ATIS.sh | |
| parent | e673b6dcf8b55ec4457ab554a1c09ccf3c079463 (diff) | |
| download | mariadb-git-38357b30e6ccf4278807cbd8b91ca14efe3fff15.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 'sql-bench/test-ATIS.sh')
| -rw-r--r-- | sql-bench/test-ATIS.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql-bench/test-ATIS.sh b/sql-bench/test-ATIS.sh index fa66dadd03e..da866f2eb66 100644 --- a/sql-bench/test-ATIS.sh +++ b/sql-bench/test-ATIS.sh @@ -125,8 +125,7 @@ if (!$opt_skip_create) chomp; next unless ( $_ =~ /\w/ ); # skip blank lines my $command = $insert_start . $_ . ")"; - $command =~ s/\'\'/\' \'/g if ($opt_server =~ /empress/i || $opt_server =~ /oracle/i); - $command =~ s/\\'//g if ($opt_server =~ /informix/i); + $command = $server->fix_for_insert($command); print "$command\n" if ($opt_debug); $command =~ s/\\'/\'\'/g if ($double_quotes); |