diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-01 00:46:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-01 00:46:13 +0200 |
| commit | 64ceea7a56ba776a226577f7c5ab5b549638f54a (patch) | |
| tree | 0629f9cbe18797606615f10886720da750dc26e8 /storage/pbxt | |
| parent | 7a79fe52fe6081432a4b44483b55ccbf77c4489a (diff) | |
| parent | 8fa14ba6e6c6e7360d0799d703a5af26e2c2c61f (diff) | |
| download | mariadb-git-64ceea7a56ba776a226577f7c5ab5b549638f54a.tar.gz | |
Merge with 5.1 to get fixes for tests and compiler warnings
Diffstat (limited to 'storage/pbxt')
| -rw-r--r-- | storage/pbxt/src/table_xt.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/pbxt/src/table_xt.cc b/storage/pbxt/src/table_xt.cc index 30b844a9184..35b4ea3be3d 100644 --- a/storage/pbxt/src/table_xt.cc +++ b/storage/pbxt/src/table_xt.cc @@ -726,7 +726,7 @@ xtPublic void xt_check_tables(XTThreadPtr self) { u_int edx; XTTableEntryPtr te_ptr; - volatile XTTableHPtr tab; + volatile XTTableHPtr tab= 0; char path[PATH_MAX]; enter_(); @@ -1132,7 +1132,7 @@ static int tab_new_handle(XTThreadPtr self, XTTableHPtr *r_tab, XTDatabaseHPtr d XTOpenFilePtr of_rec, of_ind; XTTableEntryPtr te_ptr; size_t tab_format_offset; - size_t tab_head_size; + size_t tab_head_size= 0; enter_(); |