diff options
| author | unknown <igor@olga.mysql.com> | 2007-05-31 23:31:59 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-05-31 23:31:59 -0700 |
| commit | 77ea801dec71bcc7dcf188ff24ae15a488c6b015 (patch) | |
| tree | 705562e416ba5e2acdc1fd1d8ddce87cd7083125 | |
| parent | 81ffede7fc31c092e618469d961600d70831c863 (diff) | |
| download | mariadb-git-77ea801dec71bcc7dcf188ff24ae15a488c6b015.tar.gz | |
Post-merge fix.
| -rw-r--r-- | mysql-test/r/user_var.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/user_var.test | 2 | ||||
| -rw-r--r-- | sql/sql_update.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index 25fe18dccaf..d8d7ddef122 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 7919b663a73..da4143bb0d3 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 bddf9e2701d..06415b1b54b 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++)); |