diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-03 20:41:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-03 20:41:34 +0200 |
| commit | 1e89c86dd7c21684039c5fa777c358fc2112aec6 (patch) | |
| tree | 05078c5d82e50a09ae49666c4e9a7fcc103a1b9f | |
| parent | 016caa3d202ee1f020ff84613b345c8f3bacdce3 (diff) | |
| parent | 8ac1982fcc116f00123b5a6a485163170d48071b (diff) | |
| download | mariadb-git-1e89c86dd7c21684039c5fa777c358fc2112aec6.tar.gz | |
Merge 10.0 into 10.1
| -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 66ac2449519..4f19fa15e6f 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1788,7 +1788,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 951850b16a4..0132dc95e5e 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 60a34c641ad..92f28f4e32a 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; |