bk commit into 5.1 tree (iggy:1.2334)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-04 10:56:04-04:00, iggy@stripped +3 -0
  Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my50-bug19024
  into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my51-bug19024
  MERGE: 1.1810.1697.168

  mysql-test/r/user_var.result@stripped, 2006-10-04 10:56:00-04:00,
iggy@stripped +0 -0
    Auto merged
    MERGE: 1.37.1.6

  mysql-test/t/user_var.test@stripped, 2006-10-04 10:56:01-04:00,
iggy@stripped +0 -0
    Auto merged
    MERGE: 1.35.1.3

  sql/set_var.cc@stripped, 2006-10-04 10:56:01-04:00, iggy@stripped +0 -0
    Auto merged
    MERGE: 1.125.5.22

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/bug19024/my51-bug19024/RESYNC

--- 1.188/sql/set_var.cc	2006-10-04 10:56:10 -04:00
+++ 1.189/sql/set_var.cc	2006-10-04 10:56:10 -04:00
@@ -3141,6 +3141,7 @@
 {
   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;
 }

--- 1.44/mysql-test/r/user_var.result	2006-10-04 10:56:10 -04:00
+++ 1.45/mysql-test/r/user_var.result	2006-10-04 10:56:10 -04:00
@@ -215,6 +215,7 @@
 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 @@
 @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

--- 1.38/mysql-test/t/user_var.test	2006-10-04 10:56:10 -04:00
+++ 1.39/mysql-test/t/user_var.test	2006-10-04 10:56:10 -04:00
@@ -144,6 +144,8 @@
 --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;
 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;