diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result
index 25fe18dccafc49c23f96a52bd608b3e612b8323c..d8d7ddef122d36da01834665c62c561d62cbbae0 100644
--- a/mysql-test/r/user_var.result
+++ b/mysql-test/r/user_var.result
@@ -319,7 +319,7 @@ SHOW COUNT(*) ERRORS;
 1
 create table t1(f1 int);
 insert into t1 values(1),(1),(2);
-select @a:=f1, count(f1) from t1 group by 1;
+select @a:=f1, count(f1) from t1 group by 1 order by 1;
 @a:=f1	count(f1)
 1	2
 2	1
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test
index 7919b663a739b94aa17b4128ba18343d1af58fe7..da4143bb0d3256719dafed5faae714590783d00e 100644
--- a/mysql-test/t/user_var.test
+++ b/mysql-test/t/user_var.test
@@ -228,5 +228,5 @@ SHOW COUNT(*) ERRORS;
 #
 create table t1(f1 int);
 insert into t1 values(1),(1),(2);
-select @a:=f1, count(f1) from t1 group by 1;
+select @a:=f1, count(f1) from t1 group by 1 order by 1;
 drop table t1;
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index bddf9e2701d0e88f3303249c7944603c7a96f231..06415b1b54ba98541c7fc3ca9cada23e48df2ea8 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1656,7 +1656,7 @@ int multi_update::do_updates(bool from_send_error)
       {
         if((local_error=
               tbl->file->rnd_pos(tbl->record[0],
-                                (byte *) tmp_table->field[field_num]->ptr)))
+                                (uchar *) tmp_table->field[field_num]->ptr)))
           goto err;
         field_num++;
       } while((tbl= check_opt_it++));