1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler warning and errors

Browse Source 
mysql-test/suite/funcs_1/t/is_engines_federated.test:
  Corrected path
storage/xtradb/fil/fil0fil.c:
  Fixed compiler warning
This commit is contained in:
Michael Widenius 2011-11-30 20:57:09 +02:00
parent 692fcba403
commit 6378bdbf47
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/funcs_1/t/is_engines_federated.test
View File

@ -9,7 +9,7 @@
# #
let $engine_type= FEDERATED; let $engine_type= FEDERATED;
--source suite/federated/have_federated_db.inc --source suite/federated/have_federatedx.inc
--vertical_results --vertical_results
eval SELECT * FROM information_schema.engines eval SELECT * FROM information_schema.engines
WHERE ENGINE = '$engine_type'; WHERE ENGINE = '$engine_type';

4
storage/xtradb/fil/fil0fil.c
View File

@ -3448,8 +3448,8 @@ skip_info:
if ((ulint) (offset / (zip_size ? zip_size : UNIV_PAGE_SIZE)) == root_page[i]) { if ((ulint) (offset / (zip_size ? zip_size : UNIV_PAGE_SIZE)) == root_page[i]) {
if (fil_page_get_type(page) != FIL_PAGE_INDEX) { if (fil_page_get_type(page) != FIL_PAGE_INDEX) {
file_is_corrupt = TRUE; file_is_corrupt = TRUE;
fprintf(stderr, " [etyp:%lld]", fprintf(stderr, " [etyp:%ld]",
offset / (zip_size ? zip_size : UNIV_PAGE_SIZE)); (long) (offset / (zip_size ? zip_size : UNIV_PAGE_SIZE)));
goto skip_write; goto skip_write;
} }
/* this is index root page */ /* this is index root page */