diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 23:43:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 23:43:48 +0200 |
| commit | cfad394776a64684f9cb010b7c63e8e749663f83 (patch) | |
| tree | 505411f1a890e945dbdf84c0be0dcabc38ba3cd8 /storage/xtradb/fts | |
| parent | c4dcfb60e807ba8718da971e8bde15511be57ce8 (diff) | |
| parent | 5b8ac23030a59a8ed3636d441180fec571dbe3d1 (diff) | |
| download | mariadb-git-cfad394776a64684f9cb010b7c63e8e749663f83.tar.gz | |
Merge branch 'merge-xtradb-5.6' into 10.0
5.6.29-76.2
Diffstat (limited to 'storage/xtradb/fts')
| -rw-r--r-- | storage/xtradb/fts/fts0opt.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/storage/xtradb/fts/fts0opt.cc b/storage/xtradb/fts/fts0opt.cc index 0703b050848..00b3b4682c3 100644 --- a/storage/xtradb/fts/fts0opt.cc +++ b/storage/xtradb/fts/fts0opt.cc @@ -580,7 +580,7 @@ fts_zip_read_word( #ifdef UNIV_DEBUG ulint i; #endif - byte len = 0; + short len = 0; void* null = NULL; byte* ptr = word->f_str; int flush = Z_NO_FLUSH; @@ -590,7 +590,7 @@ fts_zip_read_word( return(NULL); } - zip->zp->next_out = &len; + zip->zp->next_out = reinterpret_cast<byte*>(&len); zip->zp->avail_out = sizeof(len); while (zip->status == Z_OK && zip->zp->avail_out > 0) { @@ -688,11 +688,12 @@ fts_fetch_index_words( fts_zip_t* zip = static_cast<fts_zip_t*>(user_arg); que_node_t* exp = sel_node->select_list; dfield_t* dfield = que_node_get_val(exp); - byte len = (byte) dfield_get_len(dfield); + short len = static_cast<short>(dfield_get_len(dfield)); void* data = dfield_get_data(dfield); /* Skip the duplicate words. */ - if (zip->word.f_len == len && !memcmp(zip->word.f_str, data, len)) { + if (zip->word.f_len == static_cast<ulint>(len) + && !memcmp(zip->word.f_str, data, len)) { return(TRUE); } @@ -706,7 +707,7 @@ fts_fetch_index_words( ut_a(zip->zp->next_in == NULL); /* The string is prefixed by len. */ - zip->zp->next_in = &len; + zip->zp->next_in = reinterpret_cast<byte*>(&len); zip->zp->avail_in = sizeof(len); /* Compress the word, create output blocks as necessary. */ |