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

into mysql.com:/home/my/mysql-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
tests/client_test.c:
  Auto merged

1 files changed, 2 insertions, 1 deletions

diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 03ab45957d4..aa4c1282cc1 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -576,7 +576,8 @@ static void print_result()
     else if (!status && changed)
     {
       printf("%s\n%-9s: %s", row[0], row[2], row[3]);
-      found_error=1;
+      if (strcmp(row[2],"note"))
+	found_error=1;
     }
     else
       printf("%-9s: %s", row[2], row[3]);