diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-02-15 15:37:38 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-02-15 15:37:38 +0100 |
| commit | 4917073305801822e1a6afbebcf6fc177a6a3d63 (patch) | |
| tree | 266a7623c3a80abbcefa7d944a71419889578ab1 /storage/xtradb/dict/dict0dict.c | |
| parent | 47a54a2e087a7c1fc861bcbc114c14987f492cfe (diff) | |
| parent | 452a59e09c9ae415d46b5900efd567a9fcb61267 (diff) | |
| download | mariadb-git-4917073305801822e1a6afbebcf6fc177a6a3d63.tar.gz | |
Merge XtraDB from Percona-Server-5.5.20-24.1 into MariaDB 5.5.
Diffstat (limited to 'storage/xtradb/dict/dict0dict.c')
| -rw-r--r-- | storage/xtradb/dict/dict0dict.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/xtradb/dict/dict0dict.c b/storage/xtradb/dict/dict0dict.c index 07f22e4d1d6..98cf88455bd 100644 --- a/storage/xtradb/dict/dict0dict.c +++ b/storage/xtradb/dict/dict0dict.c @@ -919,6 +919,11 @@ dict_index_find_on_id_low( dict_table_t* table; dict_index_t* index; + /* This can happen if the system tablespace is the wrong page size */ + if (dict_sys == NULL) { + return(NULL); + } + table = UT_LIST_GET_FIRST(dict_sys->table_LRU); while (table) { |