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 /sql/sql_cache.cc | |
parent | 51e4650ed0644ed88cf5d542bd0cab50e7ea0343 (diff) | |
parent | 84c9c8b2e9d68d7014e8b3e17e0d6df8efb3215b (diff) | |
download | mariadb-git-8ac1982fcc116f00123b5a6a485163170d48071b.tar.gz |
Merge 5.5 into 10.0
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r-- | sql/sql_cache.cc | 2 |
1 files changed, 1 insertions, 1 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; } |