WL#7909: Server side JSON functions

kahatlen · kahatlen · commit 02e1bdcd5b35 · 2015-07-03T10:08:04.000+02:00
Post-push fix: Update result file for innodb.innodb_mysql.
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -2857,7 +2857,7 @@ ORDER BY f1 DESC LIMIT 5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	f2,f4	f4	1	NULL	22	100.00	Using index condition; Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`test`.`t1`.`f3` AS `f3`,`test`.`t1`.`f4` AS `f4` from `test`.`t1` where ((`test`.`t1`.`f4` = 1) and (`test`.`t1`.`f2` = 1)) order by `test`.`t1`.`f1` desc limit 5
+Note	1003	/* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`test`.`t1`.`f3` AS `f3`,`test`.`t1`.`f4` AS `f4` from `test`.`t1` where ((`test`.`t1`.`f4` = TRUE) and (`test`.`t1`.`f2` = 1)) order by `test`.`t1`.`f1` desc limit 5
 DROP TABLE t1;
 #
 # Bug#54117 crash in thr_multi_unlock, temporary table

Original file line number	Diff line number	Diff line change
`@@ -2857,7 +2857,7 @@ ORDER BY f1 DESC LIMIT 5;`
`2857`	`2857`	`id select_type table partitions type possible_keys key key_len ref rows filtered Extra`
`2858`	`2858`	`1 SIMPLE t1 NULL range f2,f4 f4 1 NULL 22 100.00 Using index condition; Using where`
`2859`	`2859`	`Warnings:`
`2860`		-Note 1003 /* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`test`.`t1`.`f3` AS `f3`,`test`.`t1`.`f4` AS `f4` from `test`.`t1` where ((`test`.`t1`.`f4` = 1) and (`test`.`t1`.`f2` = 1)) order by `test`.`t1`.`f1` desc limit 5
	`2860`	+Note 1003 /* select#1 */ select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2`,`test`.`t1`.`f3` AS `f3`,`test`.`t1`.`f4` AS `f4` from `test`.`t1` where ((`test`.`t1`.`f4` = TRUE) and (`test`.`t1`.`f2` = 1)) order by `test`.`t1`.`f1` desc limit 5
`2861`	`2861`	`DROP TABLE t1;`
`2862`	`2862`	`#`
`2863`	`2863`	`# Bug#54117 crash in thr_multi_unlock, temporary table`