database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

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

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
This commit is contained in:
unknown
2005-09-09 10:49:09 +02:00
parent 0ef988ada3 5facb89827
commit cc17a69af6
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
} }
} }
} }