diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-01-19 11:12:24 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-01-19 11:12:24 +0100 |
| commit | 82d169b06c11ab7717abe5f4df24f8cd28afe899 (patch) | |
| tree | efec2b1539b281d00bf5fe4db73f019491f3641c /tests | |
| parent | beb6d8fa5b64cef35a1a7e792a789af2f00de0a8 (diff) | |
| parent | 0c10457ec4a340337ae0a240b4821216dad76bbe (diff) | |
| download | mariadb-git-82d169b06c11ab7717abe5f4df24f8cd28afe899.tar.gz | |
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index c928fd82fc4..224d0ff13b8 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -12932,7 +12932,6 @@ static void test_bug15518() DIE_UNLESS(rc && mysql_stmt_errno(stmt)); mysql_stmt_close(stmt); - DIE_UNLESS(mysql_errno(mysql1)); } |