Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17946

into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561

mysql-test/r/partition_pruning.result

@@ -659,3 +659,14 @@ explain partitions select count(*) from t1 where s1 < 0 or s1 is null;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p3	system	NULL	NULL	NULL	NULL	1	
 drop table t1;
+create table t1 (a char(32) primary key)
+partition by key()
+partitions 100;
+insert into t1 values ('na');
+select * from t1;
+a
+na
+select * from t1 where a like 'n%';
+a
+na
+drop table t1;

mysql-test/t/partition_pruning.test

@@ -554,3 +554,15 @@ drop table t1;
 
 # No tests for NULLs in RANGE(monotonic_expr()) - they depend on BUG#15447
 # being fixed.
+
+#
+#BUG 17946 Like searches fail with partitioning
+#
+create table t1 (a char(32) primary key)
+partition by key()
+partitions 100;
+insert into t1 values ('na');
+select * from t1;
+select * from t1 where a like 'n%';
+drop table t1;
+