diff options
| author | monty@donna.mysql.com <> | 2000-09-12 03:02:33 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-09-12 03:02:33 +0300 |
| commit | 2776500c220c92bb78df03513cc3dd33588f40e5 (patch) | |
| tree | 051686baf31e5363765879f2437ada3abea6b71b /libmysql | |
| parent | 497007e2bd9cb127d54a4fdb02253301f404ce7f (diff) | |
| download | mariadb-git-2776500c220c92bb78df03513cc3dd33588f40e5.tar.gz | |
Update to new root alloc, OPTIMIZE TABLE and some other changes
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 24aae76225e..1f78dc2153b 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -405,7 +405,7 @@ static void free_rows(MYSQL_DATA *cur) { if (cur) { - free_root(&cur->alloc); + free_root(&cur->alloc,MYF(0)); my_free((gptr) cur,MYF(0)); } } @@ -472,8 +472,8 @@ static void free_old_query(MYSQL *mysql) { DBUG_ENTER("free_old_query"); if (mysql->fields) - free_root(&mysql->field_alloc); - init_alloc_root(&mysql->field_alloc,8192); /* Assume rowlength < 8192 */ + free_root(&mysql->field_alloc,MYF(0)); + init_alloc_root(&mysql->field_alloc,8192,0); /* Assume rowlength < 8192 */ mysql->fields=0; mysql->field_count=0; /* For API */ DBUG_VOID_RETURN; @@ -662,7 +662,7 @@ mysql_free_result(MYSQL_RES *result) } free_rows(result->data); if (result->fields) - free_root(&result->field_alloc); + free_root(&result->field_alloc,MYF(0)); if (result->row) my_free((gptr) result->row,MYF(0)); my_free((gptr) result,MYF(0)); @@ -888,7 +888,7 @@ static MYSQL_DATA *read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, strmov(net->last_error,ER(net->last_errno)); DBUG_RETURN(0); } - init_alloc_root(&result->alloc,8192); /* Assume rowlength < 8192 */ + init_alloc_root(&result->alloc,8192,0); /* Assume rowlength < 8192 */ result->alloc.min_malloc=sizeof(MYSQL_ROWS); prev_ptr= &result->data; result->rows=0; |