Skip to content

Commit a341944

Browse files
author
Ole John Aske
committed
Prepare MTR test for features deprecated in mysql-5.6-cluster-7.3
This is a collection of patches pushed to mysql-trunk-cluster by Jan Wedvik early september 2012 in order to get the daily 'big' tests running. We assumed that this 'trunk' work would eventually be merged into 5.6-cluster-7.3, but they apperently didn't reach a cutoff date for changed merge policy. Thus this fix to rectify that.
1 parent 17f30ce commit a341944

File tree

6 files changed

+12
-14
lines changed

6 files changed

+12
-14
lines changed

mysql-test/suite/ndb_big/bug13637411.cnf

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ ndb-force-send=1
1919
ndb-use-exact-count=0
2020
ndb-extra-logging=1
2121
ndb-autoincrement-prefetch-sz=256
22-
engine-condition-pushdown=1
2322
ndb-wait-connected=600
2423
ndb-wait-setup=300
2524

mysql-test/suite/ndb_big/my.cnf

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ ndb-force-send=1
6565
ndb-use-exact-count=0
6666
ndb-extra-logging=1
6767
ndb-autoincrement-prefetch-sz=256
68-
engine-condition-pushdown=1
6968
ndb-wait-connected=600
7069
ndb-wait-setup=300
7170

mysql-test/suite/ndb_big/rqg_spj.test

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ create temporary table spj_counts_at_startup
2020
# Load simple.zz
2121
# -o => with "oj-extensions"
2222
--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"
2424

2525
##
2626
# run spj_test.yy for 3600 seconds
@@ -35,12 +35,12 @@ create temporary table spj_counts_at_startup
3535
#
3636
let $cmd = $RUN_RQG -g spj_test.yy -t 600;
3737
--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"
4444

4545
drop database spj_myisam;
4646
drop database spj_ndb;

storage/ndb/test/rqg/load_and_run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

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.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ set -e
2020
base="`dirname $0`"
2121
source "$base"/parseargs.sh
2222

23-
ecp="set engine_condition_pushdown=on;"
23+
ecp="set optimizer_switch = 'engine_condition_pushdown=on';"
2424

2525
if [ "$load" ]
2626
then

storage/ndb/test/rqg/run_rqg.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

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.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ set -e
2020
base="`dirname $0`"
2121
source "$base"/parseargs.sh
2222

23-
ecp="set engine_condition_pushdown=on;"
23+
ecp="set optimizer_switch = 'engine_condition_pushdown=on';"
2424

2525
check_query(){
2626
file=$1

storage/ndb/test/rqg/runall.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ opre="$pre.$$"
8686

8787
gensql=${RQG_HOME}/gensql.pl
8888
gendata=${RQG_HOME}/gendata.pl
89-
ecp="set engine_condition_pushdown=on;"
89+
ecp="set optimizer_switch = 'engine_condition_pushdown=on';"
9090

9191
dsn=dbi:mysql:host=${host}:port=${port}:user=root:database=${pre}_myisam
9292
mysqltest="$MYSQLINSTALL/bin/mysqltest -uroot --host=${host} --port=${port}"

0 commit comments

Comments
 (0)