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

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my50-bug19024

Browse Source 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my51-bug19024
This commit is contained in:
iggy@rolltop.ignatz42.dyndns.org
2006-10-04 10:56:04 -04:00
parent 78154af633 d96be311cb
commit d74a6e1dc1
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,6 +215,7 @@ select @@version;
select @@global.version;
@@global.version
#
End of 4.1 tests
set @first_var= NULL;
create table t1 select @first_var;
show create table t1;
@ -301,3 +302,11 @@ select @var;
@var
3
drop table t1;
insert into city 'blah';
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''blah'' at line 1
SHOW COUNT(*) WARNINGS;
@@session.warning_count
1
SHOW COUNT(*) ERRORS;
@@session.error_count
1

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

@ -144,6 +144,8 @@ select @@version;
--replace_column 1 #
select @@global.version;
--echo End of 4.1 tests
# Bug #6598: problem with cast(NULL as signed integer);
#
@ -210,4 +212,10 @@ select @var:=f2 from t1 group by f1 order by f2 desc limit 1;
select @var;
drop table t1;
# End of 4.1 tests
#
# Bug#19024 - SHOW COUNT(*) WARNINGS not return Errors
#
--error 1064
insert into city 'blah';
SHOW COUNT(*) WARNINGS;
SHOW COUNT(*) ERRORS;

1
sql/set_var.cc
View File

@ -3141,6 +3141,7 @@ static byte *get_warning_count(THD *thd)
{
thd->sys_var_tmp.long_value=
(thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_NOTE] +
thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_ERROR] +
thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_WARN]);
return (byte*) &thd->sys_var_tmp.long_value;
}