diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-18 14:11:55 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-18 14:11:55 +0400 |
| commit | 30e7d6709f7fb0f70a07c80a1a06614ca23da5f4 (patch) | |
| tree | 9ba11fd32d82ac5c1364a537532ac896c4dd2058 /sql/sql_cache.cc | |
| parent | 75aabd03d57f85d63d57b25a239b4f930a3ae3c0 (diff) | |
| parent | 3bc094d32a360b7d51600cf11bc4ce24117ecb78 (diff) | |
| download | mariadb-git-30e7d6709f7fb0f70a07c80a1a06614ca23da5f4.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 7849e16a839..f28ce514b29 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -4286,7 +4286,7 @@ my_bool Query_cache::move_by_type(uchar **border, *pprev = block->pprev, *pnext = block->pnext, *new_block =(Query_cache_block *) *border; - uint tablename_offset = block->table()->table() - block->table()->db(); + size_t tablename_offset = block->table()->table() - block->table()->db(); char *data = (char*) block->data(); uchar *key; size_t key_length; @@ -4595,7 +4595,7 @@ uint Query_cache::filename_2_table_key (char *key, const char *path, filename= tablename + dirname_length(tablename + 2) + 2; /* Find start of databasename */ for (dbname= filename - 2 ; dbname[-1] != FN_LIBCHAR ; dbname--) ; - *db_length= (filename - dbname) - 1; + *db_length= (uint32)(filename - dbname) - 1; DBUG_PRINT("qcache", ("table '%-.*s.%s'", *db_length, dbname, filename)); DBUG_RETURN((uint) (strmake(strmake(key, dbname, |