Commit 82d169b0 authored by unknown's avatar unknown
Browse files

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents beb6d8fa 0c10457e

tests/mysql_client_test.c

+0 −1
Original line number Diff line number Diff line
@@ -12932,7 +12932,6 @@ static void test_bug15518() 
  DIE_UNLESS(rc && mysql_stmt_errno(stmt));



  mysql_stmt_close(stmt);

  DIE_UNLESS(mysql_errno(mysql1));

}