1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge fix.

Browse Source
This commit is contained in:
igor@olga.mysql.com 2007-05-31 23:31:59 -07:00
parent d460dc700a
commit a24a38df75
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/user_var.result
View File

@ -319,7 +319,7 @@ SHOW COUNT(*) ERRORS;
1 1
create table t1(f1 int); create table t1(f1 int);
insert into t1 values(1),(1),(2); 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) @a:=f1 count(f1)
1 2 1 2
2 1 2 1

2
mysql-test/t/user_var.test
View File

@ -228,5 +228,5 @@ SHOW COUNT(*) ERRORS;
# #
create table t1(f1 int); create table t1(f1 int);
insert into t1 values(1),(1),(2); 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; drop table t1;

2
sql/sql_update.cc
View File

@ -1656,7 +1656,7 @@ int multi_update::do_updates(bool from_send_error)
{ {
if((local_error= if((local_error=
tbl->file->rnd_pos(tbl->record[0], tbl->file->rnd_pos(tbl->record[0],
(byte *) tmp_table->field[field_num]->ptr))) (uchar *) tmp_table->field[field_num]->ptr)))
goto err; goto err;
field_num++; field_num++;
} while((tbl= check_opt_it++)); } while((tbl= check_opt_it++));