summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_weight_string.result
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
commitcd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch)
tree95bf82d0e0522c6af708cd28639c82e004b5a264 /mysql-test/r/func_weight_string.result
parentf884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff)
parentd516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff)
downloadmariadb-git-10.2-connector-c-integ.tar.gz
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'mysql-test/r/func_weight_string.result')
-rw-r--r--mysql-test/r/func_weight_string.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/func_weight_string.result b/mysql-test/r/func_weight_string.result
index e63ee4267ea..df5b552d9ab 100644
--- a/mysql-test/r/func_weight_string.result
+++ b/mysql-test/r/func_weight_string.result
@@ -1,5 +1,7 @@
drop table if exists t1;
set global max_allowed_packet=1048576;
+connect conn1,localhost,root,,;
+connection conn1;
set names latin1;
select hex(weight_string(0x010203));
hex(weight_string(0x010203))
@@ -91,6 +93,8 @@ NULL
Warnings:
Warning 1301 Result of cast_as_binary() was larger than max_allowed_packet (1048576) - truncated
Warning 1301 Result of weight_string() was larger than max_allowed_packet (1048576) - truncated
+disconnect conn1;
+connection default;
set global max_allowed_packet=default;
#
# Start of 10.1 tests