Commit 7daf06b0 authored by unknown's avatar unknown
Browse files

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

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my51-bug19024


mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql/set_var.cc:
  Auto merged
parents 1b212ad9 aaef575f

mysql-test/r/user_var.result

+9 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/user_var.test

+9 −1
Original line number Diff line number Diff line
@@ -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;

sql/set_var.cc

+1 −0
Original line number Diff line number Diff line
@@ -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;

}