mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
This commit is contained in:
@ -113,7 +113,9 @@ static void client_disconnect();
|
||||
|
||||
void die(const char *file, int line, const char *expr)
|
||||
{
|
||||
fflush(stdout);
|
||||
fprintf(stderr, "%s:%d: check failed: '%s'\n", file, line, expr);
|
||||
fflush(stderr);
|
||||
abort();
|
||||
}
|
||||
|
||||
@ -11776,6 +11778,7 @@ static void test_bug11718()
|
||||
printf("return type: %s", (res->fields[0].type == MYSQL_TYPE_DATE)?"DATE":
|
||||
"not DATE");
|
||||
DIE_UNLESS(res->fields[0].type == MYSQL_TYPE_DATE);
|
||||
mysql_free_result(res);
|
||||
rc= mysql_query(mysql, "drop table t1, t2");
|
||||
myquery(rc);
|
||||
}
|
||||
@ -11847,6 +11850,7 @@ static void test_bug15613()
|
||||
DIE_UNLESS(field[4].length == 255);
|
||||
DIE_UNLESS(field[5].length == 255);
|
||||
DIE_UNLESS(field[6].length == 255);
|
||||
mysql_free_result(metadata);
|
||||
|
||||
/* III. Cleanup */
|
||||
rc= mysql_query(mysql, "drop table t1");
|
||||
|
Reference in New Issue
Block a user