diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-09-03 19:42:54 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-09-03 19:42:54 +0200 |
| commit | c21a7a6bb2bed5f159dfba64e7a5220a5ee78cab (patch) | |
| tree | aab22730a36718adb824289458f98b86006f5c32 /storage/xtradb/page | |
| parent | 401c69e49babc293da30f833c18673f5f071eca3 (diff) | |
| parent | 9ec2d5b6e510b9a3ad2fd54c37eb302c0121f9e3 (diff) | |
| download | mariadb-git-c21a7a6bb2bed5f159dfba64e7a5220a5ee78cab.tar.gz | |
Merge XtraDB from Percona server 5.1.49-12 into MariaDB.
Diffstat (limited to 'storage/xtradb/page')
| -rw-r--r-- | storage/xtradb/page/page0zip.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/xtradb/page/page0zip.c b/storage/xtradb/page/page0zip.c index 7ef44f3246f..a94d2d54417 100644 --- a/storage/xtradb/page/page0zip.c +++ b/storage/xtradb/page/page0zip.c @@ -571,7 +571,7 @@ page_zip_dir_encode( /* Traverse the list of stored records in the collation order, starting from the first user record. */ - rec = page + PAGE_NEW_INFIMUM, TRUE; + rec = page + PAGE_NEW_INFIMUM; i = 0; @@ -1153,6 +1153,10 @@ page_zip_compress( FILE* logfile = NULL; #endif + if (!page) { + return(FALSE); + } + ut_a(page_is_comp(page)); ut_a(fil_page_get_type(page) == FIL_PAGE_INDEX); ut_ad(page_simple_validate_new((page_t*) page)); @@ -1464,6 +1468,7 @@ page_zip_fields_free( dict_table_t* table = index->table; mem_heap_free(index->heap); mutex_free(&(table->autoinc_mutex)); + ut_free(table->name); mem_heap_free(table->heap); } } |