diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
| commit | 29f0dcb56337a3e352ad7a70dcff6b25bb605325 (patch) | |
| tree | 84935c21dc958724ae7dcbeeca0c0f08986fc430 /sql-bench | |
| parent | 915a624cbcb58a10a2cfb2e2e4fd5029191fa86a (diff) | |
| parent | 8a2454f8e9fce648272577fcf8006ae6e6806cf9 (diff) | |
| download | mariadb-git-29f0dcb56337a3e352ad7a70dcff6b25bb605325.tar.gz | |
Merge MySQL->MariaDB
* Finished Monty and Jani's merge
* Some InnoDB tests still fail (because it's old xtradb code run against
newer testsuite). They are expected to go after mergning with the latest
xtradb.
Diffstat (limited to 'sql-bench')
| -rw-r--r--[-rwxr-xr-x] | sql-bench/README | 0 | ||||
| -rw-r--r-- | sql-bench/as3ap.sh | 2 | ||||
| -rw-r--r-- | sql-bench/bench-count-distinct.sh | 2 | ||||
| -rw-r--r-- | sql-bench/bench-init.pl.sh | 2 | ||||
| -rw-r--r-- | sql-bench/compare-results.sh | 2 | ||||
| -rw-r--r-- | sql-bench/copy-db.sh | 2 | ||||
| -rw-r--r-- | sql-bench/crash-me.sh | 2 | ||||
| -rw-r--r-- | sql-bench/innotest1.sh | 2 | ||||
| -rw-r--r-- | sql-bench/innotest1a.sh | 2 | ||||
| -rw-r--r-- | sql-bench/innotest1b.sh | 2 | ||||
| -rw-r--r-- | sql-bench/innotest2.sh | 2 | ||||
| -rw-r--r-- | sql-bench/innotest2a.sh | 2 | ||||
| -rw-r--r-- | sql-bench/innotest2b.sh | 2 | ||||
| -rw-r--r-- | sql-bench/run-all-tests.sh | 2 | ||||
| -rw-r--r-- | sql-bench/server-cfg.sh | 2 | ||||
| -rw-r--r-- | sql-bench/test-ATIS.sh | 2 | ||||
| -rw-r--r-- | sql-bench/test-alter-table.sh | 2 | ||||
| -rw-r--r-- | sql-bench/test-big-tables.sh | 2 | ||||
| -rw-r--r-- | sql-bench/test-connect.sh | 2 | ||||
| -rw-r--r-- | sql-bench/test-create.sh | 2 | ||||
| -rw-r--r-- | sql-bench/test-insert.sh | 2 | ||||
| -rw-r--r-- | sql-bench/test-select.sh | 2 | ||||
| -rw-r--r-- | sql-bench/test-transactions.sh | 2 | ||||
| -rw-r--r-- | sql-bench/test-wisconsin.sh | 2 |
24 files changed, 23 insertions, 23 deletions
diff --git a/sql-bench/README b/sql-bench/README index 431659a8756..431659a8756 100755..100644 --- a/sql-bench/README +++ b/sql-bench/README diff --git a/sql-bench/as3ap.sh b/sql-bench/as3ap.sh index d84219a37eb..1c672377fd3 100644 --- a/sql-bench/as3ap.sh +++ b/sql-bench/as3ap.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2001, 2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/bench-count-distinct.sh b/sql-bench/bench-count-distinct.sh index 31558aa0b2e..5cc9fb555af 100644 --- a/sql-bench/bench-count-distinct.sh +++ b/sql-bench/bench-count-distinct.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2001, 2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh index 588e518a648..919ddcedf16 100644 --- a/sql-bench/bench-init.pl.sh +++ b/sql-bench/bench-init.pl.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2003, 2005 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/compare-results.sh b/sql-bench/compare-results.sh index 145c4894ca2..fec65497c57 100644 --- a/sql-bench/compare-results.sh +++ b/sql-bench/compare-results.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2001, 2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/copy-db.sh b/sql-bench/copy-db.sh index f74fa68a081..e0c290d2453 100644 --- a/sql-bench/copy-db.sh +++ b/sql-bench/copy-db.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000, 2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh index b28bdba7f9f..cc8659513c2 100644 --- a/sql-bench/crash-me.sh +++ b/sql-bench/crash-me.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # -*- perl -*- # Copyright (C) 2000-2006 MySQL AB # diff --git a/sql-bench/innotest1.sh b/sql-bench/innotest1.sh index 8675de19ae4..1c5450a1d9e 100644 --- a/sql-bench/innotest1.sh +++ b/sql-bench/innotest1.sh @@ -1,4 +1,4 @@ -#!@PERL@
+#!/usr/bin/perl
############################################################################
# Stress test for MySQL/InnoDB combined database
# (c) 2002 Innobase Oy & MySQL AB
diff --git a/sql-bench/innotest1a.sh b/sql-bench/innotest1a.sh index 93f8a2a443b..876100e5de4 100644 --- a/sql-bench/innotest1a.sh +++ b/sql-bench/innotest1a.sh @@ -1,4 +1,4 @@ -#!@PERL@
+#!/usr/bin/perl
############################################################################
# Stress test for MySQL/InnoDB combined database
# (c) 2002 Innobase Oy & MySQL AB
diff --git a/sql-bench/innotest1b.sh b/sql-bench/innotest1b.sh index 48fe96ebe7d..3f6c9f5bd5f 100644 --- a/sql-bench/innotest1b.sh +++ b/sql-bench/innotest1b.sh @@ -1,4 +1,4 @@ -#!@PERL@
+#!/usr/bin/perl
############################################################################
# Stress test for MySQL/InnoDB combined database
# (c) 2002 Innobase Oy & MySQL AB
diff --git a/sql-bench/innotest2.sh b/sql-bench/innotest2.sh index aea44003903..cfeb0527970 100644 --- a/sql-bench/innotest2.sh +++ b/sql-bench/innotest2.sh @@ -1,4 +1,4 @@ -#!@PERL@
+#!/usr/bin/perl
############################################################################
# Stress test for MySQL/InnoDB combined database
# (c) 2002 Innobase Oy & MySQL AB
diff --git a/sql-bench/innotest2a.sh b/sql-bench/innotest2a.sh index 3d4bb9933da..f77ed3ddadd 100644 --- a/sql-bench/innotest2a.sh +++ b/sql-bench/innotest2a.sh @@ -1,4 +1,4 @@ -#!@PERL@
+#!/usr/bin/perl
############################################################################
# Stress test for MySQL/Innobase combined database
# (c) 2000 Innobase Oy & MySQL AB
diff --git a/sql-bench/innotest2b.sh b/sql-bench/innotest2b.sh index 272b6dcffd0..72a71d06c73 100644 --- a/sql-bench/innotest2b.sh +++ b/sql-bench/innotest2b.sh @@ -1,4 +1,4 @@ -#!@PERL@
+#!/usr/bin/perl
############################################################################
# Stress test for MySQL/Innobase combined database
# (c) 2000 Innobase Oy & MySQL AB
diff --git a/sql-bench/run-all-tests.sh b/sql-bench/run-all-tests.sh index 50ac8d0cbe3..a4b03428d94 100644 --- a/sql-bench/run-all-tests.sh +++ b/sql-bench/run-all-tests.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2001, 2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh index a7492f67d1a..5ed7fdf482c 100644 --- a/sql-bench/server-cfg.sh +++ b/sql-bench/server-cfg.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # -*- perl -*- # Copyright (C) 2000-2006 MySQL AB # diff --git a/sql-bench/test-ATIS.sh b/sql-bench/test-ATIS.sh index 6d102fd3977..79b38a95506 100644 --- a/sql-bench/test-ATIS.sh +++ b/sql-bench/test-ATIS.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2001, 2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/test-alter-table.sh b/sql-bench/test-alter-table.sh index eb06582dc0b..36db26f4bf3 100644 --- a/sql-bench/test-alter-table.sh +++ b/sql-bench/test-alter-table.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2001, 2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/test-big-tables.sh b/sql-bench/test-big-tables.sh index 0226967bc54..33694a42e17 100644 --- a/sql-bench/test-big-tables.sh +++ b/sql-bench/test-big-tables.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2001, 2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/test-connect.sh b/sql-bench/test-connect.sh index 84175c357aa..d0f3f0791a4 100644 --- a/sql-bench/test-connect.sh +++ b/sql-bench/test-connect.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2001, 2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/test-create.sh b/sql-bench/test-create.sh index 63672519e61..40fd9c49ae8 100644 --- a/sql-bench/test-create.sh +++ b/sql-bench/test-create.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/test-insert.sh b/sql-bench/test-insert.sh index badc52c99d6..387cb48e494 100644 --- a/sql-bench/test-insert.sh +++ b/sql-bench/test-insert.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/test-select.sh b/sql-bench/test-select.sh index 809755ab4d7..41e8205196e 100644 --- a/sql-bench/test-select.sh +++ b/sql-bench/test-select.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2001, 2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/test-transactions.sh b/sql-bench/test-transactions.sh index 5723c856564..edbfef0e3ce 100644 --- a/sql-bench/test-transactions.sh +++ b/sql-bench/test-transactions.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2001, 2003 MySQL AB # # This library is free software; you can redistribute it and/or diff --git a/sql-bench/test-wisconsin.sh b/sql-bench/test-wisconsin.sh index 38ab93e7f4a..1974461a7c4 100644 --- a/sql-bench/test-wisconsin.sh +++ b/sql-bench/test-wisconsin.sh @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/perl # Copyright (C) 2000-2001, 2003 MySQL AB # # This library is free software; you can redistribute it and/or |