Merge with MariaDB 5.1

1 files changed, 25 insertions, 0 deletions

diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 51d12130b13..40cb32909f1 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -343,6 +343,14 @@ eval select $mysql_errno as "after_!errno_masked_error" ;
 EOF
 
 # ----------------------------------------------------------------------------
+# Check backtick and query_get_value, result should be empty
+# ----------------------------------------------------------------------------
+let $empty= `garbage`;
+echo $empty is empty;
+let $empty= query_get_value(nonsense, blabla, 1);
+echo $empty is empty;
+
+# ----------------------------------------------------------------------------
 # Switch the abort on error on and check the effect on $mysql_errno
 # ----------------------------------------------------------------------------
 --error ER_PARSE_ERROR
@@ -373,6 +381,23 @@ select 3 from t1 ;
 
 
 # ----------------------------------------------------------------------------
+# Test --error with backtick operator or query_get_value
+# ----------------------------------------------------------------------------
+
+--error 0,ER_NO_SUCH_TABLE
+let $empty= `SELECT foo from bar`;
+echo $empty is empty;
+
+--error 0,ER_BAD_FIELD_ERROR
+let $empty= query_get_value(SELECT bar as foo, baz, 1);
+echo $empty is empty;
+
+--error 0,ER_NO_SUCH_TABLE
+if (!`SELECT foo from bar`) {
+  echo "Yes it's empty";
+}
+
+# ----------------------------------------------------------------------------
 # Test comments
 # ----------------------------------------------------------------------------