diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-30 20:57:09 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-30 20:57:09 +0200 |
| commit | 6378bdbf47af72b2f899853586faa5a2d2f0fee1 (patch) | |
| tree | 1927bf59069eec30080016c8177b17f7d5cd8fa5 | |
| parent | 692fcba40397e71c08ed1bcf34d37283eee5a13e (diff) | |
| download | mariadb-git-6378bdbf47af72b2f899853586faa5a2d2f0fee1.tar.gz | |
Fixed compiler warning and errors
mysql-test/suite/funcs_1/t/is_engines_federated.test:
Corrected path
storage/xtradb/fil/fil0fil.c:
Fixed compiler warning
| -rw-r--r-- | mysql-test/suite/funcs_1/t/is_engines_federated.test | 2 | ||||
| -rw-r--r-- | storage/xtradb/fil/fil0fil.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/funcs_1/t/is_engines_federated.test b/mysql-test/suite/funcs_1/t/is_engines_federated.test index 81eac89c0d2..f39edefe43c 100644 --- a/mysql-test/suite/funcs_1/t/is_engines_federated.test +++ b/mysql-test/suite/funcs_1/t/is_engines_federated.test @@ -9,7 +9,7 @@ # let $engine_type= FEDERATED; ---source suite/federated/have_federated_db.inc +--source suite/federated/have_federatedx.inc --vertical_results eval SELECT * FROM information_schema.engines WHERE ENGINE = '$engine_type'; diff --git a/storage/xtradb/fil/fil0fil.c b/storage/xtradb/fil/fil0fil.c index bcf134f4292..17ca4cb1745 100644 --- a/storage/xtradb/fil/fil0fil.c +++ b/storage/xtradb/fil/fil0fil.c @@ -3448,8 +3448,8 @@ skip_info: if ((ulint) (offset / (zip_size ? zip_size : UNIV_PAGE_SIZE)) == root_page[i]) { if (fil_page_get_type(page) != FIL_PAGE_INDEX) { file_is_corrupt = TRUE; - fprintf(stderr, " [etyp:%lld]", - offset / (zip_size ? zip_size : UNIV_PAGE_SIZE)); + fprintf(stderr, " [etyp:%ld]", + (long) (offset / (zip_size ? zip_size : UNIV_PAGE_SIZE))); goto skip_write; } /* this is index root page */ |