summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysqltest.test
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-01-11 15:15:25 +0100
committerBjorn Munch <bjorn.munch@oracle.com>2011-01-11 15:15:25 +0100
commit8937cbd5ae593cc29b1473e18a0168e285f6fbff (patch)
tree2d39b6be598dc212c963ecd9651ec3292cfcd39b /mysql-test/t/mysqltest.test
parent83fea27b6124f9743a752f5d5cf3bea94763c9d9 (diff)
parente2b73747df97f7a739000671aa2454482b23f1d2 (diff)
downloadmariadb-git-8937cbd5ae593cc29b1473e18a0168e285f6fbff.tar.gz
upmerge 58896,58900,59002
Diffstat (limited to 'mysql-test/t/mysqltest.test')
-rw-r--r--mysql-test/t/mysqltest.test6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 7108b9f9878..9ff92496653 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -859,6 +859,12 @@ insert into t1 values ('`select 42`');
let $a= `select * from t1`;
# This should output `select 42`, not evaluate it again to 42
echo $a;
+insert into t1 values ('$dollar');
+# These should also output the string without evaluating it.
+let $a= query_get_value(select * from t1 order by a, a, 1);
+echo $a;
+let $a= query_get_value(select * from t1 order by a, a, 2);
+echo $a;
drop table t1;
--error 1