Post-merge fix.

Query cache does now work with concurrent_insert=0. See
Bug 33756 - query cache with concurrent_insert=0 appears broken

mysql-test/r/sp_notembedded.result

@@ -70,7 +70,7 @@ c
 2
 show status like 'Qcache_hits'|
 Variable_name	Value
-Qcache_hits	0
+Qcache_hits	2
 set global query_cache_size = @x|
 flush status|
 flush query cache|