From ad647cc84ebf331d59b24e81bffe89be2f5b1ed7 Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Sun, 25 Mar 2018 00:15:11 +0400 Subject: MDEV-15561 json_extract returns NULL with numbers in scientific notation. Scientific notation handling fixed. Conflicts: mysql-test/r/func_json.result mysql-test/t/func_json.test --- strings/json_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'strings') diff --git a/strings/json_lib.c b/strings/json_lib.c index 625f6f8fff4..9b5cc2f5128 100644 --- a/strings/json_lib.c +++ b/strings/json_lib.c @@ -473,8 +473,8 @@ static int json_num_states[NS_NUM_STATES][N_NUM_CLASSES]= /*ZE1*/ { JE_SYN, JE_SYN, JE_SYN, JE_SYN, NS_FRAC, JE_SYN, NS_OK, JE_BAD_CHR }, /*INT*/ { JE_SYN, JE_SYN, NS_INT, NS_INT, NS_FRAC, NS_EX, NS_OK, JE_BAD_CHR }, /*FRAC*/ { JE_SYN, JE_SYN, NS_FRAC, NS_FRAC,JE_SYN, NS_EX, NS_OK, JE_BAD_CHR }, -/*EX*/ { NS_EX1, NS_EX1, NS_EX1, NS_EX1, JE_SYN, JE_SYN, JE_SYN, JE_BAD_CHR }, -/*EX1*/ { JE_SYN, JE_SYN, NS_EX1, NS_EX1, JE_SYN, JE_SYN, JE_SYN, JE_BAD_CHR } +/*EX*/ { NS_EX, NS_EX, NS_EX1, NS_EX1, JE_SYN, JE_SYN, JE_SYN, JE_BAD_CHR }, +/*EX1*/ { JE_SYN, JE_SYN, NS_EX1, NS_EX1, JE_SYN, JE_SYN, NS_OK, JE_BAD_CHR } }; -- cgit v1.2.1