diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-03 20:42:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-03 20:42:09 +0200 |
| commit | fcde91114db1a33dcb27338dae0ac6680844f190 (patch) | |
| tree | 729e3e314f7f355e9c448dabd5eb28b040074d15 | |
| parent | d361401bc26f49480daec8b0307afff6edae2ecc (diff) | |
| parent | 1e89c86dd7c21684039c5fa777c358fc2112aec6 (diff) | |
| download | mariadb-git-fcde91114db1a33dcb27338dae0ac6680844f190.tar.gz | |
Merge 10.1 into 10.2
| -rw-r--r-- | sql/sql_cache.cc | 2 | ||||
| -rw-r--r-- | storage/maria/ma_search.c | 14 | ||||
| -rw-r--r-- | storage/myisam/mi_search.c | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 6727be69d07..b5c0e457a36 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1815,7 +1815,7 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length) sql++; continue; } - /* fall trough */ + /* fall through */ default: break; } diff --git a/storage/maria/ma_search.c b/storage/maria/ma_search.c index 089e3fabdb2..39d9322d903 100644 --- a/storage/maria/ma_search.c +++ b/storage/maria/ma_search.c @@ -745,11 +745,11 @@ void _ma_kpointer(register MARIA_HA *info, register uchar *buff, my_off_t pos) case 5: mi_int5store(buff,pos); break; #else case 7: *buff++=0; - /* fall trough */ + /* fall through */ case 6: *buff++=0; - /* fall trough */ + /* fall through */ case 5: *buff++=0; - /* fall trough */ + /* fall through */ #endif case 4: mi_int4store(buff,pos); break; case 3: mi_int3store(buff,pos); break; @@ -881,13 +881,13 @@ void _ma_dpointer(MARIA_SHARE *share, uchar *buff, my_off_t pos) case 5: mi_int5store(buff,pos); break; #else case 8: *buff++=0; - /* fall trough */ + /* fall through */ case 7: *buff++=0; - /* fall trough */ + /* fall through */ case 6: *buff++=0; - /* fall trough */ + /* fall through */ case 5: *buff++=0; - /* fall trough */ + /* fall through */ #endif case 4: mi_int4store(buff,pos); break; case 3: mi_int3store(buff,pos); break; diff --git a/storage/myisam/mi_search.c b/storage/myisam/mi_search.c index 79ed846ce7e..d570f273b74 100644 --- a/storage/myisam/mi_search.c +++ b/storage/myisam/mi_search.c @@ -607,11 +607,11 @@ void _mi_kpointer(register MI_INFO *info, register uchar *buff, my_off_t pos) case 5: mi_int5store(buff,pos); break; #else case 7: *buff++=0; - /* fall trough */ + /* fall through */ case 6: *buff++=0; - /* fall trough */ + /* fall through */ case 5: *buff++=0; - /* fall trough */ + /* fall through */ #endif case 4: mi_int4store(buff,pos); break; case 3: mi_int3store(buff,pos); break; @@ -728,13 +728,13 @@ void _mi_dpointer(MI_INFO *info, uchar *buff, my_off_t pos) case 5: mi_int5store(buff,pos); break; #else case 8: *buff++=0; - /* fall trough */ + /* fall through */ case 7: *buff++=0; - /* fall trough */ + /* fall through */ case 6: *buff++=0; - /* fall trough */ + /* fall through */ case 5: *buff++=0; - /* fall trough */ + /* fall through */ #endif case 4: mi_int4store(buff,pos); break; case 3: mi_int3store(buff,pos); break; |