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

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into lmy004.:/work/mysql-5.0-bug12651
This commit is contained in:
unknown 2005-09-09 11:27:21 +02:00
commit 7d512b157c
4 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/group_by.result
View File

@ -751,13 +751,6 @@ COUNT(DISTINCT(t1.id)) comment
1 NULL 1 NULL
1 a problem 1 a problem
DROP TABLE t1, t2; DROP TABLE t1, t2;
create table t1 (f1 date);
insert into t1 values('2005-06-06');
insert into t1 values('2005-06-06');
select date(left(f1+0,8)) from t1 group by 1;
date(left(f1+0,8))
2005-06-06
drop table t1;
create table t1(f1 varchar(5) key); create table t1(f1 varchar(5) key);
insert into t1 values (1),(2); insert into t1 values (1),(2);
select sql_buffer_result max(f1) is null from t1; select sql_buffer_result max(f1) is null from t1;
@ -767,6 +760,13 @@ select sql_buffer_result max(f1)+1 from t1;
max(f1)+1 max(f1)+1
3 3
drop table t1; drop table t1;
create table t1 (f1 date);
insert into t1 values('2005-06-06');
insert into t1 values('2005-06-06');
select date(left(f1+0,8)) from t1 group by 1;
date(left(f1+0,8))
2005-06-06
drop table t1;
CREATE TABLE t1 (n int); CREATE TABLE t1 (n int);
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
SELECT n+1 AS n FROM t1 GROUP BY n; SELECT n+1 AS n FROM t1 GROUP BY n;

1
mysql-test/r/olap.result
View File

@ -579,6 +579,7 @@ a LENGTH(a) COUNT(*)
1 1 1 1 1 1
2 1 1 2 1 1
NULL NULL 2 NULL NULL 2
DROP TABLE t1;
CREATE TABLE t1(id int, type char(1)); CREATE TABLE t1(id int, type char(1));
INSERT INTO t1 VALUES INSERT INTO t1 VALUES
(1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"), (1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"),

22
mysql-test/t/group_by.test
View File

@ -575,6 +575,12 @@ CREATE TABLE t1 (id varchar(20) NOT NULL);
INSERT INTO t1 VALUES ('trans1'), ('trans2'); INSERT INTO t1 VALUES ('trans1'), ('trans2');
CREATE TABLE t2 (id varchar(20) NOT NULL, err_comment blob NOT NULL); CREATE TABLE t2 (id varchar(20) NOT NULL, err_comment blob NOT NULL);
INSERT INTO t2 VALUES ('trans1', 'a problem'); INSERT INTO t2 VALUES ('trans1', 'a problem');
SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment
FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment;
DROP TABLE t1, t2;
# #
# BUG#12695: Item_func_isnull::update_used_tables # BUG#12695: Item_func_isnull::update_used_tables
# did not update const_item_cache # did not update const_item_cache
@ -585,12 +591,6 @@ select sql_buffer_result max(f1) is null from t1;
select sql_buffer_result max(f1)+1 from t1; select sql_buffer_result max(f1)+1 from t1;
drop table t1; drop table t1;
SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment
FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment;
DROP TABLE t1, t2;
# #
# Bug #12266 GROUP BY expression on DATE column produces result with # Bug #12266 GROUP BY expression on DATE column produces result with
# reduced length # reduced length
@ -612,6 +612,16 @@ SELECT n+1 AS n FROM t1 GROUP BY n;
--enable_ps_protocol --enable_ps_protocol
DROP TABLE t1; DROP TABLE t1;
#
# BUG#12695: Item_func_isnull::update_used_tables
# did not update const_item_cache
#
create table t1(f1 varchar(5) key);
insert into t1 values (1),(2);
select sql_buffer_result max(f1) is null from t1;
select sql_buffer_result max(f1)+1 from t1;
drop table t1;
# End of 4.1 tests # End of 4.1 tests
# #

18
sql/handler.cc
View File

@ -570,12 +570,20 @@ int ha_prepare(THD *thd)
{ {
int err; int err;
statistic_increment(thd->status_var.ha_prepare_count,&LOCK_status); statistic_increment(thd->status_var.ha_prepare_count,&LOCK_status);
if ((err= (*(*ht)->prepare)(thd, all))) if ((*ht)->prepare)
{ {
my_error(ER_ERROR_DURING_COMMIT, MYF(0), err); if ((err= (*(*ht)->prepare)(thd, all)))
ha_rollback_trans(thd, all); {
error=1; my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
break; ha_rollback_trans(thd, all);
error=1;
break;
}
}
else
{
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_ILLEGAL_HA, ER(ER_ILLEGAL_HA), (*ht)->name);
} }
} }
} }