Post-merge fix.

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

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;

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++));