diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-03 20:40:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-03 20:40:41 +0200 |
| commit | 8ac1982fcc116f00123b5a6a485163170d48071b (patch) | |
| tree | 6e394a7cb8b1657837ad91ab72f9f1866c1f77a6 | |
| parent | 51e4650ed0644ed88cf5d542bd0cab50e7ea0343 (diff) | |
| parent | 84c9c8b2e9d68d7014e8b3e17e0d6df8efb3215b (diff) | |
| download | mariadb-git-8ac1982fcc116f00123b5a6a485163170d48071b.tar.gz | |
Merge 5.5 into 10.0
| -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 e1efb1e85d6..109150ef0d5 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1799,7 +1799,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 d38bc7af26c..5b0e19b1837 100644 --- a/storage/maria/ma_search.c +++ b/storage/maria/ma_search.c @@ -747,11 +747,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; @@ -883,13 +883,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 3ce112f7906..9bed9a16d60 100644 --- a/storage/myisam/mi_search.c +++ b/storage/myisam/mi_search.c @@ -608,11 +608,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; @@ -729,13 +729,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; |