summaryrefslogtreecommitdiff
path: root/sql/sql_cache.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-01-03 20:42:09 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-01-03 20:42:09 +0200
commitfcde91114db1a33dcb27338dae0ac6680844f190 (patch)
tree729e3e314f7f355e9c448dabd5eb28b040074d15 /sql/sql_cache.cc
parentd361401bc26f49480daec8b0307afff6edae2ecc (diff)
parent1e89c86dd7c21684039c5fa777c358fc2112aec6 (diff)
downloadmariadb-git-fcde91114db1a33dcb27338dae0ac6680844f190.tar.gz
Merge 10.1 into 10.2
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 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;
}