diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-01-27 15:14:57 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-01-27 16:40:15 +0100 |
| commit | 02cc921a449d847a27a1a942ff5a5b2b9885b1bb (patch) | |
| tree | d08cd8219a3f65a91e7acac9128eca2568ede6d6 | |
| parent | 4b31e6dc95c7c008cd318822eb9d5a1e845b288c (diff) | |
| download | mariadb-git-02cc921a449d847a27a1a942ff5a5b2b9885b1bb.tar.gz | |
compiler warnings
| -rw-r--r-- | sql/sql_show.cc | 1 | ||||
| -rw-r--r-- | storage/innobase/include/fil0fil.ic | 2 | ||||
| -rw-r--r-- | storage/xtradb/include/fil0fil.ic | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index b2bf5a9ffb0..6cdef2ee301 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1214,7 +1214,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) String buffer(buff, sizeof(buff), system_charset_info); List<Item> field_list; bool error= TRUE; - MEM_ROOT *mem_root= thd->mem_root; DBUG_ENTER("mysqld_show_create"); DBUG_PRINT("enter",("db: %s table: %s",table_list->db, table_list->table_name)); diff --git a/storage/innobase/include/fil0fil.ic b/storage/innobase/include/fil0fil.ic index 0f8c8ff3b00..5654d8f6178 100644 --- a/storage/innobase/include/fil0fil.ic +++ b/storage/innobase/include/fil0fil.ic @@ -148,7 +148,7 @@ fil_page_type_validate( fprintf(stderr, "InnoDB: Space %lu offset %lu name %s page_type %lu page_type_name %s\n" "InnoDB: key_version %u page_compressed %d page_compressed_encrypted %d lsn %llu compressed_len %lu\n", space, offset, rspace->name, page_type, fil_get_page_type_name(page_type), - key_version, page_compressed, page_compressed_encrypted, lsn, compressed_len); + key_version, page_compressed, page_compressed_encrypted, (ulonglong)lsn, compressed_len); fflush(stderr); ut_ad(page_type == FIL_PAGE_PAGE_COMPRESSED || diff --git a/storage/xtradb/include/fil0fil.ic b/storage/xtradb/include/fil0fil.ic index 2aa00d86b02..7ccc69b9561 100644 --- a/storage/xtradb/include/fil0fil.ic +++ b/storage/xtradb/include/fil0fil.ic @@ -149,7 +149,7 @@ fil_page_type_validate( fprintf(stderr, "InnoDB: Space %lu offset %lu name %s page_type %lu page_type_name %s\n" "InnoDB: key_version %u page_compressed %d page_compressed_encrypted %d lsn %llu compressed_len %lu\n", space, offset, rspace->name, page_type, fil_get_page_type_name(page_type), - key_version, page_compressed, page_compressed_encrypted, lsn, compressed_len); + key_version, page_compressed, page_compressed_encrypted, (ulonglong)lsn, compressed_len); fflush(stderr); ut_ad(page_type == FIL_PAGE_PAGE_COMPRESSED || |