summaryrefslogtreecommitdiff
path: root/sql/sql_cache.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-01-03 20:41:34 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-01-03 20:41:34 +0200
commit1e89c86dd7c21684039c5fa777c358fc2112aec6 (patch)
tree05078c5d82e50a09ae49666c4e9a7fcc103a1b9f /sql/sql_cache.cc
parent016caa3d202ee1f020ff84613b345c8f3bacdce3 (diff)
parent8ac1982fcc116f00123b5a6a485163170d48071b (diff)
downloadmariadb-git-1e89c86dd7c21684039c5fa777c358fc2112aec6.tar.gz
Merge 10.0 into 10.1
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r--sql/sql_cache.cc2
1 files changed, 1 insertions, 1 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;
}