File tree 6 files changed +12
-14
lines changed
6 files changed +12
-14
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,6 @@ ndb-force-send=1
19
19
ndb-use-exact-count =0
20
20
ndb-extra-logging =1
21
21
ndb-autoincrement-prefetch-sz =256
22
- engine-condition-pushdown =1
23
22
ndb-wait-connected =600
24
23
ndb-wait-setup =300
25
24
Original file line number Diff line number Diff line change @@ -65,7 +65,6 @@ ndb-force-send=1
65
65
ndb-use-exact-count =0
66
66
ndb-extra-logging =1
67
67
ndb-autoincrement-prefetch-sz =256
68
- engine-condition-pushdown =1
69
68
ndb-wait-connected =600
70
69
ndb-wait-setup =300
71
70
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ create temporary table spj_counts_at_startup
20
20
# Load simple.zz
21
21
# -o => with "oj-extensions"
22
22
--echo Calling: $LOAD_RQG -d simple.zz -o
23
- --system $LOAD_RQG -d simple.zz -o
23
+ --exec bash -c " $LOAD_RQG -d simple.zz -o"
24
24
25
25
##
26
26
# run spj_test.yy for 3600 seconds
@@ -35,12 +35,12 @@ create temporary table spj_counts_at_startup
35
35
#
36
36
let $cmd = $RUN_RQG -g spj_test.yy -t 600;
37
37
--echo Calling: $cmd (6 times)
38
- --system $cmd
39
- --system $cmd
40
- --system $cmd
41
- --system $cmd
42
- --system $cmd
43
- --system $cmd
38
+ --exec bash -c " $cmd"
39
+ --exec bash -c " $cmd"
40
+ --exec bash -c " $cmd"
41
+ --exec bash -c " $cmd"
42
+ --exec bash -c " $cmd"
43
+ --exec bash -c " $cmd"
44
44
45
45
drop database spj_myisam;
46
46
drop database spj_ndb;
Original file line number Diff line number Diff line change 1
1
#! /bin/sh
2
2
3
- # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
3
+ # Copyright (c) 2011, 2013 Oracle and/or its affiliates. All rights reserved.
4
4
#
5
5
# This program is free software; you can redistribute it and/or modify
6
6
# it under the terms of the GNU General Public License as published by
20
20
base=" ` dirname $0 ` "
21
21
source " $base " /parseargs.sh
22
22
23
- ecp=" set engine_condition_pushdown=on;"
23
+ ecp=" set optimizer_switch = ' engine_condition_pushdown=on' ;"
24
24
25
25
if [ " $load " ]
26
26
then
Original file line number Diff line number Diff line change 1
1
#! /bin/sh
2
2
3
- # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
3
+ # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
4
4
#
5
5
# This program is free software; you can redistribute it and/or modify
6
6
# it under the terms of the GNU General Public License as published by
20
20
base=" ` dirname $0 ` "
21
21
source " $base " /parseargs.sh
22
22
23
- ecp=" set engine_condition_pushdown=on;"
23
+ ecp=" set optimizer_switch = ' engine_condition_pushdown=on' ;"
24
24
25
25
check_query (){
26
26
file=$1
Original file line number Diff line number Diff line change @@ -86,7 +86,7 @@ opre="$pre.$$"
86
86
87
87
gensql=${RQG_HOME} /gensql.pl
88
88
gendata=${RQG_HOME} /gendata.pl
89
- ecp=" set engine_condition_pushdown=on;"
89
+ ecp=" set optimizer_switch = ' engine_condition_pushdown=on' ;"
90
90
91
91
dsn=dbi:mysql:host=${host} :port=${port} :user=root:database=${pre} _myisam
92
92
mysqltest=" $MYSQLINSTALL /bin/mysqltest -uroot --host=${host} --port=${port} "
You can’t perform that action at this time.
0 commit comments