svnno****@sourc*****
svnno****@sourc*****
2007年 12月 10日 (月) 19:56:07 JST
Revision: 52
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=52
Author: mir
Date: 2007-12-10 19:56:06 +0900 (Mon, 10 Dec 2007)
Log Message:
-----------
fixed bug: DELEMITED flag was ignored while creating fulltext index.
Modified Paths:
--------------
mysql-5.0.51-tritonn-1.0.8/mysql-test/suite/senna/r/senna_create.result
mysql-5.0.51-tritonn-1.0.8/mysql-test/suite/senna/t/senna_create.test
mysql-5.0.51-tritonn-1.0.8/sql/lex_hash.h
mysql-5.0.51-tritonn-1.0.8/sql/sql_yacc.cc
mysql-5.0.51-tritonn-1.0.8/sql/sql_yacc.yy
Modified: mysql-5.0.51-tritonn-1.0.8/mysql-test/suite/senna/r/senna_create.result
===================================================================
--- mysql-5.0.51-tritonn-1.0.8/mysql-test/suite/senna/r/senna_create.result 2007-12-10 07:01:42 UTC (rev 51)
+++ mysql-5.0.51-tritonn-1.0.8/mysql-test/suite/senna/r/senna_create.result 2007-12-10 10:56:06 UTC (rev 52)
@@ -208,3 +208,8 @@
Table Key_name Column_name Encoding Index_type Sectionalize Normalize Split_alpha Split_digit Split_symbol Initial_n_segments Senna_keys_size Senna_keys_file_size Senna_lexicon_size Senna_lexicon_file_size Senna_inv_seg_size Senna_inv_chunk_size
t1 ft c1 utf8 NGRAM OFF ON OFF OFF OFF 512 0 4268032 0 4268032 167936 135168
DROP TABLE t1;
+CREATE TABLE t1 (c1 TEXT, FULLTEXT INDEX ft USING DELIMITED (c1)) DEFAULT CHARSET utf8;
+SHOW SENNA STATUS;
+Table Key_name Column_name Encoding Index_type Sectionalize Normalize Split_alpha Split_digit Split_symbol Initial_n_segments Senna_keys_size Senna_keys_file_size Senna_lexicon_size Senna_lexicon_file_size Senna_inv_seg_size Senna_inv_chunk_size
+t1 ft c1 utf8 DELIMITED OFF ON OFF OFF OFF 512 0 4268032 0 4268032 167936 135168
+DROP TABLE t1;
Modified: mysql-5.0.51-tritonn-1.0.8/mysql-test/suite/senna/t/senna_create.test
===================================================================
--- mysql-5.0.51-tritonn-1.0.8/mysql-test/suite/senna/t/senna_create.test 2007-12-10 07:01:42 UTC (rev 51)
+++ mysql-5.0.51-tritonn-1.0.8/mysql-test/suite/senna/t/senna_create.test 2007-12-10 10:56:06 UTC (rev 52)
@@ -214,3 +214,7 @@
SHOW SENNA STATUS;
DROP TABLE t1;
+# bugfix for delimited flags was ignored
+CREATE TABLE t1 (c1 TEXT, FULLTEXT INDEX ft USING DELIMITED (c1)) DEFAULT CHARSET utf8;
+SHOW SENNA STATUS;
+DROP TABLE t1;
Modified: mysql-5.0.51-tritonn-1.0.8/sql/lex_hash.h
===================================================================
--- mysql-5.0.51-tritonn-1.0.8/sql/lex_hash.h 2007-12-10 07:01:42 UTC (rev 51)
+++ mysql-5.0.51-tritonn-1.0.8/sql/lex_hash.h 2007-12-10 10:56:06 UTC (rev 52)
@@ -24,30 +24,30 @@
#include "lex.h"
-static uchar sql_functions_map[16032]= {
+static uchar sql_functions_map[16088]= {
'<', 'Y', 26, 0,
'!', '|', 56, 0,
'<', 'X', 172, 0,
'A', 'Y', 108, 1,
-'A', 'W', 51, 3,
-'A', 'W', 80, 5,
-'A', 'W', 201, 6,
-'A', 'Z', 169, 8,
-'A', 'V', 181, 10,
-'A', 'Y', 148, 11,
-'A', 'U', 105, 12,
-'C', 'V', 42, 13,
-'C', 'U', 254, 13,
-'A', 'U', 45, 14,
-'D', 'S', 155, 14,
-'C', 'S', 236, 14,
-'C', 'S', 3, 15,
-'G', 'S', 60, 15,
-'M', 'U', 100, 15,
-'M', 'M', 130, 15,
+'A', 'W', 65, 3,
+'A', 'W', 94, 5,
+'A', 'W', 215, 6,
+'A', 'Z', 183, 8,
+'A', 'V', 195, 10,
+'A', 'Y', 162, 11,
+'A', 'U', 119, 12,
+'C', 'V', 56, 13,
+'C', 'U', 12, 14,
+'A', 'U', 59, 14,
+'D', 'S', 169, 14,
+'C', 'S', 250, 14,
+'C', 'S', 17, 15,
+'G', 'S', 74, 15,
+'M', 'U', 114, 15,
+'M', 'M', 144, 15,
0, 0, 2, 2,
+0, 0, 112, 255,
0, 0, 113, 255,
-0, 0, 114, 255,
0, 0, 4, 1,
0, 0, 176, 255,
0, 0, 177, 255,
@@ -79,8 +79,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 28, 255,
0, 0, 27, 255,
+0, 0, 26, 255,
0, 0, 4, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -124,11 +124,11 @@
'F', 'S', 153, 0,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 149, 255,
+0, 0, 148, 255,
0, 0, 2, 2,
0, 0, 42, 1,
'N', 'R', 167, 0,
-0, 0, 96, 255,
+0, 0, 95, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -213,15 +213,15 @@
'N', 'P', 27, 1,
0, 0, 2, 2,
0, 0, 218, 0,
-0, 0, 142, 255,
+0, 0, 141, 255,
'A', 'O', 30, 1,
'D', 'O', 56, 1,
'C', 'U', 72, 1,
-0, 0, 87, 255,
+0, 0, 86, 255,
0, 0, 2, 2,
0, 0, 120, 1,
'E', 'U', 91, 1,
-0, 0, 50, 255,
+0, 0, 49, 255,
0, 0, 227, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -311,10 +311,10 @@
0, 0, 200, 0,
0, 0, 2, 2,
0, 0, 211, 0,
-0, 0, 132, 255,
+0, 0, 131, 255,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 124, 255,
+0, 0, 123, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -326,7 +326,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 23, 1,
-0, 0, 123, 255,
+0, 0, 122, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -336,7 +336,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 122, 255,
+0, 0, 121, 255,
0, 0, 36, 1,
0, 0, 39, 1,
0, 0, 2, 2,
@@ -352,8 +352,8 @@
0, 0, 45, 1,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 107, 255,
-0, 0, 101, 255,
+0, 0, 106, 255,
+0, 0, 100, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -368,15 +368,15 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 100, 255,
+0, 0, 99, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 61, 1,
0, 0, 138, 1,
0, 0, 2, 2,
0, 0, 2, 2,
+0, 0, 70, 255,
0, 0, 71, 255,
-0, 0, 72, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -387,8 +387,8 @@
0, 0, 156, 1,
0, 0, 2, 2,
0, 0, 176, 1,
-0, 0, 63, 255,
-0, 0, 53, 255,
+0, 0, 62, 255,
+0, 0, 52, 255,
'C', 'T', 133, 1,
'L', 'Y', 151, 1,
'A', 'U', 171, 1,
@@ -399,19 +399,19 @@
'A', 'O', 43, 2,
'N', 'N', 58, 2,
0, 0, 217, 0,
-'E', 'I', 91, 2,
-'A', 'P', 96, 2,
+'E', 'W', 91, 2,
+'A', 'P', 110, 2,
0, 0, 24, 1,
-'A', 'U', 161, 2,
+'A', 'U', 175, 2,
0, 0, 55, 1,
-'A', 'R', 182, 2,
+'A', 'R', 196, 2,
0, 0, 2, 2,
-'A', 'P', 200, 2,
-'H', 'T', 226, 2,
-'E', 'Y', 254, 2,
-'N', 'U', 32, 3,
+'A', 'P', 214, 2,
+'H', 'T', 240, 2,
+'E', 'Y', 12, 3,
+'N', 'U', 46, 3,
0, 0, 247, 1,
-'E', 'O', 40, 3,
+'E', 'O', 54, 3,
0, 0, 251, 1,
0, 0, 254, 1,
0, 0, 254, 255,
@@ -633,6 +633,20 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 220, 0,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 2, 2,
+0, 0, 155, 255,
0, 0, 222, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -647,15 +661,15 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'O', 112, 2,
-0, 0, 138, 255,
+'A', 'O', 126, 2,
+0, 0, 137, 255,
0, 0, 232, 0,
0, 0, 2, 2,
0, 0, 236, 0,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'2', 'S', 127, 2,
+'2', 'S', 141, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -664,7 +678,7 @@
0, 0, 2, 2,
0, 0, 239, 0,
0, 0, 242, 0,
-0, 0, 141, 255,
+0, 0, 140, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -737,11 +751,11 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 73, 1,
-0, 0, 83, 255,
+0, 0, 82, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'A', 216, 2,
+'A', 'A', 230, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -752,8 +766,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 121, 1,
-0, 0, 78, 255,
-'D', 'L', 217, 2,
+0, 0, 77, 255,
+'D', 'L', 231, 2,
0, 0, 89, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -763,8 +777,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 91, 1,
-'A', 'O', 239, 2,
-0, 0, 73, 255,
+'A', 'O', 253, 2,
+0, 0, 72, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -772,11 +786,11 @@
0, 0, 2, 2,
0, 0, 147, 1,
0, 0, 2, 2,
-0, 0, 66, 255,
0, 0, 65, 255,
+0, 0, 64, 255,
0, 0, 2, 2,
0, 0, 180, 1,
-0, 0, 70, 255,
+0, 0, 69, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -804,7 +818,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'I', 'U', 19, 3,
+'I', 'U', 33, 3,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -812,7 +826,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 212, 1,
-0, 0, 44, 255,
+0, 0, 43, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -832,7 +846,7 @@
0, 0, 2, 2,
0, 0, 228, 1,
0, 0, 2, 2,
-0, 0, 36, 255,
+0, 0, 35, 255,
0, 0, 243, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -844,29 +858,29 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 249, 1,
-'F', 'T', 74, 3,
-'E', 'T', 130, 3,
-'A', 'R', 146, 3,
+'F', 'T', 88, 3,
+'E', 'T', 144, 3,
+'A', 'R', 160, 3,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'O', 182, 3,
-'R', 'R', 243, 3,
+'A', 'O', 196, 3,
+'R', 'R', 1, 4,
0, 0, 180, 0,
-'N', 'N', 3, 4,
+'N', 'N', 17, 4,
0, 0, 2, 2,
0, 0, 2, 2,
-'C', 'T', 20, 4,
-'A', 'U', 98, 4,
-'A', 'G', 135, 4,
-'R', 'U', 142, 4,
-'H', 'U', 146, 4,
-'U', 'U', 175, 4,
-'A', 'T', 187, 4,
-'E', 'W', 232, 4,
-'A', 'Y', 0, 5,
-'C', 'S', 25, 5,
+'C', 'T', 34, 4,
+'A', 'U', 112, 4,
+'A', 'G', 149, 4,
+'R', 'U', 156, 4,
+'H', 'U', 160, 4,
+'U', 'U', 189, 4,
+'A', 'T', 201, 4,
+'E', 'W', 246, 4,
+'A', 'Y', 14, 5,
+'C', 'S', 39, 5,
0, 0, 235, 1,
-'H', 'R', 64, 5,
+'H', 'R', 78, 5,
0, 0, 13, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -880,7 +894,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'C', 'W', 89, 3,
+'C', 'W', 103, 3,
0, 0, 242, 255,
0, 0, 24, 0,
0, 0, 2, 2,
@@ -902,8 +916,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'K', 'K', 110, 3,
-'B', 'T', 111, 3,
+'K', 'K', 124, 3,
+'B', 'T', 125, 3,
0, 0, 245, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -946,7 +960,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'E', 164, 3,
+'A', 'E', 178, 3,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -956,7 +970,7 @@
0, 0, 220, 255,
0, 0, 2, 2,
0, 0, 2, 2,
-'C', 'O', 169, 3,
+'C', 'O', 183, 3,
0, 0, 52, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -983,13 +997,13 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'E', 'X', 197, 3,
+'E', 'X', 211, 3,
0, 0, 2, 2,
0, 0, 2, 2,
-'O', 'U', 217, 3,
+'O', 'U', 231, 3,
0, 0, 2, 2,
0, 0, 2, 2,
-'R', 'U', 239, 3,
+'R', 'U', 253, 3,
0, 0, 189, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1010,7 +1024,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 154, 0,
-'A', 'O', 224, 3,
+'A', 'O', 238, 3,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1036,7 +1050,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 162, 0,
-'A', 'O', 244, 3,
+'A', 'O', 2, 4,
0, 0, 172, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1052,7 +1066,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 174, 0,
-'D', 'S', 4, 4,
+'D', 'S', 18, 4,
0, 0, 190, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1069,25 +1083,25 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 163, 255,
-0, 0, 152, 255,
+0, 0, 151, 255,
0, 0, 2, 2,
-'A', 'V', 38, 4,
+'A', 'V', 52, 4,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'M', 'N', 64, 4,
+'M', 'N', 78, 4,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'C', 'W', 66, 4,
+'C', 'W', 80, 4,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 137, 255,
-'S', 'V', 60, 4,
+0, 0, 136, 255,
+'S', 'V', 74, 4,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1109,17 +1123,17 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 227, 0,
-0, 0, 151, 255,
+0, 0, 150, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 224, 0,
0, 0, 229, 0,
0, 0, 230, 0,
-'A', 'K', 87, 4,
+'A', 'K', 101, 4,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 140, 255,
+0, 0, 139, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1135,7 +1149,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 139, 255,
+0, 0, 138, 255,
0, 0, 233, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1151,7 +1165,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'C', 'R', 119, 4,
+'C', 'R', 133, 4,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1202,7 +1216,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'I', 'W', 160, 4,
+'I', 'W', 174, 4,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1223,8 +1237,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 86, 255,
-'E', 'O', 176, 4,
+0, 0, 85, 255,
+'E', 'O', 190, 4,
0, 0, 83, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1235,12 +1249,12 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 85, 255,
+0, 0, 84, 255,
0, 0, 85, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'S', 207, 4,
+'A', 'S', 221, 4,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1250,12 +1264,12 @@
0, 0, 116, 1,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 80, 255,
+0, 0, 79, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'R', 'R', 226, 4,
+'R', 'R', 240, 4,
0, 0, 90, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1275,12 +1289,12 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 108, 1,
-'E', 'I', 227, 4,
+'E', 'I', 241, 4,
0, 0, 123, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 77, 255,
+0, 0, 76, 255,
0, 0, 132, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1288,11 +1302,11 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'E', 251, 4,
+'A', 'E', 9, 5,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 67, 255,
+0, 0, 66, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1304,7 +1318,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 69, 255,
+0, 0, 68, 255,
0, 0, 190, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1330,7 +1344,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 213, 1,
-0, 0, 43, 255,
+0, 0, 42, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1341,13 +1355,13 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'H', 'T', 42, 5,
+'H', 'T', 56, 5,
0, 0, 2, 2,
-0, 0, 37, 255,
+0, 0, 36, 255,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'I', 55, 5,
-0, 0, 40, 255,
+'A', 'I', 69, 5,
+0, 0, 39, 255,
0, 0, 218, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1369,7 +1383,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 231, 1,
-'E', 'I', 75, 5,
+'E', 'I', 89, 5,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1385,29 +1399,29 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 246, 1,
-'C', 'S', 103, 5,
-'A', 'I', 120, 5,
-'H', 'U', 155, 5,
-'E', 'O', 172, 5,
-'L', 'X', 193, 5,
-'A', 'O', 213, 5,
-'L', 'R', 236, 5,
+'C', 'S', 117, 5,
+'A', 'I', 134, 5,
+'H', 'U', 169, 5,
+'E', 'O', 186, 5,
+'L', 'X', 207, 5,
+'A', 'O', 227, 5,
+'L', 'R', 250, 5,
0, 0, 177, 0,
-'F', 'S', 243, 5,
+'F', 'S', 1, 6,
0, 0, 2, 2,
0, 0, 2, 2,
-'E', 'O', 21, 6,
-'A', 'O', 46, 6,
-0, 0, 106, 255,
-'F', 'P', 71, 6,
-0, 0, 93, 255,
+'E', 'O', 35, 6,
+'A', 'O', 60, 6,
+0, 0, 105, 255,
+'F', 'P', 85, 6,
+0, 0, 92, 255,
0, 0, 2, 2,
-'E', 'O', 82, 6,
-'C', 'U', 114, 6,
+'E', 'O', 96, 6,
+'C', 'U', 128, 6,
0, 0, 191, 1,
-'N', 'P', 194, 6,
+'N', 'P', 208, 6,
0, 0, 236, 1,
-0, 0, 29, 255,
+0, 0, 28, 255,
0, 0, 11, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1433,7 +1447,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'G', 'T', 129, 5,
+'G', 'T', 143, 5,
0, 0, 35, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1441,7 +1455,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'L', 143, 5,
+'A', 'L', 157, 5,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1467,7 +1481,7 @@
0, 0, 61, 0,
0, 0, 2, 2,
0, 0, 2, 2,
-'L', 'N', 169, 5,
+'L', 'N', 183, 5,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 83, 0,
@@ -1477,7 +1491,7 @@
0, 0, 66, 0,
0, 0, 69, 0,
0, 0, 225, 255,
-'C', 'L', 183, 5,
+'C', 'L', 197, 5,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1500,7 +1514,7 @@
0, 0, 109, 0,
0, 0, 130, 0,
0, 0, 2, 2,
-'A', 'G', 206, 5,
+'A', 'G', 220, 5,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 194, 255,
@@ -1529,13 +1543,13 @@
0, 0, 151, 0,
0, 0, 2, 2,
0, 0, 2, 2,
-'O', 'O', 228, 5,
+'O', 'O', 242, 5,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 186, 255,
-'A', 'A', 229, 5,
-'T', 'T', 230, 5,
-'4', '8', 231, 5,
+'A', 'A', 243, 5,
+'T', 'T', 244, 5,
+'4', '8', 245, 5,
0, 0, 156, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1556,12 +1570,12 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 188, 0,
-'F', 'S', 1, 6,
+'F', 'S', 15, 6,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'N', 'S', 15, 6,
+'N', 'S', 29, 6,
0, 0, 192, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1582,7 +1596,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 214, 0,
-'A', 'N', 32, 6,
+'A', 'N', 46, 6,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1592,7 +1606,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 143, 255,
+0, 0, 142, 255,
0, 0, 225, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1606,12 +1620,12 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 150, 255,
+0, 0, 149, 255,
0, 0, 244, 0,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'D', 'M', 61, 6,
+'D', 'M', 75, 6,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1643,7 +1657,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 57, 1,
-'G', 'V', 93, 6,
+'G', 'V', 107, 6,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1663,7 +1677,7 @@
0, 0, 2, 2,
0, 0, 101, 1,
0, 0, 2, 2,
-'A', 'E', 109, 6,
+'A', 'E', 123, 6,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 111, 1,
@@ -1677,23 +1691,23 @@
0, 0, 106, 1,
0, 0, 125, 1,
0, 0, 2, 2,
-'C', 'R', 133, 6,
+'C', 'R', 147, 6,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'G', 'M', 149, 6,
+'G', 'M', 163, 6,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'N', 'U', 156, 6,
+'N', 'U', 170, 6,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'R', 169, 6,
-0, 0, 57, 255,
+'A', 'R', 183, 6,
+0, 0, 56, 255,
0, 0, 127, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1724,7 +1738,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'N', 'R', 164, 6,
+'N', 'R', 178, 6,
0, 0, 149, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1733,7 +1747,7 @@
0, 0, 179, 1,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 62, 255,
+0, 0, 61, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1747,45 +1761,45 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'C', 'I', 187, 6,
-0, 0, 58, 255,
+'C', 'I', 201, 6,
+0, 0, 57, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 183, 1,
-'I', 'L', 197, 6,
+'I', 'L', 211, 6,
0, 0, 2, 2,
0, 0, 224, 1,
0, 0, 219, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 221, 1,
-'D', 'N', 224, 6,
-'E', 'O', 253, 6,
-'A', 'U', 34, 7,
-'A', 'Y', 99, 7,
-'N', 'X', 151, 7,
+'D', 'N', 238, 6,
+'E', 'O', 11, 7,
+'A', 'U', 48, 7,
+'A', 'Y', 113, 7,
+'N', 'X', 165, 7,
0, 0, 161, 0,
0, 0, 171, 255,
0, 0, 175, 0,
-'N', 'T', 183, 7,
+'N', 'T', 197, 7,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 223, 0,
0, 0, 18, 1,
-'A', 'U', 209, 7,
+'A', 'U', 223, 7,
0, 0, 63, 1,
-'A', 'R', 230, 7,
+'A', 'R', 244, 7,
0, 0, 82, 1,
-'A', 'O', 7, 8,
-'C', 'Y', 42, 8,
-'I', 'R', 104, 8,
-'N', 'S', 125, 8,
-'A', 'E', 134, 8,
-0, 0, 31, 255,
-'D', 'D', 235, 6,
+'A', 'O', 21, 8,
+'C', 'Y', 56, 8,
+'I', 'R', 118, 8,
+'N', 'S', 139, 8,
+'A', 'E', 148, 8,
+0, 0, 30, 255,
+'D', 'D', 249, 6,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 14, 0,
@@ -1796,7 +1810,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 19, 0,
-'D', 'T', 236, 6,
+'D', 'T', 250, 6,
0, 0, 253, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1818,15 +1832,15 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'T', 'T', 8, 7,
+'T', 'T', 22, 7,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 42, 0,
-'_', '_', 9, 7,
-'A', 'X', 10, 7,
+'_', '_', 23, 7,
+'A', 'X', 24, 7,
0, 0, 237, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1858,29 +1872,29 @@
0, 0, 233, 255,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'A', 55, 7,
+'A', 'A', 69, 7,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'L', 'N', 61, 7,
+'L', 'N', 75, 7,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 216, 255,
0, 0, 2, 2,
0, 0, 2, 2,
-'R', 'R', 81, 7,
-'N', 'R', 56, 7,
+'R', 'R', 95, 7,
+'N', 'R', 70, 7,
0, 0, 54, 0,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 57, 0,
-'L', 'U', 64, 7,
-'M', 'P', 74, 7,
-'T', 'V', 78, 7,
+'L', 'U', 78, 7,
+'M', 'P', 88, 7,
+'T', 'V', 92, 7,
0, 0, 64, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1898,7 +1912,7 @@
0, 0, 79, 0,
0, 0, 2, 2,
0, 0, 81, 0,
-'D', 'T', 82, 7,
+'D', 'T', 96, 7,
0, 0, 215, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1920,11 +1934,11 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'C', 'L', 124, 7,
+'C', 'L', 138, 7,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'S', 'S', 147, 7,
+'S', 'S', 161, 7,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1941,10 +1955,10 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 127, 0,
-'I', 'L', 134, 7,
+'I', 'L', 148, 7,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'I', 138, 7,
+'A', 'I', 152, 7,
0, 0, 204, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1964,11 +1978,11 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 106, 0,
-'A', 'C', 148, 7,
+'A', 'C', 162, 7,
0, 0, 116, 0,
0, 0, 2, 2,
0, 0, 117, 0,
-'C', 'G', 162, 7,
+'C', 'G', 176, 7,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -1978,7 +1992,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'E', 'T', 167, 7,
+'E', 'T', 181, 7,
0, 0, 197, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2000,7 +2014,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 192, 255,
-'D', 'V', 190, 7,
+'D', 'V', 204, 7,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2064,7 +2078,7 @@
0, 0, 70, 1,
0, 0, 2, 2,
0, 0, 2, 2,
-'E', 'O', 248, 7,
+'E', 'O', 6, 8,
0, 0, 72, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2075,16 +2089,16 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'C', 'F', 3, 8,
+'C', 'F', 17, 8,
0, 0, 77, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 79, 1,
-0, 0, 84, 255,
+0, 0, 83, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'C', 'V', 22, 8,
+'C', 'V', 36, 8,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2114,7 +2128,7 @@
0, 0, 109, 1,
0, 0, 113, 1,
0, 0, 2, 2,
-0, 0, 81, 255,
+0, 0, 80, 255,
0, 0, 126, 1,
0, 0, 2, 2,
0, 0, 137, 1,
@@ -2127,22 +2141,22 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 68, 255,
+0, 0, 67, 255,
0, 0, 151, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'O', 'R', 65, 8,
-'B', 'S', 69, 8,
+'O', 'R', 79, 8,
+'B', 'S', 83, 8,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 52, 255,
+0, 0, 51, 255,
0, 0, 181, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 184, 1,
-'D', 'T', 87, 8,
+'D', 'T', 101, 8,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2160,7 +2174,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 187, 1,
-0, 0, 74, 255,
+0, 0, 73, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2176,18 +2190,18 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 54, 255,
+0, 0, 53, 255,
0, 0, 203, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'U', '_', 114, 8,
+'U', '_', 128, 8,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 208, 1,
-0, 0, 45, 255,
+0, 0, 44, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2197,8 +2211,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 46, 255,
-'I', 'K', 131, 8,
+0, 0, 45, 255,
+'I', 'K', 145, 8,
0, 0, 2, 2,
0, 0, 225, 1,
0, 0, 2, 2,
@@ -2207,12 +2221,12 @@
0, 0, 217, 1,
0, 0, 2, 2,
0, 0, 220, 1,
-'R', 'R', 139, 8,
+'R', 'R', 153, 8,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 32, 255,
-'C', '_', 140, 8,
+0, 0, 31, 255,
+'C', '_', 154, 8,
0, 0, 238, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2241,32 +2255,32 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 34, 255,
+0, 0, 33, 255,
0, 0, 247, 255,
0, 0, 2, 2,
-'A', 'O', 195, 8,
-'A', 'U', 234, 8,
-'N', 'X', 69, 9,
-'U', 'U', 100, 9,
-'E', 'R', 104, 9,
+'A', 'O', 209, 8,
+'A', 'U', 248, 8,
+'N', 'X', 83, 9,
+'U', 'U', 114, 9,
+'E', 'R', 118, 9,
0, 0, 2, 2,
-'N', 'S', 124, 9,
+'N', 'S', 138, 9,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'O', 154, 9,
-'A', 'O', 196, 9,
-'A', 'V', 254, 9,
-'N', 'V', 20, 10,
-'A', 'R', 29, 10,
+'A', 'O', 168, 9,
+'A', 'O', 210, 9,
+'A', 'V', 12, 10,
+'N', 'V', 34, 10,
+'A', 'R', 43, 10,
0, 0, 2, 2,
-'E', 'O', 47, 10,
-'E', 'W', 58, 10,
-'I', 'R', 77, 10,
-'N', 'T', 130, 10,
-'A', 'A', 156, 10,
+'E', 'O', 61, 10,
+'E', 'W', 72, 10,
+'I', 'R', 91, 10,
+'N', 'T', 144, 10,
+'A', 'A', 170, 10,
0, 0, 242, 1,
0, 0, 2, 2,
-0, 0, 26, 255,
+0, 0, 25, 255,
0, 0, 0, 2,
0, 0, 50, 0,
0, 0, 2, 2,
@@ -2282,7 +2296,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'N', 210, 8,
+'A', 'N', 224, 8,
0, 0, 228, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2296,8 +2310,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 226, 255,
-'T', 'T', 224, 8,
-'A', 'I', 225, 8,
+'T', 'T', 238, 8,
+'A', 'I', 239, 8,
0, 0, 78, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2307,7 +2321,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 80, 0,
-'T', 'Y', 255, 8,
+'T', 'Y', 13, 9,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2315,7 +2329,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'S', 'S', 57, 9,
+'S', 'S', 71, 9,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2328,7 +2342,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 125, 0,
-'A', 'E', 5, 9,
+'A', 'E', 19, 9,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2338,7 +2352,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'D', '_', 10, 9,
+'D', '_', 24, 9,
0, 0, 212, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2366,7 +2380,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'S', 38, 9,
+'A', 'S', 52, 9,
0, 0, 213, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2386,7 +2400,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 210, 255,
-'J', 'T', 58, 9,
+'J', 'T', 72, 9,
0, 0, 200, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2398,7 +2412,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 118, 0,
-'C', 'V', 80, 9,
+'C', 'V', 94, 9,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2429,11 +2443,11 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 195, 255,
-'L', 'N', 101, 9,
+'L', 'N', 115, 9,
0, 0, 166, 0,
0, 0, 2, 2,
0, 0, 167, 0,
-'O', 'T', 118, 9,
+'O', 'T', 132, 9,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2453,12 +2467,12 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 182, 255,
-'N', 'T', 130, 9,
+'N', 'T', 144, 9,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'C', 'S', 137, 9,
+'C', 'S', 151, 9,
0, 0, 194, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2482,8 +2496,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 154, 255,
-'N', 'S', 169, 9,
+0, 0, 153, 255,
+'N', 'S', 183, 9,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2497,15 +2511,15 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'N', 'N', 175, 9,
+'N', 'N', 189, 9,
0, 0, 221, 0,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 153, 255,
-'G', 'G', 176, 9,
-'B', 'T', 177, 9,
+0, 0, 152, 255,
+'G', 'G', 190, 9,
+'B', 'T', 191, 9,
0, 0, 240, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2525,8 +2539,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 241, 0,
-'K', 'X', 211, 9,
-0, 0, 129, 255,
+'K', 'X', 225, 9,
+0, 0, 128, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2540,7 +2554,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 25, 1,
-'E', 'E', 225, 9,
+'E', 'E', 239, 9,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2554,8 +2568,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 6, 1,
-'D', '_', 226, 9,
-0, 0, 135, 255,
+'D', '_', 240, 9,
+0, 0, 134, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2571,7 +2585,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 134, 255,
+0, 0, 133, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2582,7 +2596,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 136, 255,
+0, 0, 135, 255,
0, 0, 34, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2613,7 +2627,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 99, 255,
+0, 0, 98, 255,
0, 0, 67, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2628,7 +2642,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 88, 255,
+0, 0, 87, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 80, 1,
@@ -2662,7 +2676,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 189, 1,
-'M', 'N', 87, 10,
+'M', 'N', 101, 10,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2671,10 +2685,10 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'U', 109, 10,
-0, 0, 47, 255,
-'Y', 'Y', 89, 10,
-'B', 'T', 90, 10,
+'A', 'U', 123, 10,
+0, 0, 46, 255,
+'Y', 'Y', 103, 10,
+'B', 'T', 104, 10,
0, 0, 202, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2721,9 +2735,9 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'C', 'C', 137, 10,
-'_', '_', 138, 10,
-'D', 'T', 139, 10,
+'C', 'C', 151, 10,
+'_', '_', 152, 10,
+'D', 'T', 153, 10,
0, 0, 232, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2741,9 +2755,9 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 233, 1,
-'R', 'R', 157, 10,
-'I', '_', 158, 10,
-0, 0, 35, 255,
+'R', 'R', 171, 10,
+'I', '_', 172, 10,
+0, 0, 34, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2765,29 +2779,29 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 33, 255,
-'G', 'L', 203, 10,
-'E', 'I', 209, 10,
-'H', 'O', 214, 10,
-'A', 'U', 227, 10,
+0, 0, 32, 255,
+'G', 'L', 217, 10,
+'E', 'I', 223, 10,
+'H', 'O', 228, 10,
+'A', 'U', 241, 10,
0, 0, 144, 0,
0, 0, 184, 255,
0, 0, 181, 255,
0, 0, 2, 2,
-'N', 'S', 9, 11,
+'N', 'S', 23, 11,
0, 0, 2, 2,
0, 0, 2, 2,
-'O', 'O', 32, 11,
-'B', 'O', 36, 11,
-'O', 'U', 50, 11,
+'O', 'O', 46, 11,
+'B', 'O', 50, 11,
+'O', 'U', 64, 11,
0, 0, 2, 2,
-'A', 'R', 57, 11,
+'A', 'R', 71, 11,
0, 0, 2, 2,
-'A', 'O', 86, 11,
-'A', 'U', 101, 11,
-'E', 'I', 125, 11,
+'A', 'O', 100, 11,
+'A', 'U', 115, 11,
+'E', 'I', 139, 11,
0, 0, 215, 1,
-'A', 'A', 138, 11,
+'A', 'A', 152, 11,
0, 0, 15, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2806,13 +2820,13 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'L', 'N', 222, 10,
+'L', 'N', 236, 10,
0, 0, 65, 0,
0, 0, 70, 0,
-'C', 'D', 225, 10,
+'C', 'D', 239, 10,
0, 0, 224, 255,
0, 0, 74, 0,
-'T', 'Y', 248, 10,
+'T', 'Y', 6, 11,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2820,7 +2834,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'M', 'R', 3, 11,
+'M', 'R', 17, 11,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2838,9 +2852,9 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'O', 'O', 254, 10,
-'F', 'F', 255, 10,
-'W', 'Y', 0, 11,
+'O', 'O', 12, 11,
+'F', 'F', 13, 11,
+'W', 'Y', 14, 11,
0, 0, 207, 255,
0, 0, 2, 2,
0, 0, 206, 255,
@@ -2850,15 +2864,15 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 115, 0,
-'E', 'E', 15, 11,
+'E', 'E', 29, 11,
0, 0, 210, 0,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 213, 0,
-'T', 'T', 16, 11,
-'_', '_', 17, 11,
-'A', 'N', 18, 11,
+'T', 'T', 30, 11,
+'_', '_', 31, 11,
+'A', 'N', 32, 11,
0, 0, 165, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2873,11 +2887,11 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 164, 255,
-'A', 'C', 33, 11,
-0, 0, 144, 255,
+'A', 'C', 47, 11,
+0, 0, 143, 255,
0, 0, 2, 2,
0, 0, 234, 0,
-0, 0, 125, 255,
+0, 0, 124, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 12, 1,
@@ -2890,14 +2904,14 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 115, 255,
+0, 0, 114, 255,
0, 0, 44, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 103, 255,
+0, 0, 102, 255,
0, 0, 65, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2915,7 +2929,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'E', 'O', 75, 11,
+'E', 'O', 89, 11,
0, 0, 71, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2941,12 +2955,12 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 79, 255,
+0, 0, 78, 255,
0, 0, 124, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'N', 'P', 122, 11,
+'N', 'P', 136, 11,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2962,25 +2976,25 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 56, 255,
+0, 0, 55, 255,
0, 0, 133, 1,
0, 0, 2, 2,
0, 0, 134, 1,
-'M', 'M', 130, 11,
+'M', 'M', 144, 11,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 199, 1,
-'P', 'P', 131, 11,
-'O', 'T', 132, 11,
+'P', 'P', 145, 11,
+'O', 'T', 146, 11,
0, 0, 193, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 194, 1,
-'R', 'R', 139, 11,
-'B', 'I', 140, 11,
+'R', 'R', 153, 11,
+'B', 'I', 154, 11,
0, 0, 237, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -2990,28 +3004,28 @@
0, 0, 2, 2,
0, 0, 240, 1,
0, 0, 25, 0,
-'E', 'I', 173, 11,
-'O', 'O', 178, 11,
-'A', 'E', 213, 11,
+'E', 'I', 187, 11,
+'O', 'O', 192, 11,
+'A', 'E', 227, 11,
0, 0, 190, 255,
0, 0, 185, 255,
0, 0, 170, 0,
0, 0, 2, 2,
-'D', 'N', 243, 11,
+'D', 'N', 1, 12,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 231, 0,
-'A', 'U', 254, 11,
-'A', 'D', 42, 12,
+'A', 'U', 12, 12,
+'A', 'D', 56, 12,
0, 0, 58, 1,
-'E', 'R', 46, 12,
+'E', 'R', 60, 12,
0, 0, 2, 2,
-'E', 'O', 60, 12,
-'Q', 'T', 82, 12,
-'A', 'E', 100, 12,
-0, 0, 42, 255,
+'E', 'O', 74, 12,
+'Q', 'T', 96, 12,
+'A', 'E', 114, 12,
+0, 0, 41, 255,
0, 0, 2, 2,
-0, 0, 30, 255,
+0, 0, 29, 255,
0, 0, 2, 2,
0, 0, 255, 1,
0, 0, 33, 0,
@@ -3019,9 +3033,9 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 232, 255,
-'M', 'N', 179, 11,
+'M', 'N', 193, 11,
0, 0, 72, 0,
-'C', 'V', 181, 11,
+'C', 'V', 195, 11,
0, 0, 73, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3038,7 +3052,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'I', 'T', 201, 11,
+'I', 'T', 215, 11,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 221, 255,
@@ -3054,12 +3068,12 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 77, 0,
-'Y', 'Y', 218, 11,
+'Y', 'Y', 232, 11,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 101, 0,
-'O', '_', 219, 11,
+'O', '_', 233, 11,
0, 0, 208, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3076,7 +3090,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'M', 'S', 236, 11,
+'M', 'S', 250, 11,
0, 0, 99, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3096,10 +3110,10 @@
0, 0, 2, 2,
0, 0, 161, 255,
0, 0, 252, 0,
-0, 0, 126, 255,
+0, 0, 125, 255,
0, 0, 2, 2,
0, 0, 2, 2,
-'D', 'D', 19, 12,
+'D', 'D', 33, 12,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3116,10 +3130,10 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 29, 1,
-'I', 'I', 20, 12,
-'U', 'U', 21, 12,
-'M', 'M', 22, 12,
-'B', 'T', 23, 12,
+'I', 'I', 34, 12,
+'U', 'U', 35, 12,
+'M', 'M', 36, 12,
+'B', 'T', 37, 12,
0, 0, 11, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3139,11 +3153,11 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 13, 1,
-0, 0, 108, 255,
+0, 0, 107, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 37, 1,
-0, 0, 98, 255,
+0, 0, 97, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3157,7 +3171,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 75, 1,
-'F', 'P', 71, 12,
+'F', 'P', 85, 12,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3179,11 +3193,11 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 103, 1,
-'L', 'L', 86, 12,
+'L', 'L', 100, 12,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'D', 96, 12,
-'W', '_', 87, 12,
+'A', 'D', 110, 12,
+'W', '_', 101, 12,
0, 0, 159, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3193,52 +3207,52 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 166, 1,
-0, 0, 64, 255,
+0, 0, 63, 255,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 61, 255,
+0, 0, 60, 255,
0, 0, 192, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 195, 1,
-'E', 'E', 126, 12,
+'E', 'E', 140, 12,
0, 0, 2, 2,
0, 0, 230, 255,
-'A', 'I', 131, 12,
+'A', 'I', 145, 12,
0, 0, 2, 2,
-'I', 'R', 144, 12,
+'I', 'R', 158, 12,
0, 0, 172, 255,
-'O', 'O', 154, 12,
+'O', 'O', 168, 12,
0, 0, 197, 0,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 147, 255,
-'A', 'I', 165, 12,
+0, 0, 146, 255,
+'A', 'I', 179, 12,
0, 0, 2, 2,
0, 0, 2, 2,
-'E', 'R', 207, 12,
+'E', 'R', 221, 12,
0, 0, 2, 2,
-'A', 'E', 221, 12,
-'E', 'Y', 226, 12,
-'I', 'R', 14, 13,
+'A', 'E', 235, 12,
+'E', 'Y', 240, 12,
+'I', 'R', 28, 13,
0, 0, 214, 1,
-'S', 'S', 127, 12,
-'_', '_', 128, 12,
-'D', 'E', 129, 12,
+'S', 'S', 141, 12,
+'_', '_', 142, 12,
+'D', 'E', 143, 12,
0, 0, 250, 255,
0, 0, 251, 255,
0, 0, 211, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'S', 'S', 140, 12,
+'S', 'S', 154, 12,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 119, 0,
-'_', '_', 141, 12,
-'D', 'E', 142, 12,
+'_', '_', 155, 12,
+'D', 'E', 156, 12,
0, 0, 202, 255,
0, 0, 203, 255,
0, 0, 188, 255,
@@ -3251,10 +3265,10 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 163, 0,
-'U', 'U', 155, 12,
-'R', 'R', 156, 12,
-'_', '_', 157, 12,
-'M', 'S', 158, 12,
+'U', 'U', 169, 12,
+'R', 'R', 170, 12,
+'_', '_', 171, 12,
+'M', 'S', 172, 12,
0, 0, 183, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3262,8 +3276,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 184, 0,
-'S', 'S', 174, 12,
-'R', 'R', 193, 12,
+'S', 'S', 188, 12,
+'R', 'R', 207, 12,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3271,11 +3285,11 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 16, 1,
-'T', 'T', 175, 12,
-'E', 'E', 176, 12,
-'R', 'R', 177, 12,
-'_', '_', 178, 12,
-'H', 'U', 179, 12,
+'T', 'T', 189, 12,
+'E', 'E', 190, 12,
+'R', 'R', 191, 12,
+'_', '_', 192, 12,
+'H', 'U', 193, 12,
0, 0, 246, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3290,9 +3304,9 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 1,
-'C', 'O', 194, 12,
-0, 0, 131, 255,
+'C', 'O', 208, 12,
0, 0, 130, 255,
+0, 0, 129, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3303,8 +3317,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 127, 255,
-0, 0, 97, 255,
+0, 0, 126, 255,
+0, 0, 96, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3314,7 +3328,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 91, 255,
+0, 0, 90, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 78, 1,
@@ -3323,7 +3337,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 105, 1,
-0, 0, 76, 255,
+0, 0, 75, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3334,25 +3348,25 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'L', 'L', 247, 12,
+'L', 'L', 5, 13,
0, 0, 171, 1,
0, 0, 2, 2,
0, 0, 2, 2,
-'D', 'R', 255, 12,
+'D', 'R', 13, 13,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 51, 255,
-'I', 'I', 248, 12,
-'T', 'T', 249, 12,
-'_', '_', 250, 12,
-'A', 'D', 251, 12,
+0, 0, 50, 255,
+'I', 'I', 6, 13,
+'T', 'T', 7, 13,
+'_', '_', 8, 13,
+'A', 'D', 9, 13,
0, 0, 153, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 154, 1,
-0, 0, 60, 255,
+0, 0, 59, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3366,8 +3380,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 59, 255,
-'M', 'M', 24, 13,
+0, 0, 58, 255,
+'M', 'M', 38, 13,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3377,10 +3391,10 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 207, 1,
-'E', 'E', 25, 13,
-'_', '_', 26, 13,
-'F', 'T', 27, 13,
-0, 0, 49, 255,
+'E', 'E', 39, 13,
+'_', '_', 40, 13,
+'F', 'T', 41, 13,
+0, 0, 48, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3394,26 +3408,26 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 48, 255,
-'O', 'U', 62, 13,
+0, 0, 47, 255,
+'O', 'U', 76, 13,
0, 0, 113, 0,
0, 0, 193, 255,
0, 0, 2, 2,
-'E', 'R', 93, 13,
+'E', 'R', 107, 13,
0, 0, 2, 2,
-'S', 'S', 111, 13,
+'S', 'S', 125, 13,
0, 0, 2, 2,
0, 0, 2, 2,
-'I', 'O', 129, 13,
-'L', 'U', 136, 13,
+'I', 'O', 143, 13,
+'L', 'U', 150, 13,
0, 0, 2, 2,
-'C', 'L', 146, 13,
-'O', 'O', 156, 13,
+'C', 'L', 160, 13,
+'O', 'O', 170, 13,
0, 0, 2, 2,
-'E', 'E', 161, 13,
-'E', 'Q', 168, 13,
+'E', 'E', 175, 13,
+'E', 'Q', 182, 13,
0, 0, 200, 1,
-0, 0, 39, 255,
+0, 0, 38, 255,
0, 0, 239, 1,
0, 0, 227, 255,
0, 0, 2, 2,
@@ -3421,13 +3435,13 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'R', 'R', 69, 13,
-'R', 'R', 70, 13,
-'E', 'E', 71, 13,
-'N', 'N', 72, 13,
-'T', 'T', 73, 13,
-'_', '_', 74, 13,
-'D', 'U', 75, 13,
+'R', 'R', 83, 13,
+'R', 'R', 84, 13,
+'E', 'E', 85, 13,
+'N', 'N', 86, 13,
+'T', 'T', 87, 13,
+'_', '_', 88, 13,
+'D', 'U', 89, 13,
0, 0, 86, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3446,7 +3460,7 @@
0, 0, 2, 2,
0, 0, 87, 0,
0, 0, 89, 0,
-'O', 'O', 107, 13,
+'O', 'O', 121, 13,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3460,12 +3474,12 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 169, 255,
-'M', 'M', 108, 13,
-'E', 'F', 109, 13,
+'M', 'M', 122, 13,
+'E', 'F', 123, 13,
0, 0, 180, 255,
0, 0, 173, 255,
-'_', '_', 112, 13,
-'F', 'U', 113, 13,
+'_', '_', 126, 13,
+'F', 'U', 127, 13,
0, 0, 157, 255,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3482,24 +3496,24 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 156, 255,
-0, 0, 148, 255,
+0, 0, 147, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 243, 0,
-0, 0, 120, 255,
+0, 0, 119, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 116, 255,
+0, 0, 115, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 30, 1,
-0, 0, 102, 255,
+0, 0, 101, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3509,19 +3523,19 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 51, 1,
-'I', 'L', 157, 13,
-0, 0, 94, 255,
+'I', 'L', 171, 13,
+0, 0, 93, 255,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 92, 255,
-'L', 'L', 162, 13,
-'A', 'E', 163, 13,
+0, 0, 91, 255,
+'L', 'L', 176, 13,
+'A', 'E', 177, 13,
0, 0, 98, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 82, 255,
-'C', 'S', 181, 13,
+0, 0, 81, 255,
+'C', 'S', 195, 13,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3533,7 +3547,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 155, 1,
-'L', 'L', 198, 13,
+'L', 'L', 212, 13,
0, 0, 129, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3550,8 +3564,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 136, 1,
-0, 0, 75, 255,
-'E', '_', 199, 13,
+0, 0, 74, 255,
+'E', '_', 213, 13,
0, 0, 157, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3578,17 +3592,17 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'N', 'T', 226, 13,
+'N', 'T', 240, 13,
0, 0, 164, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'S', 'S', 233, 13,
-'I', 'I', 234, 13,
-'_', '_', 235, 13,
-'H', 'Y', 236, 13,
+'S', 'S', 247, 13,
+'I', 'I', 248, 13,
+'_', '_', 249, 13,
+'H', 'Y', 250, 13,
0, 0, 170, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3613,24 +3627,24 @@
0, 0, 183, 255,
0, 0, 2, 2,
0, 0, 179, 0,
-'N', 'N', 17, 14,
+'N', 'N', 31, 14,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'P', 20, 14,
-0, 0, 105, 255,
+'A', 'P', 34, 14,
+0, 0, 104, 255,
0, 0, 2, 2,
-0, 0, 95, 255,
+0, 0, 94, 255,
0, 0, 2, 2,
0, 0, 97, 1,
-'Q', 'T', 41, 14,
+'Q', 'T', 55, 14,
0, 0, 201, 1,
0, 0, 234, 1,
-'S', 'T', 18, 14,
+'S', 'T', 32, 14,
0, 0, 199, 0,
0, 0, 162, 255,
0, 0, 253, 0,
-0, 0, 128, 255,
+0, 0, 127, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3640,21 +3654,21 @@
0, 0, 21, 1,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 121, 255,
+0, 0, 120, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'O', 'O', 36, 14,
-'I', 'L', 37, 14,
-0, 0, 118, 255,
+'O', 'O', 50, 14,
+'I', 'L', 51, 14,
+0, 0, 117, 255,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 117, 255,
+0, 0, 116, 255,
0, 0, 173, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 182, 1,
-'U', 'V', 66, 14,
+'U', 'V', 80, 14,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3665,19 +3679,19 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'O', 68, 14,
-'A', 'P', 83, 14,
+'A', 'O', 82, 14,
+'A', 'P', 97, 14,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 89, 255,
+0, 0, 88, 255,
0, 0, 2, 2,
-'A', 'E', 112, 14,
-'Q', 'Q', 117, 14,
+'A', 'E', 126, 14,
+'Q', 'Q', 131, 14,
0, 0, 2, 2,
-'N', 'S', 149, 14,
+'N', 'S', 163, 14,
0, 0, 26, 0,
0, 0, 28, 0,
-0, 0, 155, 255,
+0, 0, 154, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3692,7 +3706,7 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 235, 0,
-'S', 'S', 99, 14,
+'S', 'S', 113, 14,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3707,12 +3721,12 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 119, 255,
-'T', 'T', 100, 14,
-'E', 'E', 101, 14,
-'R', 'R', 102, 14,
-'_', '_', 103, 14,
-'L', 'S', 104, 14,
+0, 0, 118, 255,
+'T', 'T', 114, 14,
+'E', 'E', 115, 14,
+'R', 'R', 116, 14,
+'_', '_', 117, 14,
+'L', 'S', 118, 14,
0, 0, 248, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3726,9 +3740,9 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 96, 1,
-'L', 'L', 118, 14,
-'_', '_', 119, 14,
-'B', 'T', 120, 14,
+'L', 'L', 132, 14,
+'_', '_', 133, 14,
+'B', 'T', 134, 14,
0, 0, 160, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3747,10 +3761,10 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'S', 'S', 139, 14,
-'I', 'I', 140, 14,
-'_', '_', 141, 14,
-'M', 'S', 142, 14,
+'S', 'S', 153, 14,
+'I', 'I', 154, 14,
+'_', '_', 155, 14,
+'M', 'S', 156, 14,
0, 0, 169, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3758,40 +3772,40 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 168, 1,
-0, 0, 38, 255,
+0, 0, 37, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 229, 1,
-'A', 'E', 171, 14,
+'A', 'E', 185, 14,
0, 0, 2, 2,
0, 0, 2, 2,
-'E', 'E', 176, 14,
+'E', 'E', 190, 14,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'U', 182, 14,
+'A', 'U', 196, 14,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 90, 255,
+0, 0, 89, 255,
0, 0, 2, 2,
0, 0, 2, 2,
-'Q', 'U', 231, 14,
+'Q', 'U', 245, 14,
0, 0, 98, 0,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 108, 0,
-'O', 'O', 177, 14,
-'M', 'M', 178, 14,
-'C', 'E', 179, 14,
+'O', 'O', 191, 14,
+'M', 'M', 192, 14,
+'C', 'E', 193, 14,
0, 0, 178, 255,
0, 0, 2, 2,
0, 0, 174, 255,
-'S', 'S', 203, 14,
+'S', 'S', 217, 14,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3812,16 +3826,16 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 28, 1,
-'T', 'T', 204, 14,
-'E', 'E', 205, 14,
-'R', 'R', 206, 14,
-'_', '_', 207, 14,
-'L', 'S', 208, 14,
+'T', 'T', 218, 14,
+'E', 'E', 219, 14,
+'R', 'R', 220, 14,
+'_', '_', 221, 14,
+'L', 'S', 222, 14,
0, 0, 247, 0,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'A', 'O', 216, 14,
+'A', 'O', 230, 14,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 255, 0,
@@ -3839,32 +3853,32 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 133, 255,
+0, 0, 132, 255,
0, 0, 174, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 55, 255,
+0, 0, 54, 255,
0, 0, 229, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'E', 'E', 253, 14,
+'E', 'E', 11, 15,
0, 0, 182, 0,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 251, 0,
-0, 0, 104, 255,
+0, 0, 103, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 165, 1,
-'O', 'O', 254, 14,
-'M', 'M', 255, 14,
-'C', 'E', 0, 15,
+'O', 'O', 12, 15,
+'M', 'M', 13, 15,
+'C', 'E', 14, 15,
0, 0, 179, 255,
0, 0, 2, 2,
0, 0, 175, 255,
@@ -3877,15 +3891,15 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 145, 255,
-'A', 'U', 20, 15,
+0, 0, 144, 255,
+'A', 'U', 34, 15,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 161, 1,
-'S', 'S', 41, 15,
+'S', 'S', 55, 15,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3905,17 +3919,17 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 111, 255,
-'T', 'T', 42, 15,
-'E', 'E', 43, 15,
-'R', 'R', 44, 15,
-'_', '_', 45, 15,
-'S', 'S', 46, 15,
-'S', 'S', 47, 15,
-'L', 'L', 48, 15,
-'_', '_', 49, 15,
-'C', 'C', 50, 15,
-'A', 'I', 51, 15,
+0, 0, 110, 255,
+'T', 'T', 56, 15,
+'E', 'E', 57, 15,
+'R', 'R', 58, 15,
+'_', '_', 59, 15,
+'S', 'S', 60, 15,
+'S', 'S', 61, 15,
+'L', 'L', 62, 15,
+'_', '_', 63, 15,
+'C', 'C', 64, 15,
+'A', 'I', 65, 15,
0, 0, 254, 0,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3925,13 +3939,13 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 0, 1,
-'E', 'R', 73, 15,
+'E', 'R', 87, 15,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 146, 255,
-'I', 'U', 87, 15,
+0, 0, 145, 255,
+'I', 'U', 101, 15,
0, 0, 46, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3964,19 +3978,19 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 112, 255,
-0, 0, 109, 255,
+0, 0, 111, 255,
+0, 0, 108, 255,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'Q', 'Q', 109, 15,
+'Q', 'Q', 123, 15,
0, 0, 2, 2,
-0, 0, 41, 255,
-'L', 'L', 110, 15,
-'_', '_', 111, 15,
-'C', 'T', 112, 15,
+0, 0, 40, 255,
+'L', 'L', 124, 15,
+'_', '_', 125, 15,
+'C', 'T', 126, 15,
0, 0, 163, 1,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -3995,8 +4009,8 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 167, 1,
-'A', 'U', 131, 15,
-'S', 'X', 152, 15,
+'A', 'U', 145, 15,
+'S', 'X', 166, 15,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
@@ -4016,19 +4030,19 @@
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-0, 0, 110, 255,
+0, 0, 109, 255,
0, 0, 245, 0,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'_', '_', 158, 15,
-'Q', 'U', 159, 15,
+'_', '_', 172, 15,
+'Q', 'U', 173, 15,
0, 0, 5, 1,
0, 0, 2, 2,
0, 0, 2, 2,
0, 0, 2, 2,
-'P', 'S', 164, 15,
+'P', 'S', 178, 15,
0, 0, 7, 1,
0, 0, 2, 2,
0, 0, 2, 2,
Modified: mysql-5.0.51-tritonn-1.0.8/sql/sql_yacc.cc
===================================================================
--- mysql-5.0.51-tritonn-1.0.8/sql/sql_yacc.cc 2007-12-10 07:01:42 UTC (rev 51)
+++ mysql-5.0.51-tritonn-1.0.8/sql/sql_yacc.cc 2007-12-10 10:56:06 UTC (rev 52)
@@ -2926,162 +2926,162 @@
3555, 3558, 3559, 3560, 3561, 3562, 3565, 3566, 3567, 3579,
3580, 3583, 3584, 3587, 3588, 3592, 3593, 3594, 3597, 3598,
3599, 3600, 3613, 3614, 3615, 3618, 3619, 3623, 3624, 3627,
- 3628, 3631, 3636, 3641, 3646, 3651, 3656, 3661, 3666, 3671,
- 3676, 3681, 3686, 3697, 3698, 3701, 3702, 3713, 3714, 3717,
- 3718, 3721, 3722, 3730, 3729, 3756, 3755, 3769, 3768, 3787,
- 3786, 3806, 3804, 3824, 3825, 3827, 3828, 3829, 3830, 3831,
- 3834, 3842, 3843, 3847, 3852, 3851, 3859, 3868, 3858, 3880,
- 3887, 3891, 3898, 3905, 3911, 3917, 3923, 3930, 3948, 3969,
- 3974, 3978, 3985, 3986, 3989, 3990, 3994, 3995, 3996, 4000,
- 4001, 4002, 4005, 4006, 4007, 4008, 4016, 4015, 4026, 4034,
- 4033, 4043, 4053, 4062, 4063, 4070, 4070, 4076, 4077, 4081,
- 4082, 4083, 4087, 4088, 4105, 4106, 4111, 4110, 4121, 4120,
- 4131, 4130, 4140, 4141, 4142, 4147, 4146, 4158, 4159, 4162,
- 4163, 4166, 4167, 4168, 4172, 4171, 4184, 4183, 4200, 4201,
- 4204, 4205, 4208, 4209, 4210, 4211, 4212, 4213, 4217, 4216,
- 4228, 4229, 4230, 4235, 4234, 4240, 4247, 4252, 4260, 4261,
- 4264, 4276, 4285, 4286, 4289, 4302, 4303, 4308, 4307, 4317,
- 4318, 4321, 4334, 4334, 4344, 4345, 4354, 4355, 4364, 4373,
- 4375, 4378, 4400, 4404, 4403, 4423, 4431, 4423, 4437, 4438,
- 4439, 4440, 4441, 4444, 4451, 4458, 4460, 4471, 4472, 4475,
- 4476, 4482, 4483, 4484, 4485, 4491, 4497, 4503, 4517, 4520,
- 4522, 4528, 4538, 4539, 4540, 4553, 4573, 4580, 4587, 4588,
- 4591, 4592, 4593, 4594, 4595, 4599, 4600, 4604, 4653, 4658,
- 4699, 4701, 4703, 4705, 4707, 4709, 4711, 4713, 4717, 4719,
- 4721, 4723, 4725, 4727, 4730, 4734, 4740, 4744, 4750, 4754,
- 4762, 4764, 4770, 4773, 4775, 4777, 4778, 4780, 4783, 4785,
- 4787, 4789, 4791, 4793, 4795, 4797, 4799, 4801, 4803, 4805,
- 4807, 4809, 4811, 4814, 4814, 4815, 4815, 4816, 4816, 4817,
- 4817, 4819, 4820, 4821, 4822, 4823, 4824, 4827, 4828, 4832,
- 4837, 4838, 4845, 4846, 4847, 4848, 4849, 4851, 4852, 4853,
- 4854, 4855, 4859, 4860, 4865, 4870, 4874, 4875, 4879, 4880,
- 4884, 4891, 4893, 4899, 4901, 4912, 4914, 4925, 4936, 4947,
- 4958, 4960, 4962, 4964, 4966, 4968, 4970, 4972, 4974, 4976,
- 4978, 4980, 4982, 4988, 4990, 4992, 4997, 5002, 5004, 5006,
- 5011, 5013, 5015, 5017, 5019, 5024, 5025, 5027, 5029, 5031,
- 5033, 5035, 5037, 5039, 5041, 5043, 5045, 5047, 5051, 5053,
- 5063, 5065, 5067, 5069, 5071, 5074, 5083, 5088, 5093, 5095,
- 5097, 5099, 5101, 5103, 5105, 5107, 5112, 5117, 5119, 5121,
- 5123, 5125, 5127, 5129, 5135, 5137, 5139, 5141, 5143, 5145,
- 5147, 5149, 5151, 5152, 5158, 5163, 5165, 5167, 5169, 5171,
- 5173, 5175, 5177, 5179, 5186, 5193, 5195, 5197, 5199, 5201,
- 5203, 5205, 5207, 5209, 5211, 5213, 5215, 5217, 5219, 5221,
- 5235, 5234, 5351, 5355, 5360, 5362, 5364, 5366, 5368, 5370,
- 5375, 5377, 5379, 5381, 5383, 5388, 5392, 5394, 5396, 5398,
- 5400, 5402, 5406, 5409, 5412, 5414, 5416, 5418, 5420, 5422,
- 5424, 5427, 5430, 5432, 5434, 5436, 5438, 5440, 5443, 5445,
- 5447, 5449, 5454, 5455, 5456, 5460, 5461, 5465, 5465, 5471,
- 5475, 5482, 5513, 5515, 5517, 5519, 5521, 5523, 5525, 5528,
- 5530, 5527, 5533, 5535, 5542, 5544, 5546, 5548, 5550, 5552,
- 5554, 5556, 5558, 5561, 5560, 5575, 5574, 5589, 5595, 5601,
- 5614, 5615, 5619, 5622, 5627, 5630, 5642, 5641, 5657, 5658,
- 5659, 5660, 5661, 5662, 5663, 5664, 5665, 5666, 5667, 5671,
- 5672, 5676, 5676, 5681, 5682, 5685, 5686, 5689, 5689, 5694,
- 5695, 5698, 5699, 5702, 5703, 5706, 5712, 5722, 5723, 5732,
- 5737, 5738, 5758, 5760, 5764, 5762, 5779, 5777, 5795, 5793,
- 5800, 5809, 5807, 5825, 5824, 5834, 5845, 5843, 5862, 5861,
- 5872, 5882, 5883, 5884, 5889, 5889, 5908, 5906, 5925, 5947,
- 5995, 5994, 6017, 6035, 6017, 6042, 6046, 6072, 6073, 6075,
- 6077, 6080, 6081, 6087, 6094, 6103, 6102, 6109, 6110, 6114,
- 6118, 6122, 6128, 6136, 6145, 6146, 6147, 6148, 6149, 6150,
- 6151, 6152, 6153, 6154, 6155, 6156, 6157, 6160, 6161, 6162,
- 6163, 6164, 6165, 6166, 6167, 6168, 6172, 6173, 6174, 6175,
- 6178, 6180, 6181, 6184, 6185, 6188, 6190, 6194, 6196, 6195,
- 6209, 6212, 6211, 6226, 6232, 6245, 6247, 6250, 6252, 6256,
- 6257, 6270, 6288, 6292, 6293, 6297, 6310, 6312, 6316, 6315,
- 6347, 6349, 6353, 6354, 6355, 6360, 6366, 6370, 6371, 6375,
- 6379, 6386, 6393, 6402, 6406, 6407, 6408, 6413, 6417, 6425,
- 6426, 6427, 6428, 6429, 6430, 6434, 6435, 6436, 6437, 6438,
- 6441, 6444, 6443, 6472, 6473, 6476, 6477, 6480, 6495, 6495,
- 6505, 6506, 6510, 6522, 6555, 6554, 6567, 6566, 6575, 6587,
- 6598, 6597, 6614, 6621, 6621, 6633, 6640, 6652, 6664, 6668,
- 6674, 6684, 6685, 6688, 6696, 6697, 6700, 6710, 6711, 6715,
- 6716, 6724, 6733, 6723, 6743, 6750, 6742, 6760, 6772, 6773,
- 6774, 6778, 6779, 6782, 6783, 6786, 6795, 6796, 6797, 6799,
- 6798, 6808, 6809, 6812, 6813, 6814, 6814, 6815, 6815, 6819,
- 6820, 6823, 6825, 6828, 6836, 6837, 6841, 6842, 6847, 6846,
- 6859, 6860, 6863, 6868, 6876, 6877, 6880, 6882, 6882, 6890,
- 6899, 6889, 6921, 6922, 6925, 6932, 6933, 6936, 6945, 6946,
- 6952, 6951, 6965, 6964, 6973, 6972, 6980, 6979, 6989, 6990,
- 6993, 7000, 7013, 7014, 7018, 7019, 7022, 7023, 7024, 7027,
- 7037, 7039, 7041, 7043, 7046, 7047, 7050, 7054, 7058, 7062,
- 7066, 7070, 7074, 7078, 7082, 7090, 7093, 7102, 7101, 7115,
- 7123, 7132, 7141, 7150, 7160, 7159, 7162, 7172, 7182, 7186,
- 7191, 7190, 7195, 7205, 7210, 7216, 7221, 7226, 7228, 7230,
- 7232, 7234, 7236, 7244, 7253, 7255, 7257, 7259, 7268, 7276,
- 7284, 7286, 7288, 7298, 7305, 7311, 7319, 7327, 7331, 7335,
- 7342, 7349, 7359, 7369, 7379, 7390, 7399, 7413, 7426, 7427,
- 7429, 7431, 7434, 7435, 7438, 7439, 7442, 7443, 7446, 7447,
- 7450, 7451, 7453, 7455, 7458, 7470, 7469, 7484, 7483, 7493,
- 7494, 7497, 7498, 7502, 7503, 7504, 7512, 7511, 7523, 7524,
- 7527, 7527, 7528, 7529, 7530, 7531, 7532, 7533, 7534, 7535,
- 7536, 7537, 7540, 7541, 7545, 7544, 7553, 7554, 7557, 7558,
- 7559, 7563, 7562, 7572, 7576, 7580, 7592, 7592, 7600, 7601,
- 7602, 7607, 7617, 7616, 7632, 7650, 7661, 7668, 7678, 7649,
- 7683, 7692, 7693, 7696, 7697, 7709, 7713, 7714, 7715, 7717,
- 7719, 7722, 7723, 7726, 7731, 7738, 7743, 7749, 7751, 7754,
- 7755, 7758, 7763, 7769, 7771, 7778, 7779, 7780, 7783, 7785,
- 7790, 7791, 7796, 7797, 7803, 7821, 7829, 7834, 7853, 7855,
- 7866, 7879, 7900, 7901, 7902, 7911, 7912, 7913, 7918, 7919,
- 7920, 7921, 7922, 7938, 7952, 7953, 7954, 7957, 7958, 7959,
- 7960, 7968, 7983, 7984, 7987, 7993, 8004, 8007, 8044, 8048,
- 8056, 8060, 8128, 8143, 8167, 8168, 8184, 8194, 8197, 8198,
- 8199, 8203, 8207, 8208, 8233, 8245, 8258, 8270, 8271, 8280,
- 8281, 8290, 8291, 8292, 8295, 8308, 8321, 8335, 8336, 8337,
- 8338, 8339, 8340, 8341, 8342, 8343, 8344, 8345, 8346, 8347,
- 8348, 8349, 8350, 8351, 8352, 8353, 8354, 8355, 8356, 8357,
- 8358, 8359, 8360, 8361, 8362, 8363, 8364, 8365, 8366, 8367,
- 8368, 8369, 8370, 8371, 8381, 8382, 8383, 8384, 8385, 8386,
- 8387, 8388, 8389, 8390, 8391, 8392, 8393, 8394, 8395, 8396,
- 8397, 8398, 8399, 8400, 8401, 8402, 8403, 8404, 8405, 8406,
- 8407, 8408, 8409, 8410, 8411, 8412, 8413, 8414, 8415, 8416,
- 8417, 8418, 8419, 8420, 8421, 8422, 8423, 8424, 8425, 8426,
- 8427, 8428, 8429, 8430, 8431, 8432, 8433, 8434, 8435, 8436,
- 8437, 8438, 8439, 8440, 8441, 8442, 8443, 8444, 8445, 8446,
- 8447, 8448, 8449, 8450, 8451, 8452, 8453, 8454, 8455, 8456,
- 8457, 8458, 8459, 8460, 8461, 8462, 8463, 8464, 8465, 8466,
- 8467, 8468, 8469, 8470, 8471, 8472, 8473, 8474, 8475, 8476,
- 8477, 8478, 8479, 8480, 8481, 8482, 8483, 8484, 8485, 8486,
- 8487, 8488, 8489, 8490, 8491, 8492, 8493, 8494, 8495, 8496,
- 8497, 8498, 8499, 8500, 8501, 8502, 8503, 8504, 8505, 8506,
- 8507, 8508, 8509, 8510, 8511, 8512, 8513, 8514, 8515, 8516,
- 8517, 8518, 8519, 8520, 8521, 8522, 8523, 8524, 8525, 8526,
- 8527, 8528, 8529, 8530, 8531, 8532, 8533, 8534, 8535, 8536,
- 8537, 8538, 8539, 8540, 8541, 8542, 8543, 8544, 8545, 8546,
- 8547, 8548, 8549, 8550, 8551, 8552, 8553, 8554, 8555, 8556,
- 8557, 8558, 8559, 8560, 8561, 8562, 8563, 8564, 8565, 8566,
- 8567, 8568, 8569, 8570, 8571, 8572, 8573, 8574, 8575, 8576,
- 8577, 8578, 8579, 8580, 8581, 8582, 8583, 8584, 8585, 8586,
- 8587, 8588, 8589, 8590, 8591, 8592, 8593, 8594, 8595, 8596,
- 8597, 8598, 8599, 8600, 8601, 8602, 8603, 8604, 8605, 8606,
- 8607, 8608, 8609, 8610, 8611, 8612, 8613, 8614, 8615, 8616,
- 8623, 8622, 8636, 8637, 8640, 8641, 8644, 8644, 8721, 8722,
- 8723, 8724, 8728, 8729, 8733, 8734, 8735, 8736, 8740, 8741,
- 8742, 8743, 8747, 8748, 8751, 8831, 8844, 8848, 8853, 8860,
- 8875, 8888, 8909, 8916, 8954, 8997, 9011, 9012, 9013, 9014,
- 9018, 9019, 9026, 9035, 9036, 9037, 9038, 9039, 9047, 9046,
- 9062, 9063, 9066, 9067, 9070, 9078, 9079, 9080, 9081, 9086,
- 9085, 9106, 9118, 9131, 9130, 9149, 9150, 9154, 9155, 9159,
- 9160, 9161, 9162, 9164, 9163, 9174, 9175, 9176, 9177, 9178,
- 9184, 9189, 9196, 9209, 9221, 9228, 9233, 9241, 9254, 9268,
- 9270, 9273, 9274, 9281, 9283, 9287, 9288, 9291, 9291, 9292,
- 9292, 9293, 9293, 9294, 9294, 9295, 9296, 9297, 9298, 9299,
- 9300, 9301, 9302, 9303, 9304, 9305, 9306, 9307, 9308, 9309,
- 9310, 9311, 9312, 9313, 9314, 9315, 9316, 9317, 9322, 9323,
- 9327, 9328, 9332, 9342, 9352, 9365, 9379, 9392, 9405, 9418,
- 9419, 9428, 9429, 9438, 9463, 9465, 9472, 9476, 9479, 9480,
- 9483, 9504, 9505, 9509, 9513, 9517, 9524, 9525, 9528, 9529,
- 9533, 9534, 9540, 9546, 9552, 9562, 9561, 9571, 9572, 9576,
- 9577, 9578, 9582, 9583, 9584, 9588, 9589, 9593, 9603, 9610,
- 9620, 9629, 9643, 9644, 9649, 9648, 9683, 9684, 9685, 9689,
- 9689, 9713, 9714, 9718, 9719, 9720, 9724, 9729, 9728, 9748,
- 9754, 9775, 9797, 9799, 9804, 9806, 9808, 9820, 9830, 9843,
- 9845, 9847, 9852, 9857, 9859, 9861, 9867, 9868, 9874, 9875,
- 9877, 9883, 9882, 9897, 9898, 9902, 9907, 9915, 9915, 9933,
- 9942, 9955, 9956, 9958, 9960, 9973, 9971, 10048, 10047, 10057,
- 10086, 10095, 10104, 10056, 10128, 10132, 10136, 10140, 10144, 10148,
- 10154, 10161, 10168, 10177, 10178, 10182, 10183, 10184, 10188, 10189,
- 10193, 10194, 10194, 10199, 10200
+ 3628, 3631, 3636, 3641, 3646, 3651, 3656, 3661, 3666, 3672,
+ 3678, 3683, 3688, 3699, 3700, 3703, 3704, 3715, 3716, 3719,
+ 3720, 3723, 3724, 3732, 3731, 3758, 3757, 3771, 3770, 3789,
+ 3788, 3808, 3806, 3826, 3827, 3829, 3830, 3831, 3832, 3833,
+ 3836, 3844, 3845, 3849, 3854, 3853, 3861, 3870, 3860, 3882,
+ 3889, 3893, 3900, 3907, 3913, 3919, 3925, 3932, 3950, 3971,
+ 3976, 3980, 3987, 3988, 3991, 3992, 3996, 3997, 3998, 4002,
+ 4003, 4004, 4007, 4008, 4009, 4010, 4018, 4017, 4028, 4036,
+ 4035, 4045, 4055, 4064, 4065, 4072, 4072, 4078, 4079, 4083,
+ 4084, 4085, 4089, 4090, 4107, 4108, 4113, 4112, 4123, 4122,
+ 4133, 4132, 4142, 4143, 4144, 4149, 4148, 4160, 4161, 4164,
+ 4165, 4168, 4169, 4170, 4174, 4173, 4186, 4185, 4202, 4203,
+ 4206, 4207, 4210, 4211, 4212, 4213, 4214, 4215, 4219, 4218,
+ 4230, 4231, 4232, 4237, 4236, 4242, 4249, 4254, 4262, 4263,
+ 4266, 4278, 4287, 4288, 4291, 4304, 4305, 4310, 4309, 4319,
+ 4320, 4323, 4336, 4336, 4346, 4347, 4356, 4357, 4366, 4375,
+ 4377, 4380, 4402, 4406, 4405, 4425, 4433, 4425, 4439, 4440,
+ 4441, 4442, 4443, 4446, 4453, 4460, 4462, 4473, 4474, 4477,
+ 4478, 4484, 4485, 4486, 4487, 4493, 4499, 4505, 4519, 4522,
+ 4524, 4530, 4540, 4541, 4542, 4555, 4575, 4582, 4589, 4590,
+ 4593, 4594, 4595, 4596, 4597, 4601, 4602, 4606, 4655, 4660,
+ 4701, 4703, 4705, 4707, 4709, 4711, 4713, 4715, 4719, 4721,
+ 4723, 4725, 4727, 4729, 4732, 4736, 4742, 4746, 4752, 4756,
+ 4764, 4766, 4772, 4775, 4777, 4779, 4780, 4782, 4785, 4787,
+ 4789, 4791, 4793, 4795, 4797, 4799, 4801, 4803, 4805, 4807,
+ 4809, 4811, 4813, 4816, 4816, 4817, 4817, 4818, 4818, 4819,
+ 4819, 4821, 4822, 4823, 4824, 4825, 4826, 4829, 4830, 4834,
+ 4839, 4840, 4847, 4848, 4849, 4850, 4851, 4853, 4854, 4855,
+ 4856, 4857, 4861, 4862, 4867, 4872, 4876, 4877, 4881, 4882,
+ 4886, 4893, 4895, 4901, 4903, 4914, 4916, 4927, 4938, 4949,
+ 4960, 4962, 4964, 4966, 4968, 4970, 4972, 4974, 4976, 4978,
+ 4980, 4982, 4984, 4990, 4992, 4994, 4999, 5004, 5006, 5008,
+ 5013, 5015, 5017, 5019, 5021, 5026, 5027, 5029, 5031, 5033,
+ 5035, 5037, 5039, 5041, 5043, 5045, 5047, 5049, 5053, 5055,
+ 5065, 5067, 5069, 5071, 5073, 5076, 5085, 5090, 5095, 5097,
+ 5099, 5101, 5103, 5105, 5107, 5109, 5114, 5119, 5121, 5123,
+ 5125, 5127, 5129, 5131, 5137, 5139, 5141, 5143, 5145, 5147,
+ 5149, 5151, 5153, 5154, 5160, 5165, 5167, 5169, 5171, 5173,
+ 5175, 5177, 5179, 5181, 5188, 5195, 5197, 5199, 5201, 5203,
+ 5205, 5207, 5209, 5211, 5213, 5215, 5217, 5219, 5221, 5223,
+ 5237, 5236, 5353, 5357, 5362, 5364, 5366, 5368, 5370, 5372,
+ 5377, 5379, 5381, 5383, 5385, 5390, 5394, 5396, 5398, 5400,
+ 5402, 5404, 5408, 5411, 5414, 5416, 5418, 5420, 5422, 5424,
+ 5426, 5429, 5432, 5434, 5436, 5438, 5440, 5442, 5445, 5447,
+ 5449, 5451, 5456, 5457, 5458, 5462, 5463, 5467, 5467, 5473,
+ 5477, 5484, 5515, 5517, 5519, 5521, 5523, 5525, 5527, 5530,
+ 5532, 5529, 5535, 5537, 5544, 5546, 5548, 5550, 5552, 5554,
+ 5556, 5558, 5560, 5563, 5562, 5577, 5576, 5591, 5597, 5603,
+ 5616, 5617, 5621, 5624, 5629, 5632, 5644, 5643, 5659, 5660,
+ 5661, 5662, 5663, 5664, 5665, 5666, 5667, 5668, 5669, 5673,
+ 5674, 5678, 5678, 5683, 5684, 5687, 5688, 5691, 5691, 5696,
+ 5697, 5700, 5701, 5704, 5705, 5708, 5714, 5724, 5725, 5734,
+ 5739, 5740, 5760, 5762, 5766, 5764, 5781, 5779, 5797, 5795,
+ 5802, 5811, 5809, 5827, 5826, 5836, 5847, 5845, 5864, 5863,
+ 5874, 5884, 5885, 5886, 5891, 5891, 5910, 5908, 5927, 5949,
+ 5997, 5996, 6019, 6037, 6019, 6044, 6048, 6074, 6075, 6077,
+ 6079, 6082, 6083, 6089, 6096, 6105, 6104, 6111, 6112, 6116,
+ 6120, 6124, 6130, 6138, 6147, 6148, 6149, 6150, 6151, 6152,
+ 6153, 6154, 6155, 6156, 6157, 6158, 6159, 6162, 6163, 6164,
+ 6165, 6166, 6167, 6168, 6169, 6170, 6174, 6175, 6176, 6177,
+ 6180, 6182, 6183, 6186, 6187, 6190, 6192, 6196, 6198, 6197,
+ 6211, 6214, 6213, 6228, 6234, 6247, 6249, 6252, 6254, 6258,
+ 6259, 6272, 6290, 6294, 6295, 6299, 6312, 6314, 6318, 6317,
+ 6349, 6351, 6355, 6356, 6357, 6362, 6368, 6372, 6373, 6377,
+ 6381, 6388, 6395, 6404, 6408, 6409, 6410, 6415, 6419, 6427,
+ 6428, 6429, 6430, 6431, 6432, 6436, 6437, 6438, 6439, 6440,
+ 6443, 6446, 6445, 6474, 6475, 6478, 6479, 6482, 6497, 6497,
+ 6507, 6508, 6512, 6524, 6557, 6556, 6569, 6568, 6577, 6589,
+ 6600, 6599, 6616, 6623, 6623, 6635, 6642, 6654, 6666, 6670,
+ 6676, 6686, 6687, 6690, 6698, 6699, 6702, 6712, 6713, 6717,
+ 6718, 6726, 6735, 6725, 6745, 6752, 6744, 6762, 6774, 6775,
+ 6776, 6780, 6781, 6784, 6785, 6788, 6797, 6798, 6799, 6801,
+ 6800, 6810, 6811, 6814, 6815, 6816, 6816, 6817, 6817, 6821,
+ 6822, 6825, 6827, 6830, 6838, 6839, 6843, 6844, 6849, 6848,
+ 6861, 6862, 6865, 6870, 6878, 6879, 6882, 6884, 6884, 6892,
+ 6901, 6891, 6923, 6924, 6927, 6934, 6935, 6938, 6947, 6948,
+ 6954, 6953, 6967, 6966, 6975, 6974, 6982, 6981, 6991, 6992,
+ 6995, 7002, 7015, 7016, 7020, 7021, 7024, 7025, 7026, 7029,
+ 7039, 7041, 7043, 7045, 7048, 7049, 7052, 7056, 7060, 7064,
+ 7068, 7072, 7076, 7080, 7084, 7092, 7095, 7104, 7103, 7117,
+ 7125, 7134, 7143, 7152, 7162, 7161, 7164, 7174, 7184, 7188,
+ 7193, 7192, 7197, 7207, 7212, 7218, 7223, 7228, 7230, 7232,
+ 7234, 7236, 7238, 7246, 7255, 7257, 7259, 7261, 7270, 7278,
+ 7286, 7288, 7290, 7300, 7307, 7313, 7321, 7329, 7333, 7337,
+ 7344, 7351, 7361, 7371, 7381, 7392, 7401, 7415, 7428, 7429,
+ 7431, 7433, 7436, 7437, 7440, 7441, 7444, 7445, 7448, 7449,
+ 7452, 7453, 7455, 7457, 7460, 7472, 7471, 7486, 7485, 7495,
+ 7496, 7499, 7500, 7504, 7505, 7506, 7514, 7513, 7525, 7526,
+ 7529, 7529, 7530, 7531, 7532, 7533, 7534, 7535, 7536, 7537,
+ 7538, 7539, 7542, 7543, 7547, 7546, 7555, 7556, 7559, 7560,
+ 7561, 7565, 7564, 7574, 7578, 7582, 7594, 7594, 7602, 7603,
+ 7604, 7609, 7619, 7618, 7634, 7652, 7663, 7670, 7680, 7651,
+ 7685, 7694, 7695, 7698, 7699, 7711, 7715, 7716, 7717, 7719,
+ 7721, 7724, 7725, 7728, 7733, 7740, 7745, 7751, 7753, 7756,
+ 7757, 7760, 7765, 7771, 7773, 7780, 7781, 7782, 7785, 7787,
+ 7792, 7793, 7798, 7799, 7805, 7823, 7831, 7836, 7855, 7857,
+ 7868, 7881, 7902, 7903, 7904, 7913, 7914, 7915, 7920, 7921,
+ 7922, 7923, 7924, 7940, 7954, 7955, 7956, 7959, 7960, 7961,
+ 7962, 7970, 7985, 7986, 7989, 7995, 8006, 8009, 8046, 8050,
+ 8058, 8062, 8130, 8145, 8169, 8170, 8186, 8196, 8199, 8200,
+ 8201, 8205, 8209, 8210, 8235, 8247, 8260, 8272, 8273, 8282,
+ 8283, 8292, 8293, 8294, 8297, 8310, 8323, 8337, 8338, 8339,
+ 8340, 8341, 8342, 8343, 8344, 8345, 8346, 8347, 8348, 8349,
+ 8350, 8351, 8352, 8353, 8354, 8355, 8356, 8357, 8358, 8359,
+ 8360, 8361, 8362, 8363, 8364, 8365, 8366, 8367, 8368, 8369,
+ 8370, 8371, 8372, 8373, 8383, 8384, 8385, 8386, 8387, 8388,
+ 8389, 8390, 8391, 8392, 8393, 8394, 8395, 8396, 8397, 8398,
+ 8399, 8400, 8401, 8402, 8403, 8404, 8405, 8406, 8407, 8408,
+ 8409, 8410, 8411, 8412, 8413, 8414, 8415, 8416, 8417, 8418,
+ 8419, 8420, 8421, 8422, 8423, 8424, 8425, 8426, 8427, 8428,
+ 8429, 8430, 8431, 8432, 8433, 8434, 8435, 8436, 8437, 8438,
+ 8439, 8440, 8441, 8442, 8443, 8444, 8445, 8446, 8447, 8448,
+ 8449, 8450, 8451, 8452, 8453, 8454, 8455, 8456, 8457, 8458,
+ 8459, 8460, 8461, 8462, 8463, 8464, 8465, 8466, 8467, 8468,
+ 8469, 8470, 8471, 8472, 8473, 8474, 8475, 8476, 8477, 8478,
+ 8479, 8480, 8481, 8482, 8483, 8484, 8485, 8486, 8487, 8488,
+ 8489, 8490, 8491, 8492, 8493, 8494, 8495, 8496, 8497, 8498,
+ 8499, 8500, 8501, 8502, 8503, 8504, 8505, 8506, 8507, 8508,
+ 8509, 8510, 8511, 8512, 8513, 8514, 8515, 8516, 8517, 8518,
+ 8519, 8520, 8521, 8522, 8523, 8524, 8525, 8526, 8527, 8528,
+ 8529, 8530, 8531, 8532, 8533, 8534, 8535, 8536, 8537, 8538,
+ 8539, 8540, 8541, 8542, 8543, 8544, 8545, 8546, 8547, 8548,
+ 8549, 8550, 8551, 8552, 8553, 8554, 8555, 8556, 8557, 8558,
+ 8559, 8560, 8561, 8562, 8563, 8564, 8565, 8566, 8567, 8568,
+ 8569, 8570, 8571, 8572, 8573, 8574, 8575, 8576, 8577, 8578,
+ 8579, 8580, 8581, 8582, 8583, 8584, 8585, 8586, 8587, 8588,
+ 8589, 8590, 8591, 8592, 8593, 8594, 8595, 8596, 8597, 8598,
+ 8599, 8600, 8601, 8602, 8603, 8604, 8605, 8606, 8607, 8608,
+ 8609, 8610, 8611, 8612, 8613, 8614, 8615, 8616, 8617, 8618,
+ 8625, 8624, 8638, 8639, 8642, 8643, 8646, 8646, 8723, 8724,
+ 8725, 8726, 8730, 8731, 8735, 8736, 8737, 8738, 8742, 8743,
+ 8744, 8745, 8749, 8750, 8753, 8833, 8846, 8850, 8855, 8862,
+ 8877, 8890, 8911, 8918, 8956, 8999, 9013, 9014, 9015, 9016,
+ 9020, 9021, 9028, 9037, 9038, 9039, 9040, 9041, 9049, 9048,
+ 9064, 9065, 9068, 9069, 9072, 9080, 9081, 9082, 9083, 9088,
+ 9087, 9108, 9120, 9133, 9132, 9151, 9152, 9156, 9157, 9161,
+ 9162, 9163, 9164, 9166, 9165, 9176, 9177, 9178, 9179, 9180,
+ 9186, 9191, 9198, 9211, 9223, 9230, 9235, 9243, 9256, 9270,
+ 9272, 9275, 9276, 9283, 9285, 9289, 9290, 9293, 9293, 9294,
+ 9294, 9295, 9295, 9296, 9296, 9297, 9298, 9299, 9300, 9301,
+ 9302, 9303, 9304, 9305, 9306, 9307, 9308, 9309, 9310, 9311,
+ 9312, 9313, 9314, 9315, 9316, 9317, 9318, 9319, 9324, 9325,
+ 9329, 9330, 9334, 9344, 9354, 9367, 9381, 9394, 9407, 9420,
+ 9421, 9430, 9431, 9440, 9465, 9467, 9474, 9478, 9481, 9482,
+ 9485, 9506, 9507, 9511, 9515, 9519, 9526, 9527, 9530, 9531,
+ 9535, 9536, 9542, 9548, 9554, 9564, 9563, 9573, 9574, 9578,
+ 9579, 9580, 9584, 9585, 9586, 9590, 9591, 9595, 9605, 9612,
+ 9622, 9631, 9645, 9646, 9651, 9650, 9685, 9686, 9687, 9691,
+ 9691, 9715, 9716, 9720, 9721, 9722, 9726, 9731, 9730, 9750,
+ 9756, 9777, 9799, 9801, 9806, 9808, 9810, 9822, 9832, 9845,
+ 9847, 9849, 9854, 9859, 9861, 9863, 9869, 9870, 9876, 9877,
+ 9879, 9885, 9884, 9899, 9900, 9904, 9909, 9917, 9917, 9935,
+ 9944, 9957, 9958, 9960, 9962, 9975, 9973, 10050, 10049, 10059,
+ 10088, 10097, 10106, 10058, 10130, 10134, 10138, 10142, 10146, 10150,
+ 10156, 10163, 10170, 10179, 10180, 10184, 10185, 10186, 10190, 10191,
+ 10195, 10196, 10196, 10201, 10202
};
#endif
@@ -18167,22 +18167,24 @@
#line 3666 "sql_yacc.yy"
{
#ifdef ENABLE_SENNA
+ Lex->senna_flags &= ~SEN_INDEX_NGRAM;
Lex->senna_flags |= SEN_INDEX_DELIMITED;
#endif /* ENABLE_SENNA */
}
break;
case 529:
-#line 3671 "sql_yacc.yy"
+#line 3672 "sql_yacc.yy"
{
#ifdef ENABLE_SENNA
+ Lex->senna_flags &= ~SEN_INDEX_DELIMITED;
Lex->senna_flags &= ~SEN_INDEX_NGRAM;
#endif /* ENABLE_SENNA */
}
break;
case 530:
-#line 3676 "sql_yacc.yy"
+#line 3678 "sql_yacc.yy"
{
#ifdef ENABLE_SENNA
Lex->senna_flags |= SEN_INDEX_NGRAM;
@@ -18191,7 +18193,7 @@
break;
case 531:
-#line 3681 "sql_yacc.yy"
+#line 3683 "sql_yacc.yy"
{
#ifdef ENABLE_SENNA
Lex->senna_flags |= 0x00080000;
@@ -18200,7 +18202,7 @@
break;
case 532:
-#line 3686 "sql_yacc.yy"
+#line 3688 "sql_yacc.yy"
{
#ifdef ENABLE_SENNA
if ((yyvsp[(1) - (1)].ulong_num) < 65536) {
@@ -18213,22 +18215,22 @@
break;
case 533:
-#line 3697 "sql_yacc.yy"
+#line 3699 "sql_yacc.yy"
{ Lex->col_list.push_back((yyvsp[(3) - (4)].key_part)); }
break;
case 534:
-#line 3698 "sql_yacc.yy"
+#line 3700 "sql_yacc.yy"
{ Lex->col_list.push_back((yyvsp[(1) - (2)].key_part)); }
break;
case 535:
-#line 3701 "sql_yacc.yy"
+#line 3703 "sql_yacc.yy"
{ (yyval.key_part)=new key_part_spec((yyvsp[(1) - (1)].lex_str).str); }
break;
case 536:
-#line 3703 "sql_yacc.yy"
+#line 3705 "sql_yacc.yy"
{
int key_part_len= atoi((yyvsp[(3) - (4)].lex_str).str);
if (!key_part_len)
@@ -18240,37 +18242,37 @@
break;
case 537:
-#line 3713 "sql_yacc.yy"
+#line 3715 "sql_yacc.yy"
{ (yyval.simple_string)=(char*) 0; }
break;
case 538:
-#line 3714 "sql_yacc.yy"
+#line 3716 "sql_yacc.yy"
{ (yyval.simple_string)=(yyvsp[(1) - (1)].lex_str).str; }
break;
case 539:
-#line 3717 "sql_yacc.yy"
+#line 3719 "sql_yacc.yy"
{ (yyval.lex_str)= null_lex_str; }
break;
case 540:
-#line 3718 "sql_yacc.yy"
+#line 3720 "sql_yacc.yy"
{ (yyval.lex_str)= (yyvsp[(2) - (2)].lex_str); }
break;
case 541:
-#line 3721 "sql_yacc.yy"
+#line 3723 "sql_yacc.yy"
{ Lex->interval_list.push_back((yyvsp[(1) - (1)].string)); }
break;
case 542:
-#line 3722 "sql_yacc.yy"
+#line 3724 "sql_yacc.yy"
{ Lex->interval_list.push_back((yyvsp[(3) - (3)].string)); }
break;
case 543:
-#line 3730 "sql_yacc.yy"
+#line 3732 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -18297,12 +18299,12 @@
break;
case 544:
-#line 3754 "sql_yacc.yy"
+#line 3756 "sql_yacc.yy"
{}
break;
case 545:
-#line 3756 "sql_yacc.yy"
+#line 3758 "sql_yacc.yy"
{
Lex->create_info.default_table_charset= NULL;
Lex->create_info.used_fields= 0;
@@ -18310,7 +18312,7 @@
break;
case 546:
-#line 3761 "sql_yacc.yy"
+#line 3763 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command=SQLCOM_ALTER_DB;
@@ -18321,7 +18323,7 @@
break;
case 547:
-#line 3769 "sql_yacc.yy"
+#line 3771 "sql_yacc.yy"
{
LEX *lex= Lex;
@@ -18335,7 +18337,7 @@
break;
case 548:
-#line 3780 "sql_yacc.yy"
+#line 3782 "sql_yacc.yy"
{
LEX *lex=Lex;
@@ -18345,7 +18347,7 @@
break;
case 549:
-#line 3787 "sql_yacc.yy"
+#line 3789 "sql_yacc.yy"
{
LEX *lex= Lex;
@@ -18359,7 +18361,7 @@
break;
case 550:
-#line 3798 "sql_yacc.yy"
+#line 3800 "sql_yacc.yy"
{
LEX *lex=Lex;
@@ -18369,7 +18371,7 @@
break;
case 551:
-#line 3806 "sql_yacc.yy"
+#line 3808 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -18386,32 +18388,32 @@
break;
case 552:
-#line 3820 "sql_yacc.yy"
+#line 3822 "sql_yacc.yy"
{}
break;
case 553:
-#line 3824 "sql_yacc.yy"
+#line 3826 "sql_yacc.yy"
{ (yyval.simple_string)= 0; }
break;
case 554:
-#line 3825 "sql_yacc.yy"
+#line 3827 "sql_yacc.yy"
{ (yyval.simple_string)= (yyvsp[(1) - (1)].lex_str).str; }
break;
case 556:
-#line 3828 "sql_yacc.yy"
+#line 3830 "sql_yacc.yy"
{ Lex->alter_info.tablespace_op= DISCARD_TABLESPACE; }
break;
case 557:
-#line 3829 "sql_yacc.yy"
+#line 3831 "sql_yacc.yy"
{ Lex->alter_info.tablespace_op= IMPORT_TABLESPACE; }
break;
case 560:
-#line 3835 "sql_yacc.yy"
+#line 3837 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->change=0;
@@ -18420,26 +18422,26 @@
break;
case 561:
-#line 3842 "sql_yacc.yy"
+#line 3844 "sql_yacc.yy"
{ }
break;
case 562:
-#line 3844 "sql_yacc.yy"
+#line 3846 "sql_yacc.yy"
{
Lex->alter_info.flags|= ALTER_ADD_INDEX;
}
break;
case 563:
-#line 3848 "sql_yacc.yy"
+#line 3850 "sql_yacc.yy"
{
Lex->alter_info.flags|= ALTER_ADD_COLUMN | ALTER_ADD_INDEX;
}
break;
case 564:
-#line 3852 "sql_yacc.yy"
+#line 3854 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->change= (yyvsp[(3) - (3)].lex_str).str;
@@ -18448,7 +18450,7 @@
break;
case 566:
-#line 3859 "sql_yacc.yy"
+#line 3861 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->length=lex->dec=0; lex->type=0;
@@ -18460,7 +18462,7 @@
break;
case 567:
-#line 3868 "sql_yacc.yy"
+#line 3870 "sql_yacc.yy"
{
LEX *lex=Lex;
if (add_field_to_list(lex->thd,(yyvsp[(3) - (6)].lex_str).str,
@@ -18475,7 +18477,7 @@
break;
case 569:
-#line 3881 "sql_yacc.yy"
+#line 3883 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::COLUMN,
@@ -18485,14 +18487,14 @@
break;
case 570:
-#line 3888 "sql_yacc.yy"
+#line 3890 "sql_yacc.yy"
{
Lex->alter_info.flags|= ALTER_DROP_INDEX;
}
break;
case 571:
-#line 3892 "sql_yacc.yy"
+#line 3894 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::KEY,
@@ -18502,7 +18504,7 @@
break;
case 572:
-#line 3899 "sql_yacc.yy"
+#line 3901 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::KEY,
@@ -18512,7 +18514,7 @@
break;
case 573:
-#line 3906 "sql_yacc.yy"
+#line 3908 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->alter_info.keys_onoff= DISABLE;
@@ -18521,7 +18523,7 @@
break;
case 574:
-#line 3912 "sql_yacc.yy"
+#line 3914 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->alter_info.keys_onoff= ENABLE;
@@ -18530,7 +18532,7 @@
break;
case 575:
-#line 3918 "sql_yacc.yy"
+#line 3920 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->alter_info.alter_list.push_back(new Alter_column((yyvsp[(3) - (6)].lex_str).str,(yyvsp[(6) - (6)].item)));
@@ -18539,7 +18541,7 @@
break;
case 576:
-#line 3924 "sql_yacc.yy"
+#line 3926 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->alter_info.alter_list.push_back(new Alter_column((yyvsp[(3) - (5)].lex_str).str,
@@ -18549,7 +18551,7 @@
break;
case 577:
-#line 3931 "sql_yacc.yy"
+#line 3933 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->select_lex.db=(yyvsp[(3) - (3)].table)->db.str;
@@ -18570,7 +18572,7 @@
break;
case 578:
-#line 3949 "sql_yacc.yy"
+#line 3951 "sql_yacc.yy"
{
if (!(yyvsp[(4) - (5)].charset))
{
@@ -18594,7 +18596,7 @@
break;
case 579:
-#line 3970 "sql_yacc.yy"
+#line 3972 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->alter_info.flags|= ALTER_OPTIONS;
@@ -18602,14 +18604,14 @@
break;
case 580:
-#line 3975 "sql_yacc.yy"
+#line 3977 "sql_yacc.yy"
{
Lex->alter_info.flags|= ALTER_FORCE;
}
break;
case 581:
-#line 3979 "sql_yacc.yy"
+#line 3981 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->alter_info.flags|= ALTER_ORDER;
@@ -18617,77 +18619,77 @@
break;
case 582:
-#line 3985 "sql_yacc.yy"
+#line 3987 "sql_yacc.yy"
{}
break;
case 583:
-#line 3986 "sql_yacc.yy"
+#line 3988 "sql_yacc.yy"
{}
break;
case 584:
-#line 3989 "sql_yacc.yy"
+#line 3991 "sql_yacc.yy"
{ Lex->ignore= 0;}
break;
case 585:
-#line 3990 "sql_yacc.yy"
+#line 3992 "sql_yacc.yy"
{ Lex->ignore= 1;}
break;
case 586:
-#line 3994 "sql_yacc.yy"
+#line 3996 "sql_yacc.yy"
{ Lex->drop_mode= DROP_DEFAULT; }
break;
case 587:
-#line 3995 "sql_yacc.yy"
+#line 3997 "sql_yacc.yy"
{ Lex->drop_mode= DROP_RESTRICT; }
break;
case 588:
-#line 3996 "sql_yacc.yy"
+#line 3998 "sql_yacc.yy"
{ Lex->drop_mode= DROP_CASCADE; }
break;
case 589:
-#line 4000 "sql_yacc.yy"
+#line 4002 "sql_yacc.yy"
{}
break;
case 590:
-#line 4001 "sql_yacc.yy"
+#line 4003 "sql_yacc.yy"
{ store_position_for_column((yyvsp[(2) - (2)].lex_str).str); }
break;
case 591:
-#line 4002 "sql_yacc.yy"
+#line 4004 "sql_yacc.yy"
{ store_position_for_column(first_keyword); }
break;
case 592:
-#line 4005 "sql_yacc.yy"
+#line 4007 "sql_yacc.yy"
{}
break;
case 593:
-#line 4006 "sql_yacc.yy"
+#line 4008 "sql_yacc.yy"
{}
break;
case 594:
-#line 4007 "sql_yacc.yy"
+#line 4009 "sql_yacc.yy"
{}
break;
case 595:
-#line 4008 "sql_yacc.yy"
+#line 4010 "sql_yacc.yy"
{}
break;
case 596:
-#line 4016 "sql_yacc.yy"
+#line 4018 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_START;
@@ -18699,12 +18701,12 @@
break;
case 597:
-#line 4025 "sql_yacc.yy"
+#line 4027 "sql_yacc.yy"
{}
break;
case 598:
-#line 4027 "sql_yacc.yy"
+#line 4029 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_STOP;
@@ -18714,7 +18716,7 @@
break;
case 599:
-#line 4034 "sql_yacc.yy"
+#line 4036 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_START;
@@ -18725,12 +18727,12 @@
break;
case 600:
-#line 4042 "sql_yacc.yy"
+#line 4044 "sql_yacc.yy"
{}
break;
case 601:
-#line 4044 "sql_yacc.yy"
+#line 4046 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_STOP;
@@ -18739,7 +18741,7 @@
break;
case 602:
-#line 4054 "sql_yacc.yy"
+#line 4056 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_BEGIN;
@@ -18748,49 +18750,49 @@
break;
case 603:
-#line 4062 "sql_yacc.yy"
+#line 4064 "sql_yacc.yy"
{ (yyval.num) = 0; }
break;
case 604:
-#line 4064 "sql_yacc.yy"
+#line 4066 "sql_yacc.yy"
{
(yyval.num)= MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT;
}
break;
case 605:
-#line 4070 "sql_yacc.yy"
+#line 4072 "sql_yacc.yy"
{ Lex->slave_thd_opt= 0; }
break;
case 606:
-#line 4072 "sql_yacc.yy"
+#line 4074 "sql_yacc.yy"
{}
break;
case 609:
-#line 4081 "sql_yacc.yy"
+#line 4083 "sql_yacc.yy"
{}
break;
case 610:
-#line 4082 "sql_yacc.yy"
+#line 4084 "sql_yacc.yy"
{ Lex->slave_thd_opt|=SLAVE_SQL; }
break;
case 611:
-#line 4083 "sql_yacc.yy"
+#line 4085 "sql_yacc.yy"
{ Lex->slave_thd_opt|=SLAVE_IO; }
break;
case 612:
-#line 4087 "sql_yacc.yy"
+#line 4089 "sql_yacc.yy"
{}
break;
case 613:
-#line 4089 "sql_yacc.yy"
+#line 4091 "sql_yacc.yy"
{
LEX *lex=Lex;
if ((lex->mi.log_file_name || lex->mi.pos) &&
@@ -18807,35 +18809,35 @@
break;
case 616:
-#line 4111 "sql_yacc.yy"
+#line 4113 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_RESTORE_TABLE;
}
break;
case 617:
-#line 4115 "sql_yacc.yy"
+#line 4117 "sql_yacc.yy"
{
Lex->backup_dir = (yyvsp[(6) - (6)].lex_str).str;
}
break;
case 618:
-#line 4121 "sql_yacc.yy"
+#line 4123 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_BACKUP_TABLE;
}
break;
case 619:
-#line 4125 "sql_yacc.yy"
+#line 4127 "sql_yacc.yy"
{
Lex->backup_dir = (yyvsp[(6) - (6)].lex_str).str;
}
break;
case 620:
-#line 4131 "sql_yacc.yy"
+#line 4133 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_CHECKSUM;
@@ -18843,27 +18845,27 @@
break;
case 621:
-#line 4136 "sql_yacc.yy"
+#line 4138 "sql_yacc.yy"
{}
break;
case 622:
-#line 4140 "sql_yacc.yy"
+#line 4142 "sql_yacc.yy"
{ Lex->check_opt.flags= 0; }
break;
case 623:
-#line 4141 "sql_yacc.yy"
+#line 4143 "sql_yacc.yy"
{ Lex->check_opt.flags= T_QUICK; }
break;
case 624:
-#line 4142 "sql_yacc.yy"
+#line 4144 "sql_yacc.yy"
{ Lex->check_opt.flags= T_EXTEND; }
break;
case 625:
-#line 4147 "sql_yacc.yy"
+#line 4149 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_REPAIR;
@@ -18873,47 +18875,47 @@
break;
case 626:
-#line 4154 "sql_yacc.yy"
+#line 4156 "sql_yacc.yy"
{}
break;
case 627:
-#line 4158 "sql_yacc.yy"
+#line 4160 "sql_yacc.yy"
{ Lex->check_opt.flags = T_MEDIUM; }
break;
case 628:
-#line 4159 "sql_yacc.yy"
+#line 4161 "sql_yacc.yy"
{}
break;
case 629:
-#line 4162 "sql_yacc.yy"
+#line 4164 "sql_yacc.yy"
{}
break;
case 630:
-#line 4163 "sql_yacc.yy"
+#line 4165 "sql_yacc.yy"
{}
break;
case 631:
-#line 4166 "sql_yacc.yy"
+#line 4168 "sql_yacc.yy"
{ Lex->check_opt.flags|= T_QUICK; }
break;
case 632:
-#line 4167 "sql_yacc.yy"
+#line 4169 "sql_yacc.yy"
{ Lex->check_opt.flags|= T_EXTEND; }
break;
case 633:
-#line 4168 "sql_yacc.yy"
+#line 4170 "sql_yacc.yy"
{ Lex->check_opt.sql_flags|= TT_USEFRM; }
break;
case 634:
-#line 4172 "sql_yacc.yy"
+#line 4174 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_ANALYZE;
@@ -18923,12 +18925,12 @@
break;
case 635:
-#line 4179 "sql_yacc.yy"
+#line 4181 "sql_yacc.yy"
{}
break;
case 636:
-#line 4184 "sql_yacc.yy"
+#line 4186 "sql_yacc.yy"
{
LEX *lex=Lex;
@@ -18943,62 +18945,62 @@
break;
case 637:
-#line 4196 "sql_yacc.yy"
+#line 4198 "sql_yacc.yy"
{}
break;
case 638:
-#line 4200 "sql_yacc.yy"
+#line 4202 "sql_yacc.yy"
{ Lex->check_opt.flags = T_MEDIUM; }
break;
case 639:
-#line 4201 "sql_yacc.yy"
+#line 4203 "sql_yacc.yy"
{}
break;
case 640:
-#line 4204 "sql_yacc.yy"
+#line 4206 "sql_yacc.yy"
{}
break;
case 641:
-#line 4205 "sql_yacc.yy"
+#line 4207 "sql_yacc.yy"
{}
break;
case 642:
-#line 4208 "sql_yacc.yy"
+#line 4210 "sql_yacc.yy"
{ Lex->check_opt.flags|= T_QUICK; }
break;
case 643:
-#line 4209 "sql_yacc.yy"
+#line 4211 "sql_yacc.yy"
{ Lex->check_opt.flags|= T_FAST; }
break;
case 644:
-#line 4210 "sql_yacc.yy"
+#line 4212 "sql_yacc.yy"
{ Lex->check_opt.flags|= T_MEDIUM; }
break;
case 645:
-#line 4211 "sql_yacc.yy"
+#line 4213 "sql_yacc.yy"
{ Lex->check_opt.flags|= T_EXTEND; }
break;
case 646:
-#line 4212 "sql_yacc.yy"
+#line 4214 "sql_yacc.yy"
{ Lex->check_opt.flags|= T_CHECK_ONLY_CHANGED; }
break;
case 647:
-#line 4213 "sql_yacc.yy"
+#line 4215 "sql_yacc.yy"
{ Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
break;
case 648:
-#line 4217 "sql_yacc.yy"
+#line 4219 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_OPTIMIZE;
@@ -19008,46 +19010,46 @@
break;
case 649:
-#line 4224 "sql_yacc.yy"
+#line 4226 "sql_yacc.yy"
{}
break;
case 650:
-#line 4228 "sql_yacc.yy"
+#line 4230 "sql_yacc.yy"
{ (yyval.num)= 0; }
break;
case 651:
-#line 4229 "sql_yacc.yy"
+#line 4231 "sql_yacc.yy"
{ (yyval.num)= 1; }
break;
case 652:
-#line 4230 "sql_yacc.yy"
+#line 4232 "sql_yacc.yy"
{ (yyval.num)= 1; }
break;
case 653:
-#line 4235 "sql_yacc.yy"
+#line 4237 "sql_yacc.yy"
{
Lex->sql_command= SQLCOM_RENAME_TABLE;
}
break;
case 654:
-#line 4239 "sql_yacc.yy"
+#line 4241 "sql_yacc.yy"
{}
break;
case 655:
-#line 4241 "sql_yacc.yy"
+#line 4243 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_RENAME_USER;
}
break;
case 656:
-#line 4248 "sql_yacc.yy"
+#line 4250 "sql_yacc.yy"
{
if (Lex->users_list.push_back((yyvsp[(1) - (3)].lex_user)) || Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
MYSQL_YYABORT;
@@ -19055,7 +19057,7 @@
break;
case 657:
-#line 4253 "sql_yacc.yy"
+#line 4255 "sql_yacc.yy"
{
if (Lex->users_list.push_back((yyvsp[(3) - (5)].lex_user)) || Lex->users_list.push_back((yyvsp[(5) - (5)].lex_user)))
MYSQL_YYABORT;
@@ -19063,7 +19065,7 @@
break;
case 660:
-#line 4265 "sql_yacc.yy"
+#line 4267 "sql_yacc.yy"
{
LEX *lex=Lex;
SELECT_LEX *sl= lex->current_select;
@@ -19076,7 +19078,7 @@
break;
case 661:
-#line 4277 "sql_yacc.yy"
+#line 4279 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_ASSIGN_TO_KEYCACHE;
@@ -19085,7 +19087,7 @@
break;
case 664:
-#line 4290 "sql_yacc.yy"
+#line 4292 "sql_yacc.yy"
{
LEX *lex=Lex;
SELECT_LEX *sel= &lex->select_lex;
@@ -19098,17 +19100,17 @@
break;
case 665:
-#line 4302 "sql_yacc.yy"
+#line 4304 "sql_yacc.yy"
{ (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
break;
case 666:
-#line 4303 "sql_yacc.yy"
+#line 4305 "sql_yacc.yy"
{ (yyval.lex_str) = default_key_cache_base; }
break;
case 667:
-#line 4308 "sql_yacc.yy"
+#line 4310 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command=SQLCOM_PRELOAD_KEYS;
@@ -19116,12 +19118,12 @@
break;
case 668:
-#line 4313 "sql_yacc.yy"
+#line 4315 "sql_yacc.yy"
{}
break;
case 671:
-#line 4322 "sql_yacc.yy"
+#line 4324 "sql_yacc.yy"
{
LEX *lex=Lex;
SELECT_LEX *sel= &lex->select_lex;
@@ -19134,12 +19136,12 @@
break;
case 672:
-#line 4334 "sql_yacc.yy"
+#line 4336 "sql_yacc.yy"
{ Select->interval_list.empty(); }
break;
case 673:
-#line 4336 "sql_yacc.yy"
+#line 4338 "sql_yacc.yy"
{
LEX *lex=Lex;
SELECT_LEX *sel= &lex->select_lex;
@@ -19148,12 +19150,12 @@
break;
case 674:
-#line 4344 "sql_yacc.yy"
+#line 4346 "sql_yacc.yy"
{ Lex->select_lex.use_index_ptr= 0; }
break;
case 675:
-#line 4346 "sql_yacc.yy"
+#line 4348 "sql_yacc.yy"
{
SELECT_LEX *sel= &Lex->select_lex;
sel->use_index_ptr= &sel->use_index;
@@ -19161,17 +19163,17 @@
break;
case 676:
-#line 4354 "sql_yacc.yy"
+#line 4356 "sql_yacc.yy"
{ (yyval.num)= 0; }
break;
case 677:
-#line 4355 "sql_yacc.yy"
+#line 4357 "sql_yacc.yy"
{ (yyval.num)= TL_OPTION_IGNORE_LEAVES; }
break;
case 678:
-#line 4365 "sql_yacc.yy"
+#line 4367 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -19179,7 +19181,7 @@
break;
case 681:
-#line 4379 "sql_yacc.yy"
+#line 4381 "sql_yacc.yy"
{
LEX *lex= Lex;
SELECT_LEX * sel= lex->current_select;
@@ -19204,7 +19206,7 @@
break;
case 683:
-#line 4404 "sql_yacc.yy"
+#line 4406 "sql_yacc.yy"
{
LEX *lex= Lex;
SELECT_LEX * sel= lex->current_select;
@@ -19223,7 +19225,7 @@
break;
case 685:
-#line 4423 "sql_yacc.yy"
+#line 4425 "sql_yacc.yy"
{
LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select;
@@ -19234,19 +19236,19 @@
break;
case 686:
-#line 4431 "sql_yacc.yy"
+#line 4433 "sql_yacc.yy"
{
Select->parsing_place= NO_MATTER;
}
break;
case 688:
-#line 4437 "sql_yacc.yy"
+#line 4439 "sql_yacc.yy"
{}
break;
case 693:
-#line 4446 "sql_yacc.yy"
+#line 4448 "sql_yacc.yy"
{
Select->context.table_list=
Select->context.first_name_resolution_table=
@@ -19255,7 +19257,7 @@
break;
case 696:
-#line 4461 "sql_yacc.yy"
+#line 4463 "sql_yacc.yy"
{
if (test_all_bits(Select->options, SELECT_ALL | SELECT_DISTINCT))
{
@@ -19266,12 +19268,12 @@
break;
case 699:
-#line 4475 "sql_yacc.yy"
+#line 4477 "sql_yacc.yy"
{ Select->options|= SELECT_STRAIGHT_JOIN; }
break;
case 700:
-#line 4477 "sql_yacc.yy"
+#line 4479 "sql_yacc.yy"
{
if (check_simple_select())
MYSQL_YYABORT;
@@ -19280,22 +19282,22 @@
break;
case 701:
-#line 4482 "sql_yacc.yy"
+#line 4484 "sql_yacc.yy"
{ Select->options|= SELECT_DISTINCT; }
break;
case 702:
-#line 4483 "sql_yacc.yy"
+#line 4485 "sql_yacc.yy"
{ Select->options|= SELECT_SMALL_RESULT; }
break;
case 703:
-#line 4484 "sql_yacc.yy"
+#line 4486 "sql_yacc.yy"
{ Select->options|= SELECT_BIG_RESULT; }
break;
case 704:
-#line 4486 "sql_yacc.yy"
+#line 4488 "sql_yacc.yy"
{
if (check_simple_select())
MYSQL_YYABORT;
@@ -19304,7 +19306,7 @@
break;
case 705:
-#line 4492 "sql_yacc.yy"
+#line 4494 "sql_yacc.yy"
{
if (check_simple_select())
MYSQL_YYABORT;
@@ -19313,7 +19315,7 @@
break;
case 706:
-#line 4498 "sql_yacc.yy"
+#line 4500 "sql_yacc.yy"
{
Lex->safe_to_cache_query=0;
Lex->select_lex.options&= ~OPTION_TO_QUERY_CACHE;
@@ -19322,7 +19324,7 @@
break;
case 707:
-#line 4504 "sql_yacc.yy"
+#line 4506 "sql_yacc.yy"
{
/*
Honor this flag only if SQL_NO_CACHE wasn't specified AND
@@ -19339,12 +19341,12 @@
break;
case 708:
-#line 4517 "sql_yacc.yy"
+#line 4519 "sql_yacc.yy"
{ Select->options|= SELECT_ALL; }
break;
case 710:
-#line 4523 "sql_yacc.yy"
+#line 4525 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->current_select->set_lock_for_tables(TL_WRITE);
@@ -19353,7 +19355,7 @@
break;
case 711:
-#line 4529 "sql_yacc.yy"
+#line 4531 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->current_select->
@@ -19363,7 +19365,7 @@
break;
case 714:
-#line 4541 "sql_yacc.yy"
+#line 4543 "sql_yacc.yy"
{
THD *thd= YYTHD;
if (add_item_to_list(thd,
@@ -19376,7 +19378,7 @@
break;
case 715:
-#line 4554 "sql_yacc.yy"
+#line 4556 "sql_yacc.yy"
{
THD *thd= YYTHD;
DBUG_ASSERT((yyvsp[(1) - (4)].simple_string) < (yyvsp[(3) - (4)].simple_string));
@@ -19396,7 +19398,7 @@
break;
case 716:
-#line 4573 "sql_yacc.yy"
+#line 4575 "sql_yacc.yy"
{
THD *thd= YYTHD;
Lex_input_stream *lip= thd->m_lip;
@@ -19405,7 +19407,7 @@
break;
case 717:
-#line 4580 "sql_yacc.yy"
+#line 4582 "sql_yacc.yy"
{
THD *thd= YYTHD;
Lex_input_stream *lip= thd->m_lip;
@@ -19414,52 +19416,52 @@
break;
case 718:
-#line 4587 "sql_yacc.yy"
+#line 4589 "sql_yacc.yy"
{ (yyval.item)=(yyvsp[(1) - (1)].item); }
break;
case 719:
-#line 4588 "sql_yacc.yy"
+#line 4590 "sql_yacc.yy"
{ (yyval.item)=(yyvsp[(1) - (1)].item); }
break;
case 720:
-#line 4591 "sql_yacc.yy"
+#line 4593 "sql_yacc.yy"
{ (yyval.lex_str)=null_lex_str;}
break;
case 721:
-#line 4592 "sql_yacc.yy"
+#line 4594 "sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
break;
case 722:
-#line 4593 "sql_yacc.yy"
+#line 4595 "sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
break;
case 723:
-#line 4594 "sql_yacc.yy"
+#line 4596 "sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
break;
case 724:
-#line 4595 "sql_yacc.yy"
+#line 4597 "sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
break;
case 725:
-#line 4599 "sql_yacc.yy"
+#line 4601 "sql_yacc.yy"
{}
break;
case 726:
-#line 4600 "sql_yacc.yy"
+#line 4602 "sql_yacc.yy"
{}
break;
case 727:
-#line 4605 "sql_yacc.yy"
+#line 4607 "sql_yacc.yy"
{
/*
Design notes:
@@ -19511,7 +19513,7 @@
break;
case 728:
-#line 4654 "sql_yacc.yy"
+#line 4656 "sql_yacc.yy"
{
/* XOR is a proprietary extension */
(yyval.item) = new (YYTHD->mem_root) Item_cond_xor((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item));
@@ -19519,7 +19521,7 @@
break;
case 729:
-#line 4659 "sql_yacc.yy"
+#line 4661 "sql_yacc.yy"
{
/* See comments in rule expr: expr or expr */
Item_cond_and *item1;
@@ -19563,74 +19565,74 @@
break;
case 730:
-#line 4700 "sql_yacc.yy"
+#line 4702 "sql_yacc.yy"
{ (yyval.item)= negate_expression(YYTHD, (yyvsp[(2) - (2)].item)); }
break;
case 731:
-#line 4702 "sql_yacc.yy"
+#line 4704 "sql_yacc.yy"
{ (yyval.item)= new (YYTHD->mem_root) Item_func_istrue((yyvsp[(1) - (3)].item)); }
break;
case 732:
-#line 4704 "sql_yacc.yy"
+#line 4706 "sql_yacc.yy"
{ (yyval.item)= new (YYTHD->mem_root) Item_func_isnottrue((yyvsp[(1) - (4)].item)); }
break;
case 733:
-#line 4706 "sql_yacc.yy"
+#line 4708 "sql_yacc.yy"
{ (yyval.item)= new (YYTHD->mem_root) Item_func_isfalse((yyvsp[(1) - (3)].item)); }
break;
case 734:
-#line 4708 "sql_yacc.yy"
+#line 4710 "sql_yacc.yy"
{ (yyval.item)= new (YYTHD->mem_root) Item_func_isnotfalse((yyvsp[(1) - (4)].item)); }
break;
case 735:
-#line 4710 "sql_yacc.yy"
+#line 4712 "sql_yacc.yy"
{ (yyval.item)= new Item_func_isnull((yyvsp[(1) - (3)].item)); }
break;
case 736:
-#line 4712 "sql_yacc.yy"
+#line 4714 "sql_yacc.yy"
{ (yyval.item)= new Item_func_isnotnull((yyvsp[(1) - (4)].item)); }
break;
case 738:
-#line 4718 "sql_yacc.yy"
+#line 4720 "sql_yacc.yy"
{ (yyval.item)= new Item_func_isnull((yyvsp[(1) - (3)].item)); }
break;
case 739:
-#line 4720 "sql_yacc.yy"
+#line 4722 "sql_yacc.yy"
{ (yyval.item)= new Item_func_isnotnull((yyvsp[(1) - (4)].item)); }
break;
case 740:
-#line 4722 "sql_yacc.yy"
+#line 4724 "sql_yacc.yy"
{ (yyval.item)= new Item_func_equal((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 741:
-#line 4724 "sql_yacc.yy"
+#line 4726 "sql_yacc.yy"
{ (yyval.item)= (*(yyvsp[(2) - (3)].boolfunc2creator))(0)->create((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 742:
-#line 4726 "sql_yacc.yy"
+#line 4728 "sql_yacc.yy"
{ (yyval.item)= all_any_subquery_creator((yyvsp[(1) - (6)].item), (yyvsp[(2) - (6)].boolfunc2creator), (yyvsp[(3) - (6)].num), (yyvsp[(5) - (6)].select_lex)); }
break;
case 744:
-#line 4731 "sql_yacc.yy"
+#line 4733 "sql_yacc.yy"
{
(yyval.item)= new (YYTHD->mem_root) Item_in_subselect((yyvsp[(1) - (5)].item), (yyvsp[(4) - (5)].select_lex));
}
break;
case 745:
-#line 4735 "sql_yacc.yy"
+#line 4737 "sql_yacc.yy"
{
THD *thd= YYTHD;
Item *item= new (thd->mem_root) Item_in_subselect((yyvsp[(1) - (6)].item), (yyvsp[(5) - (6)].select_lex));
@@ -19639,14 +19641,14 @@
break;
case 746:
-#line 4741 "sql_yacc.yy"
+#line 4743 "sql_yacc.yy"
{
(yyval.item)= handle_sql2003_note184_exception(YYTHD, (yyvsp[(1) - (5)].item), true, (yyvsp[(4) - (5)].item));
}
break;
case 747:
-#line 4745 "sql_yacc.yy"
+#line 4747 "sql_yacc.yy"
{
(yyvsp[(6) - (7)].item_list)->push_front((yyvsp[(4) - (7)].item));
(yyvsp[(6) - (7)].item_list)->push_front((yyvsp[(1) - (7)].item));
@@ -19655,14 +19657,14 @@
break;
case 748:
-#line 4751 "sql_yacc.yy"
+#line 4753 "sql_yacc.yy"
{
(yyval.item)= handle_sql2003_note184_exception(YYTHD, (yyvsp[(1) - (6)].item), false, (yyvsp[(5) - (6)].item));
}
break;
case 749:
-#line 4755 "sql_yacc.yy"
+#line 4757 "sql_yacc.yy"
{
(yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(5) - (8)].item));
(yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(1) - (8)].item));
@@ -19673,12 +19675,12 @@
break;
case 750:
-#line 4763 "sql_yacc.yy"
+#line 4765 "sql_yacc.yy"
{ (yyval.item)= new Item_func_between((yyvsp[(1) - (5)].item),(yyvsp[(3) - (5)].item),(yyvsp[(5) - (5)].item)); }
break;
case 751:
-#line 4765 "sql_yacc.yy"
+#line 4767 "sql_yacc.yy"
{
Item_func_between *item= new Item_func_between((yyvsp[(1) - (6)].item),(yyvsp[(4) - (6)].item),(yyvsp[(6) - (6)].item));
item->negate();
@@ -19687,148 +19689,148 @@
break;
case 752:
-#line 4771 "sql_yacc.yy"
+#line 4773 "sql_yacc.yy"
{ (yyval.item)= new Item_func_eq(new Item_func_soundex((yyvsp[(1) - (4)].item)),
new Item_func_soundex((yyvsp[(4) - (4)].item))); }
break;
case 753:
-#line 4774 "sql_yacc.yy"
+#line 4776 "sql_yacc.yy"
{ (yyval.item)= new Item_func_like((yyvsp[(1) - (4)].item),(yyvsp[(3) - (4)].item),(yyvsp[(4) - (4)].item),Lex->escape_used); }
break;
case 754:
-#line 4776 "sql_yacc.yy"
+#line 4778 "sql_yacc.yy"
{ (yyval.item)= new Item_func_not(new Item_func_like((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].item), Lex->escape_used)); }
break;
case 755:
-#line 4777 "sql_yacc.yy"
+#line 4779 "sql_yacc.yy"
{ (yyval.item)= new Item_func_regex((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 756:
-#line 4779 "sql_yacc.yy"
+#line 4781 "sql_yacc.yy"
{ (yyval.item)= negate_expression(YYTHD, new Item_func_regex((yyvsp[(1) - (4)].item),(yyvsp[(4) - (4)].item))); }
break;
case 758:
-#line 4784 "sql_yacc.yy"
+#line 4786 "sql_yacc.yy"
{ (yyval.item)= new Item_func_bit_or((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 759:
-#line 4786 "sql_yacc.yy"
+#line 4788 "sql_yacc.yy"
{ (yyval.item)= new Item_func_bit_and((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 760:
-#line 4788 "sql_yacc.yy"
+#line 4790 "sql_yacc.yy"
{ (yyval.item)= new Item_func_shift_left((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 761:
-#line 4790 "sql_yacc.yy"
+#line 4792 "sql_yacc.yy"
{ (yyval.item)= new Item_func_shift_right((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 762:
-#line 4792 "sql_yacc.yy"
+#line 4794 "sql_yacc.yy"
{ (yyval.item)= new Item_func_plus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 763:
-#line 4794 "sql_yacc.yy"
+#line 4796 "sql_yacc.yy"
{ (yyval.item)= new Item_func_minus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 764:
-#line 4796 "sql_yacc.yy"
+#line 4798 "sql_yacc.yy"
{ (yyval.item)= new Item_date_add_interval((yyvsp[(1) - (4)].item),(yyvsp[(3) - (4)].item),(yyvsp[(4) - (4)].interval),0); }
break;
case 765:
-#line 4798 "sql_yacc.yy"
+#line 4800 "sql_yacc.yy"
{ (yyval.item)= new Item_date_add_interval((yyvsp[(1) - (4)].item),(yyvsp[(3) - (4)].item),(yyvsp[(4) - (4)].interval),1); }
break;
case 766:
-#line 4800 "sql_yacc.yy"
+#line 4802 "sql_yacc.yy"
{ (yyval.item)= new Item_func_mul((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 767:
-#line 4802 "sql_yacc.yy"
+#line 4804 "sql_yacc.yy"
{ (yyval.item)= new Item_func_div((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 768:
-#line 4804 "sql_yacc.yy"
+#line 4806 "sql_yacc.yy"
{ (yyval.item)= new Item_func_mod((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 769:
-#line 4806 "sql_yacc.yy"
+#line 4808 "sql_yacc.yy"
{ (yyval.item)= new Item_func_int_div((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 770:
-#line 4808 "sql_yacc.yy"
+#line 4810 "sql_yacc.yy"
{ (yyval.item)= new Item_func_mod((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 771:
-#line 4810 "sql_yacc.yy"
+#line 4812 "sql_yacc.yy"
{ (yyval.item)= new Item_func_bit_xor((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); }
break;
case 781:
-#line 4819 "sql_yacc.yy"
+#line 4821 "sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_eq_creator; }
break;
case 782:
-#line 4820 "sql_yacc.yy"
+#line 4822 "sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_ge_creator; }
break;
case 783:
-#line 4821 "sql_yacc.yy"
+#line 4823 "sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_gt_creator; }
break;
case 784:
-#line 4822 "sql_yacc.yy"
+#line 4824 "sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_le_creator; }
break;
case 785:
-#line 4823 "sql_yacc.yy"
+#line 4825 "sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_lt_creator; }
break;
case 786:
-#line 4824 "sql_yacc.yy"
+#line 4826 "sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_ne_creator; }
break;
case 787:
-#line 4827 "sql_yacc.yy"
+#line 4829 "sql_yacc.yy"
{ (yyval.num) = 1; }
break;
case 788:
-#line 4828 "sql_yacc.yy"
+#line 4830 "sql_yacc.yy"
{ (yyval.num) = 0; }
break;
case 789:
-#line 4833 "sql_yacc.yy"
+#line 4835 "sql_yacc.yy"
{ (yyval.item)=(yyvsp[(2) - (2)].item); }
break;
case 791:
-#line 4839 "sql_yacc.yy"
+#line 4841 "sql_yacc.yy"
{
(yyval.item)= new Item_func_set_collation((yyvsp[(1) - (3)].item),
new Item_string((yyvsp[(3) - (3)].lex_str).str,
@@ -19838,44 +19840,44 @@
break;
case 796:
-#line 4850 "sql_yacc.yy"
+#line 4852 "sql_yacc.yy"
{ (yyval.item)= new Item_func_concat((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item)); }
break;
case 797:
-#line 4851 "sql_yacc.yy"
+#line 4853 "sql_yacc.yy"
{ (yyval.item)= (yyvsp[(2) - (2)].item); }
break;
case 798:
-#line 4852 "sql_yacc.yy"
+#line 4854 "sql_yacc.yy"
{ (yyval.item)= new Item_func_neg((yyvsp[(2) - (2)].item)); }
break;
case 799:
-#line 4853 "sql_yacc.yy"
+#line 4855 "sql_yacc.yy"
{ (yyval.item)= new Item_func_bit_neg((yyvsp[(2) - (2)].item)); }
break;
case 800:
-#line 4854 "sql_yacc.yy"
+#line 4856 "sql_yacc.yy"
{ (yyval.item)= negate_expression(YYTHD, (yyvsp[(2) - (2)].item)); }
break;
case 801:
-#line 4856 "sql_yacc.yy"
+#line 4858 "sql_yacc.yy"
{
(yyval.item)= new Item_singlerow_subselect((yyvsp[(2) - (3)].select_lex));
}
break;
case 802:
-#line 4859 "sql_yacc.yy"
+#line 4861 "sql_yacc.yy"
{ (yyval.item)= (yyvsp[(2) - (3)].item); }
break;
case 803:
-#line 4861 "sql_yacc.yy"
+#line 4863 "sql_yacc.yy"
{
(yyvsp[(4) - (5)].item_list)->push_front((yyvsp[(2) - (5)].item));
(yyval.item)= new Item_row(*(yyvsp[(4) - (5)].item_list));
@@ -19883,7 +19885,7 @@
break;
case 804:
-#line 4866 "sql_yacc.yy"
+#line 4868 "sql_yacc.yy"
{
(yyvsp[(5) - (6)].item_list)->push_front((yyvsp[(3) - (6)].item));
(yyval.item)= new Item_row(*(yyvsp[(5) - (6)].item_list));
@@ -19891,38 +19893,38 @@
break;
case 805:
-#line 4871 "sql_yacc.yy"
+#line 4873 "sql_yacc.yy"
{
(yyval.item)= new Item_exists_subselect((yyvsp[(3) - (4)].select_lex));
}
break;
case 806:
-#line 4874 "sql_yacc.yy"
+#line 4876 "sql_yacc.yy"
{ (yyval.item)= (yyvsp[(3) - (4)].item); }
break;
case 807:
-#line 4876 "sql_yacc.yy"
+#line 4878 "sql_yacc.yy"
{ (yyvsp[(2) - (7)].item_list)->push_front((yyvsp[(5) - (7)].item));
Select->add_ftfunc_to_list((Item_func_match*)
((yyval.item)=new Item_func_match(*(yyvsp[(2) - (7)].item_list),(yyvsp[(6) - (7)].num)))); }
break;
case 808:
-#line 4879 "sql_yacc.yy"
+#line 4881 "sql_yacc.yy"
{ (yyval.item)= new Item_func_ascii((yyvsp[(3) - (4)].item)); }
break;
case 809:
-#line 4881 "sql_yacc.yy"
+#line 4883 "sql_yacc.yy"
{
(yyval.item)= create_func_cast((yyvsp[(2) - (2)].item), ITEM_CAST_CHAR, NULL, NULL, &my_charset_bin);
}
break;
case 810:
-#line 4885 "sql_yacc.yy"
+#line 4887 "sql_yacc.yy"
{
LEX *lex= Lex;
(yyval.item)= create_func_cast((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].cast_type), lex->length, lex->dec, lex->charset);
@@ -19932,12 +19934,12 @@
break;
case 811:
-#line 4892 "sql_yacc.yy"
+#line 4894 "sql_yacc.yy"
{ (yyval.item)= new Item_func_case(* (yyvsp[(3) - (5)].item_list), (yyvsp[(2) - (5)].item), (yyvsp[(4) - (5)].item) ); }
break;
case 812:
-#line 4894 "sql_yacc.yy"
+#line 4896 "sql_yacc.yy"
{
(yyval.item)= create_func_cast((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].cast_type), Lex->length, Lex->dec, Lex->charset);
if (!(yyval.item))
@@ -19946,12 +19948,12 @@
break;
case 813:
-#line 4900 "sql_yacc.yy"
+#line 4902 "sql_yacc.yy"
{ (yyval.item)= new Item_func_conv_charset((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].charset)); }
break;
case 814:
-#line 4902 "sql_yacc.yy"
+#line 4904 "sql_yacc.yy"
{
if ((yyvsp[(3) - (4)].item)->is_splocal())
{
@@ -19965,12 +19967,12 @@
break;
case 815:
-#line 4913 "sql_yacc.yy"
+#line 4915 "sql_yacc.yy"
{ (yyval.item)= new Item_insert_value(Lex->current_context(), (yyvsp[(3) - (4)].item)); }
break;
case 816:
-#line 4915 "sql_yacc.yy"
+#line 4917 "sql_yacc.yy"
{
if (!(yyvsp[(1) - (3)].symbol).symbol->create_func)
{
@@ -19984,7 +19986,7 @@
break;
case 817:
-#line 4926 "sql_yacc.yy"
+#line 4928 "sql_yacc.yy"
{
if (!(yyvsp[(1) - (4)].symbol).symbol->create_func)
{
@@ -19998,7 +20000,7 @@
break;
case 818:
-#line 4937 "sql_yacc.yy"
+#line 4939 "sql_yacc.yy"
{
if (!(yyvsp[(1) - (6)].symbol).symbol->create_func)
{
@@ -20012,7 +20014,7 @@
break;
case 819:
-#line 4948 "sql_yacc.yy"
+#line 4950 "sql_yacc.yy"
{
if (!(yyvsp[(1) - (8)].symbol).symbol->create_func)
{
@@ -20026,67 +20028,67 @@
break;
case 820:
-#line 4959 "sql_yacc.yy"
+#line 4961 "sql_yacc.yy"
{ (yyval.item)= new Item_date_add_interval((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), INTERVAL_DAY, 0);}
break;
case 821:
-#line 4961 "sql_yacc.yy"
+#line 4963 "sql_yacc.yy"
{ (yyval.item)= new Item_date_add_interval((yyvsp[(3) - (8)].item), (yyvsp[(6) - (8)].item), (yyvsp[(7) - (8)].interval), 0); }
break;
case 822:
-#line 4963 "sql_yacc.yy"
+#line 4965 "sql_yacc.yy"
{ (yyval.item)= new Item_func_repeat((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); }
break;
case 823:
-#line 4965 "sql_yacc.yy"
+#line 4967 "sql_yacc.yy"
{ (yyval.item)= new Item_func_atan((yyvsp[(3) - (4)].item)); }
break;
case 824:
-#line 4967 "sql_yacc.yy"
+#line 4969 "sql_yacc.yy"
{ (yyval.item)= new Item_func_atan((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); }
break;
case 825:
-#line 4969 "sql_yacc.yy"
+#line 4971 "sql_yacc.yy"
{ (yyval.item)= new Item_func_char(*(yyvsp[(3) - (4)].item_list)); }
break;
case 826:
-#line 4971 "sql_yacc.yy"
+#line 4973 "sql_yacc.yy"
{ (yyval.item)= new Item_func_char(*(yyvsp[(3) - (6)].item_list), (yyvsp[(5) - (6)].charset)); }
break;
case 827:
-#line 4973 "sql_yacc.yy"
+#line 4975 "sql_yacc.yy"
{ (yyval.item)= new Item_func_charset((yyvsp[(3) - (4)].item)); }
break;
case 828:
-#line 4975 "sql_yacc.yy"
+#line 4977 "sql_yacc.yy"
{ (yyval.item)= new Item_func_coalesce(* (yyvsp[(3) - (4)].item_list)); }
break;
case 829:
-#line 4977 "sql_yacc.yy"
+#line 4979 "sql_yacc.yy"
{ (yyval.item)= new Item_func_collation((yyvsp[(3) - (4)].item)); }
break;
case 830:
-#line 4979 "sql_yacc.yy"
+#line 4981 "sql_yacc.yy"
{ (yyval.item)= new Item_func_concat(* (yyvsp[(3) - (4)].item_list)); }
break;
case 831:
-#line 4981 "sql_yacc.yy"
+#line 4983 "sql_yacc.yy"
{ (yyvsp[(5) - (6)].item_list)->push_front((yyvsp[(3) - (6)].item)); (yyval.item)= new Item_func_concat_ws(*(yyvsp[(5) - (6)].item_list)); }
break;
case 832:
-#line 4983 "sql_yacc.yy"
+#line 4985 "sql_yacc.yy"
{
if (Lex->add_time_zone_tables_to_query_tables(YYTHD))
MYSQL_YYABORT;
@@ -20095,17 +20097,17 @@
break;
case 833:
-#line 4989 "sql_yacc.yy"
+#line 4991 "sql_yacc.yy"
{ (yyval.item)= new Item_func_curdate_local(); Lex->safe_to_cache_query=0; }
break;
case 834:
-#line 4991 "sql_yacc.yy"
+#line 4993 "sql_yacc.yy"
{ (yyval.item)= new Item_func_curtime_local(); Lex->safe_to_cache_query=0; }
break;
case 835:
-#line 4993 "sql_yacc.yy"
+#line 4995 "sql_yacc.yy"
{
(yyval.item)= new Item_func_curtime_local((yyvsp[(3) - (4)].item));
Lex->safe_to_cache_query=0;
@@ -20113,7 +20115,7 @@
break;
case 836:
-#line 4998 "sql_yacc.yy"
+#line 5000 "sql_yacc.yy"
{
(yyval.item)= new Item_func_current_user(Lex->current_context());
Lex->safe_to_cache_query= 0;
@@ -20121,17 +20123,17 @@
break;
case 837:
-#line 5003 "sql_yacc.yy"
+#line 5005 "sql_yacc.yy"
{ (yyval.item)= new Item_date_add_interval((yyvsp[(3) - (7)].item),(yyvsp[(5) - (7)].item),(yyvsp[(6) - (7)].interval),0); }
break;
case 838:
-#line 5005 "sql_yacc.yy"
+#line 5007 "sql_yacc.yy"
{ (yyval.item)= new Item_date_add_interval((yyvsp[(3) - (7)].item),(yyvsp[(5) - (7)].item),(yyvsp[(6) - (7)].interval),1); }
break;
case 839:
-#line 5007 "sql_yacc.yy"
+#line 5009 "sql_yacc.yy"
{
(yyval.item)= new Item_func_database();
Lex->safe_to_cache_query=0;
@@ -20139,27 +20141,27 @@
break;
case 840:
-#line 5012 "sql_yacc.yy"
+#line 5014 "sql_yacc.yy"
{ (yyval.item)= new Item_date_typecast((yyvsp[(3) - (4)].item)); }
break;
case 841:
-#line 5014 "sql_yacc.yy"
+#line 5016 "sql_yacc.yy"
{ (yyval.item)= new Item_func_dayofmonth((yyvsp[(3) - (4)].item)); }
break;
case 842:
-#line 5016 "sql_yacc.yy"
+#line 5018 "sql_yacc.yy"
{ (yyvsp[(5) - (6)].item_list)->push_front((yyvsp[(3) - (6)].item)); (yyval.item)= new Item_func_elt(*(yyvsp[(5) - (6)].item_list)); }
break;
case 843:
-#line 5018 "sql_yacc.yy"
+#line 5020 "sql_yacc.yy"
{ (yyval.item)= new Item_func_make_set((yyvsp[(3) - (6)].item), *(yyvsp[(5) - (6)].item_list)); }
break;
case 844:
-#line 5020 "sql_yacc.yy"
+#line 5022 "sql_yacc.yy"
{
(yyval.item)= new Item_func_encrypt((yyvsp[(3) - (4)].item));
Lex->uncacheable(UNCACHEABLE_RAND);
@@ -20167,79 +20169,79 @@
break;
case 845:
-#line 5024 "sql_yacc.yy"
+#line 5026 "sql_yacc.yy"
{ (yyval.item)= new Item_func_encrypt((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); }
break;
case 846:
-#line 5026 "sql_yacc.yy"
+#line 5028 "sql_yacc.yy"
{ (yyval.item)= new Item_func_decode((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].lex_str).str); }
break;
case 847:
-#line 5028 "sql_yacc.yy"
+#line 5030 "sql_yacc.yy"
{ (yyval.item)= new Item_func_encode((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].lex_str).str); }
break;
case 848:
-#line 5030 "sql_yacc.yy"
+#line 5032 "sql_yacc.yy"
{ (yyval.item)= new Item_func_des_decrypt((yyvsp[(3) - (4)].item)); }
break;
case 849:
-#line 5032 "sql_yacc.yy"
+#line 5034 "sql_yacc.yy"
{ (yyval.item)= new Item_func_des_decrypt((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); }
break;
case 850:
-#line 5034 "sql_yacc.yy"
+#line 5036 "sql_yacc.yy"
{ (yyval.item)= new Item_func_des_encrypt((yyvsp[(3) - (4)].item)); }
break;
case 851:
-#line 5036 "sql_yacc.yy"
+#line 5038 "sql_yacc.yy"
{ (yyval.item)= new Item_func_des_encrypt((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); }
break;
case 852:
-#line 5038 "sql_yacc.yy"
+#line 5040 "sql_yacc.yy"
{ (yyval.item)= new Item_func_export_set((yyvsp[(3) - (8)].item), (yyvsp[(5) - (8)].item), (yyvsp[(7) - (8)].item)); }
break;
case 853:
-#line 5040 "sql_yacc.yy"
+#line 5042 "sql_yacc.yy"
{ (yyval.item)= new Item_func_export_set((yyvsp[(3) - (10)].item), (yyvsp[(5) - (10)].item), (yyvsp[(7) - (10)].item), (yyvsp[(9) - (10)].item)); }
break;
case 854:
-#line 5042 "sql_yacc.yy"
+#line 5044 "sql_yacc.yy"
{ (yyval.item)= new Item_func_export_set((yyvsp[(3) - (12)].item), (yyvsp[(5) - (12)].item), (yyvsp[(7) - (12)].item), (yyvsp[(9) - (12)].item), (yyvsp[(11) - (12)].item)); }
break;
case 855:
-#line 5044 "sql_yacc.yy"
+#line 5046 "sql_yacc.yy"
{ (yyval.item)= new Item_func_format((yyvsp[(3) - (6)].item),atoi((yyvsp[(5) - (6)].lex_str).str)); }
break;
case 856:
-#line 5046 "sql_yacc.yy"
+#line 5048 "sql_yacc.yy"
{ (yyval.item)= new Item_func_from_unixtime((yyvsp[(3) - (4)].item)); }
break;
case 857:
-#line 5048 "sql_yacc.yy"
+#line 5050 "sql_yacc.yy"
{
(yyval.item)= new Item_func_date_format (new Item_func_from_unixtime((yyvsp[(3) - (6)].item)),(yyvsp[(5) - (6)].item),0);
}
break;
case 858:
-#line 5052 "sql_yacc.yy"
+#line 5054 "sql_yacc.yy"
{ (yyvsp[(5) - (6)].item_list)->push_front((yyvsp[(3) - (6)].item)); (yyval.item)= new Item_func_field(*(yyvsp[(5) - (6)].item_list)); }
break;
case 859:
-#line 5054 "sql_yacc.yy"
+#line 5056 "sql_yacc.yy"
{
#ifdef HAVE_SPATIAL
(yyval.item)= (yyvsp[(1) - (1)].item);
@@ -20252,32 +20254,32 @@
break;
case 860:
-#line 5064 "sql_yacc.yy"
+#line 5066 "sql_yacc.yy"
{ (yyval.item)= new Item_func_get_format((yyvsp[(3) - (6)].date_time_type), (yyvsp[(5) - (6)].item)); }
break;
case 861:
-#line 5066 "sql_yacc.yy"
+#line 5068 "sql_yacc.yy"
{ (yyval.item)= new Item_func_hour((yyvsp[(3) - (4)].item)); }
break;
case 862:
-#line 5068 "sql_yacc.yy"
+#line 5070 "sql_yacc.yy"
{ (yyval.item)= new Item_func_if((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item)); }
break;
case 863:
-#line 5070 "sql_yacc.yy"
+#line 5072 "sql_yacc.yy"
{ (yyval.item)= new Item_func_insert((yyvsp[(3) - (10)].item),(yyvsp[(5) - (10)].item),(yyvsp[(7) - (10)].item),(yyvsp[(9) - (10)].item)); }
break;
case 864:
-#line 5073 "sql_yacc.yy"
+#line 5075 "sql_yacc.yy"
{ (yyval.item)= new Item_date_add_interval((yyvsp[(4) - (4)].item),(yyvsp[(1) - (4)].item),(yyvsp[(2) - (4)].interval),0); }
break;
case 865:
-#line 5075 "sql_yacc.yy"
+#line 5077 "sql_yacc.yy"
{
if ((yyvsp[(1) - (1)].item)->type() != Item::ROW_ITEM)
{
@@ -20289,7 +20291,7 @@
break;
case 866:
-#line 5084 "sql_yacc.yy"
+#line 5086 "sql_yacc.yy"
{
(yyval.item)= new Item_func_last_insert_id();
Lex->safe_to_cache_query= 0;
@@ -20297,7 +20299,7 @@
break;
case 867:
-#line 5089 "sql_yacc.yy"
+#line 5091 "sql_yacc.yy"
{
(yyval.item)= new Item_func_last_insert_id((yyvsp[(3) - (4)].item));
Lex->safe_to_cache_query= 0;
@@ -20305,42 +20307,42 @@
break;
case 868:
-#line 5094 "sql_yacc.yy"
+#line 5096 "sql_yacc.yy"
{ (yyval.item)= new Item_func_left((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); }
break;
case 869:
-#line 5096 "sql_yacc.yy"
+#line 5098 "sql_yacc.yy"
{ (yyval.item)= new Item_func_locate((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item)); }
break;
case 870:
-#line 5098 "sql_yacc.yy"
+#line 5100 "sql_yacc.yy"
{ (yyval.item)= new Item_func_locate((yyvsp[(5) - (8)].item),(yyvsp[(3) - (8)].item),(yyvsp[(7) - (8)].item)); }
break;
case 871:
-#line 5100 "sql_yacc.yy"
+#line 5102 "sql_yacc.yy"
{ (yyvsp[(5) - (6)].item_list)->push_front((yyvsp[(3) - (6)].item)); (yyval.item)= new Item_func_max(*(yyvsp[(5) - (6)].item_list)); }
break;
case 872:
-#line 5102 "sql_yacc.yy"
+#line 5104 "sql_yacc.yy"
{ (yyvsp[(5) - (6)].item_list)->push_front((yyvsp[(3) - (6)].item)); (yyval.item)= new Item_func_min(*(yyvsp[(5) - (6)].item_list)); }
break;
case 873:
-#line 5104 "sql_yacc.yy"
+#line 5106 "sql_yacc.yy"
{ (yyval.item)= new Item_func_log((yyvsp[(3) - (4)].item)); }
break;
case 874:
-#line 5106 "sql_yacc.yy"
+#line 5108 "sql_yacc.yy"
{ (yyval.item)= new Item_func_log((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item)); }
break;
case 875:
-#line 5108 "sql_yacc.yy"
+#line 5110 "sql_yacc.yy"
{
(yyval.item)= new Item_master_pos_wait((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item));
Lex->safe_to_cache_query=0;
@@ -20348,7 +20350,7 @@
break;
case 876:
-#line 5113 "sql_yacc.yy"
+#line 5115 "sql_yacc.yy"
{
(yyval.item)= new Item_master_pos_wait((yyvsp[(3) - (8)].item), (yyvsp[(5) - (8)].item), (yyvsp[(7) - (8)].item));
Lex->safe_to_cache_query=0;
@@ -20356,37 +20358,37 @@
break;
case 877:
-#line 5118 "sql_yacc.yy"
+#line 5120 "sql_yacc.yy"
{ (yyval.item)= new Item_func_microsecond((yyvsp[(3) - (4)].item)); }
break;
case 878:
-#line 5120 "sql_yacc.yy"
+#line 5122 "sql_yacc.yy"
{ (yyval.item)= new Item_func_minute((yyvsp[(3) - (4)].item)); }
break;
case 879:
-#line 5122 "sql_yacc.yy"
+#line 5124 "sql_yacc.yy"
{ (yyval.item) = new Item_func_mod( (yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item)); }
break;
case 880:
-#line 5124 "sql_yacc.yy"
+#line 5126 "sql_yacc.yy"
{ (yyval.item)= new Item_func_month((yyvsp[(3) - (4)].item)); }
break;
case 881:
-#line 5126 "sql_yacc.yy"
+#line 5128 "sql_yacc.yy"
{ (yyval.item)= new Item_func_now_local(); Lex->safe_to_cache_query=0;}
break;
case 882:
-#line 5128 "sql_yacc.yy"
+#line 5130 "sql_yacc.yy"
{ (yyval.item)= new Item_func_now_local((yyvsp[(3) - (4)].item)); Lex->safe_to_cache_query=0;}
break;
case 883:
-#line 5130 "sql_yacc.yy"
+#line 5132 "sql_yacc.yy"
{
(yyval.item)= YYTHD->variables.old_passwords ?
(Item *) new Item_func_old_password((yyvsp[(3) - (4)].item)) :
@@ -20395,52 +20397,52 @@
break;
case 884:
-#line 5136 "sql_yacc.yy"
+#line 5138 "sql_yacc.yy"
{ (yyval.item)= new Item_func_old_password((yyvsp[(3) - (4)].item)); }
break;
case 885:
-#line 5138 "sql_yacc.yy"
+#line 5140 "sql_yacc.yy"
{ (yyval.item) = new Item_func_locate((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item)); }
break;
case 886:
-#line 5140 "sql_yacc.yy"
+#line 5142 "sql_yacc.yy"
{ (yyval.item) = new Item_func_quarter((yyvsp[(3) - (4)].item)); }
break;
case 887:
-#line 5142 "sql_yacc.yy"
+#line 5144 "sql_yacc.yy"
{ (yyval.item)= new Item_func_rand((yyvsp[(3) - (4)].item)); Lex->uncacheable(UNCACHEABLE_RAND);}
break;
case 888:
-#line 5144 "sql_yacc.yy"
+#line 5146 "sql_yacc.yy"
{ (yyval.item)= new Item_func_rand(); Lex->uncacheable(UNCACHEABLE_RAND);}
break;
case 889:
-#line 5146 "sql_yacc.yy"
+#line 5148 "sql_yacc.yy"
{ (yyval.item)= new Item_func_replace((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item)); }
break;
case 890:
-#line 5148 "sql_yacc.yy"
+#line 5150 "sql_yacc.yy"
{ (yyval.item)= new Item_func_right((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); }
break;
case 891:
-#line 5150 "sql_yacc.yy"
+#line 5152 "sql_yacc.yy"
{ (yyval.item)= new Item_func_round((yyvsp[(3) - (4)].item), new Item_int((char*)"0",0,1),0); }
break;
case 892:
-#line 5151 "sql_yacc.yy"
+#line 5153 "sql_yacc.yy"
{ (yyval.item)= new Item_func_round((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item),0); }
break;
case 893:
-#line 5153 "sql_yacc.yy"
+#line 5155 "sql_yacc.yy"
{
(yyval.item)= new Item_func_row_count();
Lex->safe_to_cache_query= 0;
@@ -20449,7 +20451,7 @@
break;
case 894:
-#line 5159 "sql_yacc.yy"
+#line 5161 "sql_yacc.yy"
{
(yyval.item)= new Item_func_senna_kwic(* (yyvsp[(3) - (4)].item_list));
#endif
@@ -20457,47 +20459,47 @@
break;
case 895:
-#line 5164 "sql_yacc.yy"
+#line 5166 "sql_yacc.yy"
{ (yyval.item)= new Item_date_add_interval((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), INTERVAL_DAY, 1);}
break;
case 896:
-#line 5166 "sql_yacc.yy"
+#line 5168 "sql_yacc.yy"
{ (yyval.item)= new Item_date_add_interval((yyvsp[(3) - (8)].item), (yyvsp[(6) - (8)].item), (yyvsp[(7) - (8)].interval), 1); }
break;
case 897:
-#line 5168 "sql_yacc.yy"
+#line 5170 "sql_yacc.yy"
{ (yyval.item)= new Item_func_second((yyvsp[(3) - (4)].item)); }
break;
case 898:
-#line 5170 "sql_yacc.yy"
+#line 5172 "sql_yacc.yy"
{ (yyval.item)= new Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item)); }
break;
case 899:
-#line 5172 "sql_yacc.yy"
+#line 5174 "sql_yacc.yy"
{ (yyval.item)= new Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); }
break;
case 900:
-#line 5174 "sql_yacc.yy"
+#line 5176 "sql_yacc.yy"
{ (yyval.item)= new Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item)); }
break;
case 901:
-#line 5176 "sql_yacc.yy"
+#line 5178 "sql_yacc.yy"
{ (yyval.item)= new Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); }
break;
case 902:
-#line 5178 "sql_yacc.yy"
+#line 5180 "sql_yacc.yy"
{ (yyval.item)= new Item_func_substr_index((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item)); }
break;
case 903:
-#line 5180 "sql_yacc.yy"
+#line 5182 "sql_yacc.yy"
{
if (global_system_variables.sysdate_is_now == 0)
(yyval.item)= new Item_func_sysdate_local();
@@ -20507,7 +20509,7 @@
break;
case 904:
-#line 5187 "sql_yacc.yy"
+#line 5189 "sql_yacc.yy"
{
if (global_system_variables.sysdate_is_now == 0)
(yyval.item)= new Item_func_sysdate_local((yyvsp[(3) - (4)].item));
@@ -20517,77 +20519,77 @@
break;
case 905:
-#line 5194 "sql_yacc.yy"
+#line 5196 "sql_yacc.yy"
{ (yyval.item)= new Item_time_typecast((yyvsp[(3) - (4)].item)); }
break;
case 906:
-#line 5196 "sql_yacc.yy"
+#line 5198 "sql_yacc.yy"
{ (yyval.item)= new Item_datetime_typecast((yyvsp[(3) - (4)].item)); }
break;
case 907:
-#line 5198 "sql_yacc.yy"
+#line 5200 "sql_yacc.yy"
{ (yyval.item)= new Item_func_add_time((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), 1, 0); }
break;
case 908:
-#line 5200 "sql_yacc.yy"
+#line 5202 "sql_yacc.yy"
{ (yyval.item)= new Item_date_add_interval((yyvsp[(7) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(3) - (8)].interval_time_st),0); }
break;
case 909:
-#line 5202 "sql_yacc.yy"
+#line 5204 "sql_yacc.yy"
{ (yyval.item)= new Item_func_timestamp_diff((yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item),(yyvsp[(3) - (8)].interval_time_st)); }
break;
case 910:
-#line 5204 "sql_yacc.yy"
+#line 5206 "sql_yacc.yy"
{ (yyval.item)= new Item_func_trim((yyvsp[(3) - (4)].item)); }
break;
case 911:
-#line 5206 "sql_yacc.yy"
+#line 5208 "sql_yacc.yy"
{ (yyval.item)= new Item_func_ltrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item)); }
break;
case 912:
-#line 5208 "sql_yacc.yy"
+#line 5210 "sql_yacc.yy"
{ (yyval.item)= new Item_func_rtrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item)); }
break;
case 913:
-#line 5210 "sql_yacc.yy"
+#line 5212 "sql_yacc.yy"
{ (yyval.item)= new Item_func_trim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item)); }
break;
case 914:
-#line 5212 "sql_yacc.yy"
+#line 5214 "sql_yacc.yy"
{ (yyval.item)= new Item_func_ltrim((yyvsp[(5) - (6)].item)); }
break;
case 915:
-#line 5214 "sql_yacc.yy"
+#line 5216 "sql_yacc.yy"
{ (yyval.item)= new Item_func_rtrim((yyvsp[(5) - (6)].item)); }
break;
case 916:
-#line 5216 "sql_yacc.yy"
+#line 5218 "sql_yacc.yy"
{ (yyval.item)= new Item_func_trim((yyvsp[(5) - (6)].item)); }
break;
case 917:
-#line 5218 "sql_yacc.yy"
+#line 5220 "sql_yacc.yy"
{ (yyval.item)= new Item_func_trim((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item)); }
break;
case 918:
-#line 5220 "sql_yacc.yy"
+#line 5222 "sql_yacc.yy"
{ (yyval.item)= new Item_func_round((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item),1); }
break;
case 919:
-#line 5222 "sql_yacc.yy"
+#line 5224 "sql_yacc.yy"
{
LEX *lex= Lex;
sp_name *name= new sp_name((yyvsp[(1) - (6)].lex_str), (yyvsp[(3) - (6)].lex_str), true);
@@ -20603,7 +20605,7 @@
break;
case 920:
-#line 5235 "sql_yacc.yy"
+#line 5237 "sql_yacc.yy"
{
#ifdef HAVE_DLOPEN
udf_func *udf= 0;
@@ -20624,7 +20626,7 @@
break;
case 921:
-#line 5253 "sql_yacc.yy"
+#line 5255 "sql_yacc.yy"
{
LEX *lex= Lex;
#ifdef HAVE_DLOPEN
@@ -20726,14 +20728,14 @@
break;
case 922:
-#line 5352 "sql_yacc.yy"
+#line 5354 "sql_yacc.yy"
{
(yyval.item)= new Item_func_unique_users((yyvsp[(3) - (10)].item),atoi((yyvsp[(5) - (10)].lex_str).str),atoi((yyvsp[(7) - (10)].lex_str).str), * (yyvsp[(9) - (10)].item_list));
}
break;
case 923:
-#line 5356 "sql_yacc.yy"
+#line 5358 "sql_yacc.yy"
{
(yyval.item)= new Item_func_unix_timestamp();
Lex->safe_to_cache_query=0;
@@ -20741,32 +20743,32 @@
break;
case 924:
-#line 5361 "sql_yacc.yy"
+#line 5363 "sql_yacc.yy"
{ (yyval.item)= new Item_func_unix_timestamp((yyvsp[(3) - (4)].item)); }
break;
case 925:
-#line 5363 "sql_yacc.yy"
+#line 5365 "sql_yacc.yy"
{ (yyval.item)= new Item_func_user(); Lex->safe_to_cache_query=0; }
break;
case 926:
-#line 5365 "sql_yacc.yy"
+#line 5367 "sql_yacc.yy"
{ (yyval.item)= new Item_func_curdate_utc(); Lex->safe_to_cache_query=0;}
break;
case 927:
-#line 5367 "sql_yacc.yy"
+#line 5369 "sql_yacc.yy"
{ (yyval.item)= new Item_func_curtime_utc(); Lex->safe_to_cache_query=0;}
break;
case 928:
-#line 5369 "sql_yacc.yy"
+#line 5371 "sql_yacc.yy"
{ (yyval.item)= new Item_func_now_utc(); Lex->safe_to_cache_query=0;}
break;
case 929:
-#line 5371 "sql_yacc.yy"
+#line 5373 "sql_yacc.yy"
{
(yyval.item)= new Item_func_week((yyvsp[(3) - (4)].item),new Item_int((char*) "0",
YYTHD->variables.default_week_format,1));
@@ -20774,27 +20776,27 @@
break;
case 930:
-#line 5376 "sql_yacc.yy"
+#line 5378 "sql_yacc.yy"
{ (yyval.item)= new Item_func_week((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); }
break;
case 931:
-#line 5378 "sql_yacc.yy"
+#line 5380 "sql_yacc.yy"
{ (yyval.item)= new Item_func_year((yyvsp[(3) - (4)].item)); }
break;
case 932:
-#line 5380 "sql_yacc.yy"
+#line 5382 "sql_yacc.yy"
{ (yyval.item)= new Item_func_yearweek((yyvsp[(3) - (4)].item),new Item_int((char*) "0",0,1)); }
break;
case 933:
-#line 5382 "sql_yacc.yy"
+#line 5384 "sql_yacc.yy"
{ (yyval.item)= new Item_func_yearweek((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item)); }
break;
case 934:
-#line 5384 "sql_yacc.yy"
+#line 5386 "sql_yacc.yy"
{
(yyval.item)=new Item_func_benchmark((yyvsp[(3) - (6)].ulong_num),(yyvsp[(5) - (6)].item));
Lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
@@ -20802,198 +20804,198 @@
break;
case 935:
-#line 5389 "sql_yacc.yy"
+#line 5391 "sql_yacc.yy"
{ (yyval.item)=new Item_extract( (yyvsp[(3) - (6)].interval), (yyvsp[(5) - (6)].item)); }
break;
case 936:
-#line 5393 "sql_yacc.yy"
+#line 5395 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_spatial_rel((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), Item_func::SP_CONTAINS_FUNC)); }
break;
case 937:
-#line 5395 "sql_yacc.yy"
+#line 5397 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (4)].item))); }
break;
case 938:
-#line 5397 "sql_yacc.yy"
+#line 5399 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item))); }
break;
case 939:
-#line 5399 "sql_yacc.yy"
+#line 5401 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_wkb((yyvsp[(3) - (4)].item))); }
break;
case 940:
-#line 5401 "sql_yacc.yy"
+#line 5403 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_wkb((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item))); }
break;
case 941:
-#line 5403 "sql_yacc.yy"
+#line 5405 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
Geometry::wkb_geometrycollection,
Geometry::wkb_point)); }
break;
case 942:
-#line 5407 "sql_yacc.yy"
+#line 5409 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
Geometry::wkb_linestring, Geometry::wkb_point)); }
break;
case 943:
-#line 5410 "sql_yacc.yy"
+#line 5412 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW( Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
Geometry::wkb_multilinestring, Geometry::wkb_linestring)); }
break;
case 944:
-#line 5413 "sql_yacc.yy"
+#line 5415 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (4)].item))); }
break;
case 945:
-#line 5415 "sql_yacc.yy"
+#line 5417 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item))); }
break;
case 946:
-#line 5417 "sql_yacc.yy"
+#line 5419 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (4)].item))); }
break;
case 947:
-#line 5419 "sql_yacc.yy"
+#line 5421 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item))); }
break;
case 948:
-#line 5421 "sql_yacc.yy"
+#line 5423 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (4)].item))); }
break;
case 949:
-#line 5423 "sql_yacc.yy"
+#line 5425 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item))); }
break;
case 950:
-#line 5425 "sql_yacc.yy"
+#line 5427 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
Geometry::wkb_multipoint, Geometry::wkb_point)); }
break;
case 951:
-#line 5428 "sql_yacc.yy"
+#line 5430 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
Geometry::wkb_multipolygon, Geometry::wkb_polygon)); }
break;
case 952:
-#line 5431 "sql_yacc.yy"
+#line 5433 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_point((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item))); }
break;
case 953:
-#line 5433 "sql_yacc.yy"
+#line 5435 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (4)].item))); }
break;
case 954:
-#line 5435 "sql_yacc.yy"
+#line 5437 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item))); }
break;
case 955:
-#line 5437 "sql_yacc.yy"
+#line 5439 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (4)].item))); }
break;
case 956:
-#line 5439 "sql_yacc.yy"
+#line 5441 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item))); }
break;
case 957:
-#line 5441 "sql_yacc.yy"
+#line 5443 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
Geometry::wkb_polygon, Geometry::wkb_linestring)); }
break;
case 958:
-#line 5444 "sql_yacc.yy"
+#line 5446 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (4)].item))); }
break;
case 959:
-#line 5446 "sql_yacc.yy"
+#line 5448 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item))); }
break;
case 960:
-#line 5448 "sql_yacc.yy"
+#line 5450 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (4)].item))); }
break;
case 961:
-#line 5450 "sql_yacc.yy"
+#line 5452 "sql_yacc.yy"
{ (yyval.item)= GEOM_NEW(Item_func_geometry_from_text((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item))); }
break;
case 962:
-#line 5454 "sql_yacc.yy"
+#line 5456 "sql_yacc.yy"
{ (yyval.num)= FT_NL; }
break;
case 963:
-#line 5455 "sql_yacc.yy"
+#line 5457 "sql_yacc.yy"
{ (yyval.num)= FT_NL | FT_EXPAND; }
break;
case 964:
-#line 5456 "sql_yacc.yy"
+#line 5458 "sql_yacc.yy"
{ (yyval.num)= FT_BOOL; }
break;
case 965:
-#line 5460 "sql_yacc.yy"
+#line 5462 "sql_yacc.yy"
{ (yyval.item_list)= NULL; }
break;
case 966:
-#line 5461 "sql_yacc.yy"
+#line 5463 "sql_yacc.yy"
{ (yyval.item_list)= (yyvsp[(1) - (1)].item_list);}
break;
case 967:
-#line 5465 "sql_yacc.yy"
+#line 5467 "sql_yacc.yy"
{ Select->expr_list.push_front(new List<Item>); }
break;
case 968:
-#line 5467 "sql_yacc.yy"
+#line 5469 "sql_yacc.yy"
{ (yyval.item_list)= Select->expr_list.pop(); }
break;
case 969:
-#line 5472 "sql_yacc.yy"
+#line 5474 "sql_yacc.yy"
{
Select->expr_list.head()->push_back((yyvsp[(1) - (1)].item));
}
break;
case 970:
-#line 5476 "sql_yacc.yy"
+#line 5478 "sql_yacc.yy"
{
Select->expr_list.head()->push_back((yyvsp[(3) - (3)].item));
}
break;
case 971:
-#line 5483 "sql_yacc.yy"
+#line 5485 "sql_yacc.yy"
{
udf_func *udf= Select->udf_list.head();
/*
@@ -21024,117 +21026,117 @@
break;
case 972:
-#line 5514 "sql_yacc.yy"
+#line 5516 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_avg((yyvsp[(3) - (4)].item)); }
break;
case 973:
-#line 5516 "sql_yacc.yy"
+#line 5518 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_avg_distinct((yyvsp[(4) - (5)].item)); }
break;
case 974:
-#line 5518 "sql_yacc.yy"
+#line 5520 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_and((yyvsp[(3) - (4)].item)); }
break;
case 975:
-#line 5520 "sql_yacc.yy"
+#line 5522 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_or((yyvsp[(3) - (4)].item)); }
break;
case 976:
-#line 5522 "sql_yacc.yy"
+#line 5524 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_xor((yyvsp[(3) - (4)].item)); }
break;
case 977:
-#line 5524 "sql_yacc.yy"
+#line 5526 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_count(new Item_int((int32) 0L,1)); }
break;
case 978:
-#line 5526 "sql_yacc.yy"
+#line 5528 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_count((yyvsp[(3) - (4)].item)); }
break;
case 979:
-#line 5528 "sql_yacc.yy"
+#line 5530 "sql_yacc.yy"
{ Select->in_sum_expr++; }
break;
case 980:
-#line 5530 "sql_yacc.yy"
+#line 5532 "sql_yacc.yy"
{ Select->in_sum_expr--; }
break;
case 981:
-#line 5532 "sql_yacc.yy"
+#line 5534 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_count_distinct(* (yyvsp[(5) - (7)].item_list)); }
break;
case 982:
-#line 5534 "sql_yacc.yy"
+#line 5536 "sql_yacc.yy"
{ (yyval.item)= new Item_sum_unique_users((yyvsp[(3) - (10)].item),atoi((yyvsp[(5) - (10)].lex_str).str),atoi((yyvsp[(7) - (10)].lex_str).str),(yyvsp[(9) - (10)].item)); }
break;
case 983:
-#line 5536 "sql_yacc.yy"
+#line 5538 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_min((yyvsp[(3) - (4)].item)); }
break;
case 984:
-#line 5543 "sql_yacc.yy"
+#line 5545 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_min((yyvsp[(4) - (5)].item)); }
break;
case 985:
-#line 5545 "sql_yacc.yy"
+#line 5547 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_max((yyvsp[(3) - (4)].item)); }
break;
case 986:
-#line 5547 "sql_yacc.yy"
+#line 5549 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_max((yyvsp[(4) - (5)].item)); }
break;
case 987:
-#line 5549 "sql_yacc.yy"
+#line 5551 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_std((yyvsp[(3) - (4)].item), 0); }
break;
case 988:
-#line 5551 "sql_yacc.yy"
+#line 5553 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_variance((yyvsp[(3) - (4)].item), 0); }
break;
case 989:
-#line 5553 "sql_yacc.yy"
+#line 5555 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_std((yyvsp[(3) - (4)].item), 1); }
break;
case 990:
-#line 5555 "sql_yacc.yy"
+#line 5557 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_variance((yyvsp[(3) - (4)].item), 1); }
break;
case 991:
-#line 5557 "sql_yacc.yy"
+#line 5559 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_sum((yyvsp[(3) - (4)].item)); }
break;
case 992:
-#line 5559 "sql_yacc.yy"
+#line 5561 "sql_yacc.yy"
{ (yyval.item)=new Item_sum_sum_distinct((yyvsp[(4) - (5)].item)); }
break;
case 993:
-#line 5561 "sql_yacc.yy"
+#line 5563 "sql_yacc.yy"
{ Select->in_sum_expr++; }
break;
case 994:
-#line 5565 "sql_yacc.yy"
+#line 5567 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
sel->in_sum_expr--;
@@ -21145,7 +21147,7 @@
break;
case 995:
-#line 5575 "sql_yacc.yy"
+#line 5577 "sql_yacc.yy"
{
if (! Lex->parsing_options.allows_variable)
{
@@ -21156,14 +21158,14 @@
break;
case 996:
-#line 5583 "sql_yacc.yy"
+#line 5585 "sql_yacc.yy"
{
(yyval.item)= (yyvsp[(3) - (3)].item);
}
break;
case 997:
-#line 5590 "sql_yacc.yy"
+#line 5592 "sql_yacc.yy"
{
(yyval.item)= new Item_func_set_user_var((yyvsp[(1) - (3)].lex_str), (yyvsp[(3) - (3)].item));
LEX *lex= Lex;
@@ -21172,7 +21174,7 @@
break;
case 998:
-#line 5596 "sql_yacc.yy"
+#line 5598 "sql_yacc.yy"
{
(yyval.item)= new Item_func_get_user_var((yyvsp[(1) - (1)].lex_str));
LEX *lex= Lex;
@@ -21181,7 +21183,7 @@
break;
case 999:
-#line 5602 "sql_yacc.yy"
+#line 5604 "sql_yacc.yy"
{
if ((yyvsp[(3) - (4)].lex_str).str && (yyvsp[(4) - (4)].lex_str).str && check_reserved_words(&(yyvsp[(3) - (4)].lex_str)))
{
@@ -21194,36 +21196,36 @@
break;
case 1000:
-#line 5614 "sql_yacc.yy"
+#line 5616 "sql_yacc.yy"
{ (yyval.num) = 0; }
break;
case 1001:
-#line 5615 "sql_yacc.yy"
+#line 5617 "sql_yacc.yy"
{ (yyval.num) = 1; }
break;
case 1002:
-#line 5619 "sql_yacc.yy"
+#line 5621 "sql_yacc.yy"
{
(yyval.string)= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1);
}
break;
case 1003:
-#line 5622 "sql_yacc.yy"
+#line 5624 "sql_yacc.yy"
{ (yyval.string) = (yyvsp[(2) - (2)].string); }
break;
case 1004:
-#line 5627 "sql_yacc.yy"
+#line 5629 "sql_yacc.yy"
{
Select->gorder_list = NULL;
}
break;
case 1005:
-#line 5631 "sql_yacc.yy"
+#line 5633 "sql_yacc.yy"
{
SELECT_LEX *select= Select;
select->gorder_list=
@@ -21234,7 +21236,7 @@
break;
case 1006:
-#line 5642 "sql_yacc.yy"
+#line 5644 "sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->current_select->inc_in_sum_expr())
@@ -21246,7 +21248,7 @@
break;
case 1007:
-#line 5651 "sql_yacc.yy"
+#line 5653 "sql_yacc.yy"
{
Select->in_sum_expr--;
(yyval.item)= (yyvsp[(3) - (3)].item);
@@ -21254,142 +21256,142 @@
break;
case 1008:
-#line 5657 "sql_yacc.yy"
+#line 5659 "sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= &my_charset_bin; Lex->dec= 0; }
break;
case 1009:
-#line 5658 "sql_yacc.yy"
+#line 5660 "sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_CHAR; Lex->dec= 0; }
break;
case 1010:
-#line 5659 "sql_yacc.yy"
+#line 5661 "sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= national_charset_info; Lex->dec=0; }
break;
case 1011:
-#line 5660 "sql_yacc.yy"
+#line 5662 "sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
case 1012:
-#line 5661 "sql_yacc.yy"
+#line 5663 "sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
case 1013:
-#line 5662 "sql_yacc.yy"
+#line 5664 "sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
case 1014:
-#line 5663 "sql_yacc.yy"
+#line 5665 "sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
case 1015:
-#line 5664 "sql_yacc.yy"
+#line 5666 "sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_DATE; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
case 1016:
-#line 5665 "sql_yacc.yy"
+#line 5667 "sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_TIME; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
case 1017:
-#line 5666 "sql_yacc.yy"
+#line 5668 "sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_DATETIME; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
case 1018:
-#line 5667 "sql_yacc.yy"
+#line 5669 "sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_DECIMAL; Lex->charset= NULL; }
break;
case 1019:
-#line 5671 "sql_yacc.yy"
+#line 5673 "sql_yacc.yy"
{ (yyval.item_list)= NULL; }
break;
case 1020:
-#line 5672 "sql_yacc.yy"
+#line 5674 "sql_yacc.yy"
{ (yyval.item_list)= (yyvsp[(1) - (1)].item_list);}
break;
case 1021:
-#line 5676 "sql_yacc.yy"
+#line 5678 "sql_yacc.yy"
{ Select->expr_list.push_front(new List<Item>); }
break;
case 1022:
-#line 5678 "sql_yacc.yy"
+#line 5680 "sql_yacc.yy"
{ (yyval.item_list)= Select->expr_list.pop(); }
break;
case 1023:
-#line 5681 "sql_yacc.yy"
+#line 5683 "sql_yacc.yy"
{ Select->expr_list.head()->push_back((yyvsp[(1) - (1)].item)); }
break;
case 1024:
-#line 5682 "sql_yacc.yy"
+#line 5684 "sql_yacc.yy"
{ Select->expr_list.head()->push_back((yyvsp[(3) - (3)].item)); }
break;
case 1025:
-#line 5685 "sql_yacc.yy"
+#line 5687 "sql_yacc.yy"
{ (yyval.item_list)= (yyvsp[(1) - (1)].item_list); }
break;
case 1026:
-#line 5686 "sql_yacc.yy"
+#line 5688 "sql_yacc.yy"
{ (yyval.item_list)= (yyvsp[(2) - (3)].item_list); }
break;
case 1027:
-#line 5689 "sql_yacc.yy"
+#line 5691 "sql_yacc.yy"
{ Select->expr_list.push_front(new List<Item>); }
break;
case 1028:
-#line 5691 "sql_yacc.yy"
+#line 5693 "sql_yacc.yy"
{ (yyval.item_list)= Select->expr_list.pop(); }
break;
case 1029:
-#line 5694 "sql_yacc.yy"
+#line 5696 "sql_yacc.yy"
{ Select->expr_list.head()->push_back((yyvsp[(1) - (1)].item)); }
break;
case 1030:
-#line 5695 "sql_yacc.yy"
+#line 5697 "sql_yacc.yy"
{ Select->expr_list.head()->push_back((yyvsp[(3) - (3)].item)); }
break;
case 1031:
-#line 5698 "sql_yacc.yy"
+#line 5700 "sql_yacc.yy"
{ (yyval.item)= NULL; }
break;
case 1032:
-#line 5699 "sql_yacc.yy"
+#line 5701 "sql_yacc.yy"
{ (yyval.item)= (yyvsp[(1) - (1)].item); }
break;
case 1033:
-#line 5702 "sql_yacc.yy"
+#line 5704 "sql_yacc.yy"
{ (yyval.item)= NULL; }
break;
case 1034:
-#line 5703 "sql_yacc.yy"
+#line 5705 "sql_yacc.yy"
{ (yyval.item)= (yyvsp[(2) - (2)].item); }
break;
case 1035:
-#line 5707 "sql_yacc.yy"
+#line 5709 "sql_yacc.yy"
{
(yyval.item_list)= new List<Item>;
(yyval.item_list)->push_back((yyvsp[(2) - (4)].item));
@@ -21398,7 +21400,7 @@
break;
case 1036:
-#line 5713 "sql_yacc.yy"
+#line 5715 "sql_yacc.yy"
{
(yyvsp[(1) - (5)].item_list)->push_back((yyvsp[(3) - (5)].item));
(yyvsp[(1) - (5)].item_list)->push_back((yyvsp[(5) - (5)].item));
@@ -21407,12 +21409,12 @@
break;
case 1037:
-#line 5722 "sql_yacc.yy"
+#line 5724 "sql_yacc.yy"
{ (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
break;
case 1038:
-#line 5724 "sql_yacc.yy"
+#line 5726 "sql_yacc.yy"
{
LEX *lex= Lex;
if (!((yyval.table_list)= lex->current_select->nest_last_join(lex->thd)))
@@ -21421,34 +21423,34 @@
break;
case 1039:
-#line 5732 "sql_yacc.yy"
+#line 5734 "sql_yacc.yy"
{ MYSQL_YYABORT_UNLESS((yyval.table_list)=(yyvsp[(1) - (1)].table_list)); }
break;
case 1040:
-#line 5737 "sql_yacc.yy"
+#line 5739 "sql_yacc.yy"
{ (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
break;
case 1041:
-#line 5739 "sql_yacc.yy"
+#line 5741 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list)));
}
break;
case 1042:
-#line 5759 "sql_yacc.yy"
+#line 5761 "sql_yacc.yy"
{ MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); }
break;
case 1043:
-#line 5761 "sql_yacc.yy"
+#line 5763 "sql_yacc.yy"
{ MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); (yyvsp[(3) - (3)].table_list)->straight=1; }
break;
case 1044:
-#line 5764 "sql_yacc.yy"
+#line 5766 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list));
/* Change the current name resolution context to a local context. */
@@ -21459,7 +21461,7 @@
break;
case 1045:
-#line 5772 "sql_yacc.yy"
+#line 5774 "sql_yacc.yy"
{
add_join_on((yyvsp[(3) - (6)].table_list),(yyvsp[(6) - (6)].item));
Lex->pop_context();
@@ -21468,7 +21470,7 @@
break;
case 1046:
-#line 5779 "sql_yacc.yy"
+#line 5781 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list));
/* Change the current name resolution context to a local context. */
@@ -21479,7 +21481,7 @@
break;
case 1047:
-#line 5787 "sql_yacc.yy"
+#line 5789 "sql_yacc.yy"
{
(yyvsp[(3) - (6)].table_list)->straight=1;
add_join_on((yyvsp[(3) - (6)].table_list),(yyvsp[(6) - (6)].item));
@@ -21489,19 +21491,19 @@
break;
case 1048:
-#line 5795 "sql_yacc.yy"
+#line 5797 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list));
}
break;
case 1049:
-#line 5799 "sql_yacc.yy"
+#line 5801 "sql_yacc.yy"
{ add_join_natural((yyvsp[(1) - (8)].table_list),(yyvsp[(3) - (8)].table_list),(yyvsp[(7) - (8)].string_list),Select); (yyval.table_list)=(yyvsp[(3) - (8)].table_list); }
break;
case 1050:
-#line 5801 "sql_yacc.yy"
+#line 5803 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && ((yyval.table_list)=(yyvsp[(4) - (4)].table_list)));
add_join_natural((yyvsp[(1) - (4)].table_list),(yyvsp[(4) - (4)].table_list),NULL,Select);
@@ -21509,7 +21511,7 @@
break;
case 1051:
-#line 5809 "sql_yacc.yy"
+#line 5811 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(5) - (6)].table_list));
/* Change the current name resolution context to a local context. */
@@ -21520,7 +21522,7 @@
break;
case 1052:
-#line 5817 "sql_yacc.yy"
+#line 5819 "sql_yacc.yy"
{
add_join_on((yyvsp[(5) - (8)].table_list),(yyvsp[(8) - (8)].item));
Lex->pop_context();
@@ -21531,14 +21533,14 @@
break;
case 1053:
-#line 5825 "sql_yacc.yy"
+#line 5827 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].table_list) && (yyvsp[(5) - (5)].table_list));
}
break;
case 1054:
-#line 5829 "sql_yacc.yy"
+#line 5831 "sql_yacc.yy"
{
add_join_natural((yyvsp[(1) - (10)].table_list),(yyvsp[(5) - (10)].table_list),(yyvsp[(9) - (10)].string_list),Select);
(yyvsp[(5) - (10)].table_list)->outer_join|=JOIN_TYPE_LEFT;
@@ -21547,7 +21549,7 @@
break;
case 1055:
-#line 5835 "sql_yacc.yy"
+#line 5837 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(6) - (6)].table_list));
add_join_natural((yyvsp[(1) - (6)].table_list),(yyvsp[(6) - (6)].table_list),NULL,Select);
@@ -21557,7 +21559,7 @@
break;
case 1056:
-#line 5845 "sql_yacc.yy"
+#line 5847 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(5) - (6)].table_list));
/* Change the current name resolution context to a local context. */
@@ -21568,7 +21570,7 @@
break;
case 1057:
-#line 5853 "sql_yacc.yy"
+#line 5855 "sql_yacc.yy"
{
LEX *lex= Lex;
if (!((yyval.table_list)= lex->current_select->convert_right_join()))
@@ -21580,14 +21582,14 @@
break;
case 1058:
-#line 5862 "sql_yacc.yy"
+#line 5864 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].table_list) && (yyvsp[(5) - (5)].table_list));
}
break;
case 1059:
-#line 5866 "sql_yacc.yy"
+#line 5868 "sql_yacc.yy"
{
LEX *lex= Lex;
if (!((yyval.table_list)= lex->current_select->convert_right_join()))
@@ -21597,7 +21599,7 @@
break;
case 1060:
-#line 5873 "sql_yacc.yy"
+#line 5875 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(6) - (6)].table_list));
add_join_natural((yyvsp[(6) - (6)].table_list),(yyvsp[(1) - (6)].table_list),NULL,Select);
@@ -21608,22 +21610,22 @@
break;
case 1061:
-#line 5882 "sql_yacc.yy"
+#line 5884 "sql_yacc.yy"
{}
break;
case 1062:
-#line 5883 "sql_yacc.yy"
+#line 5885 "sql_yacc.yy"
{}
break;
case 1063:
-#line 5884 "sql_yacc.yy"
+#line 5886 "sql_yacc.yy"
{}
break;
case 1064:
-#line 5889 "sql_yacc.yy"
+#line 5891 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
sel->use_index_ptr=sel->ignore_index_ptr=0;
@@ -21632,7 +21634,7 @@
break;
case 1065:
-#line 5895 "sql_yacc.yy"
+#line 5897 "sql_yacc.yy"
{
LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select;
@@ -21647,7 +21649,7 @@
break;
case 1066:
-#line 5908 "sql_yacc.yy"
+#line 5910 "sql_yacc.yy"
{
/* Change the current name resolution context to a local context. */
if (push_new_name_resolution_context(YYTHD, (yyvsp[(3) - (8)].table_list), (yyvsp[(7) - (8)].table_list)))
@@ -21657,7 +21659,7 @@
break;
case 1067:
-#line 5915 "sql_yacc.yy"
+#line 5917 "sql_yacc.yy"
{
LEX *lex= Lex;
MYSQL_YYABORT_UNLESS((yyvsp[(3) - (11)].table_list) && (yyvsp[(7) - (11)].table_list));
@@ -21671,7 +21673,7 @@
break;
case 1068:
-#line 5926 "sql_yacc.yy"
+#line 5928 "sql_yacc.yy"
{
LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select;
@@ -21696,7 +21698,7 @@
break;
case 1069:
-#line 5948 "sql_yacc.yy"
+#line 5950 "sql_yacc.yy"
{
/* Use $2 instead of Lex->current_select as derived table will
alter value of Lex->current_select. */
@@ -21742,7 +21744,7 @@
break;
case 1070:
-#line 5995 "sql_yacc.yy"
+#line 5997 "sql_yacc.yy"
{
LEX *lex= Lex;
if ((yyvsp[(1) - (1)].select_lex)->init_nested_join(lex->thd))
@@ -21751,7 +21753,7 @@
break;
case 1071:
-#line 6001 "sql_yacc.yy"
+#line 6003 "sql_yacc.yy"
{
LEX *lex= Lex;
/* for normal joins, $3 != NULL and end_nested_join() != NULL,
@@ -21768,7 +21770,7 @@
break;
case 1072:
-#line 6017 "sql_yacc.yy"
+#line 6019 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->derived_tables|= DERIVED_SUBQUERY;
@@ -21789,19 +21791,19 @@
break;
case 1073:
-#line 6035 "sql_yacc.yy"
+#line 6037 "sql_yacc.yy"
{
Select->parsing_place= NO_MATTER;
}
break;
case 1075:
-#line 6042 "sql_yacc.yy"
+#line 6044 "sql_yacc.yy"
{ (yyval.select_lex)= Select; }
break;
case 1076:
-#line 6047 "sql_yacc.yy"
+#line 6049 "sql_yacc.yy"
{
LEX *lex= Lex;
@@ -21827,22 +21829,22 @@
break;
case 1077:
-#line 6072 "sql_yacc.yy"
+#line 6074 "sql_yacc.yy"
{}
break;
case 1078:
-#line 6073 "sql_yacc.yy"
+#line 6075 "sql_yacc.yy"
{}
break;
case 1081:
-#line 6080 "sql_yacc.yy"
+#line 6082 "sql_yacc.yy"
{}
break;
case 1082:
-#line 6082 "sql_yacc.yy"
+#line 6084 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
sel->use_index= *(yyvsp[(2) - (2)].string_list);
@@ -21851,7 +21853,7 @@
break;
case 1083:
-#line 6088 "sql_yacc.yy"
+#line 6090 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
sel->use_index= *(yyvsp[(2) - (2)].string_list);
@@ -21861,7 +21863,7 @@
break;
case 1084:
-#line 6095 "sql_yacc.yy"
+#line 6097 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
sel->ignore_index= *(yyvsp[(2) - (2)].string_list);
@@ -21870,48 +21872,48 @@
break;
case 1085:
-#line 6103 "sql_yacc.yy"
+#line 6105 "sql_yacc.yy"
{ Select->interval_list.empty(); }
break;
case 1086:
-#line 6105 "sql_yacc.yy"
+#line 6107 "sql_yacc.yy"
{ (yyval.string_list)= &Select->interval_list; }
break;
case 1087:
-#line 6109 "sql_yacc.yy"
+#line 6111 "sql_yacc.yy"
{}
break;
case 1088:
-#line 6110 "sql_yacc.yy"
+#line 6112 "sql_yacc.yy"
{}
break;
case 1089:
-#line 6115 "sql_yacc.yy"
+#line 6117 "sql_yacc.yy"
{ Select->
interval_list.push_back(new (YYTHD->mem_root) String((const char*) (yyvsp[(3) - (3)].lex_str).str, (yyvsp[(3) - (3)].lex_str).length,
system_charset_info)); }
break;
case 1090:
-#line 6119 "sql_yacc.yy"
+#line 6121 "sql_yacc.yy"
{ Select->
interval_list.push_back(new (YYTHD->mem_root) String((const char*) (yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length,
system_charset_info)); }
break;
case 1091:
-#line 6123 "sql_yacc.yy"
+#line 6125 "sql_yacc.yy"
{ Select->
interval_list.push_back(new (YYTHD->mem_root) String("PRIMARY", 7,
system_charset_info)); }
break;
case 1092:
-#line 6129 "sql_yacc.yy"
+#line 6131 "sql_yacc.yy"
{
if (!((yyval.string_list)= new List<String>))
MYSQL_YYABORT;
@@ -21922,7 +21924,7 @@
break;
case 1093:
-#line 6137 "sql_yacc.yy"
+#line 6139 "sql_yacc.yy"
{
(yyvsp[(1) - (3)].string_list)->push_back(new (YYTHD->mem_root)
String((const char *) (yyvsp[(3) - (3)].lex_str).str, (yyvsp[(3) - (3)].lex_str).length,
@@ -21932,159 +21934,159 @@
break;
case 1094:
-#line 6145 "sql_yacc.yy"
+#line 6147 "sql_yacc.yy"
{}
break;
case 1095:
-#line 6146 "sql_yacc.yy"
+#line 6148 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_DAY_HOUR; }
break;
case 1096:
-#line 6147 "sql_yacc.yy"
+#line 6149 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_DAY_MICROSECOND; }
break;
case 1097:
-#line 6148 "sql_yacc.yy"
+#line 6150 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_DAY_MINUTE; }
break;
case 1098:
-#line 6149 "sql_yacc.yy"
+#line 6151 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_DAY_SECOND; }
break;
case 1099:
-#line 6150 "sql_yacc.yy"
+#line 6152 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_HOUR_MICROSECOND; }
break;
case 1100:
-#line 6151 "sql_yacc.yy"
+#line 6153 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_HOUR_MINUTE; }
break;
case 1101:
-#line 6152 "sql_yacc.yy"
+#line 6154 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_HOUR_SECOND; }
break;
case 1102:
-#line 6153 "sql_yacc.yy"
+#line 6155 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_MICROSECOND; }
break;
case 1103:
-#line 6154 "sql_yacc.yy"
+#line 6156 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_MINUTE_MICROSECOND; }
break;
case 1104:
-#line 6155 "sql_yacc.yy"
+#line 6157 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_MINUTE_SECOND; }
break;
case 1105:
-#line 6156 "sql_yacc.yy"
+#line 6158 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_SECOND_MICROSECOND; }
break;
case 1106:
-#line 6157 "sql_yacc.yy"
+#line 6159 "sql_yacc.yy"
{ (yyval.interval)=INTERVAL_YEAR_MONTH; }
break;
case 1107:
-#line 6160 "sql_yacc.yy"
+#line 6162 "sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_DAY; }
break;
case 1108:
-#line 6161 "sql_yacc.yy"
+#line 6163 "sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_WEEK; }
break;
case 1109:
-#line 6162 "sql_yacc.yy"
+#line 6164 "sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_HOUR; }
break;
case 1110:
-#line 6163 "sql_yacc.yy"
+#line 6165 "sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_MICROSECOND; }
break;
case 1111:
-#line 6164 "sql_yacc.yy"
+#line 6166 "sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_MINUTE; }
break;
case 1112:
-#line 6165 "sql_yacc.yy"
+#line 6167 "sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_MONTH; }
break;
case 1113:
-#line 6166 "sql_yacc.yy"
+#line 6168 "sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_QUARTER; }
break;
case 1114:
-#line 6167 "sql_yacc.yy"
+#line 6169 "sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_SECOND; }
break;
case 1115:
-#line 6168 "sql_yacc.yy"
+#line 6170 "sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_YEAR; }
break;
case 1116:
-#line 6172 "sql_yacc.yy"
+#line 6174 "sql_yacc.yy"
{(yyval.date_time_type)=MYSQL_TIMESTAMP_DATE;}
break;
case 1117:
-#line 6173 "sql_yacc.yy"
+#line 6175 "sql_yacc.yy"
{(yyval.date_time_type)=MYSQL_TIMESTAMP_TIME;}
break;
case 1118:
-#line 6174 "sql_yacc.yy"
+#line 6176 "sql_yacc.yy"
{(yyval.date_time_type)=MYSQL_TIMESTAMP_DATETIME;}
break;
case 1119:
-#line 6175 "sql_yacc.yy"
+#line 6177 "sql_yacc.yy"
{(yyval.date_time_type)=MYSQL_TIMESTAMP_DATETIME;}
break;
case 1123:
-#line 6184 "sql_yacc.yy"
+#line 6186 "sql_yacc.yy"
{ (yyval.lex_str_ptr)=0; }
break;
case 1124:
-#line 6186 "sql_yacc.yy"
+#line 6188 "sql_yacc.yy"
{ (yyval.lex_str_ptr)= (LEX_STRING*) sql_memdup(&(yyvsp[(2) - (2)].lex_str),sizeof(LEX_STRING)); }
break;
case 1127:
-#line 6194 "sql_yacc.yy"
+#line 6196 "sql_yacc.yy"
{ Select->where= 0; }
break;
case 1128:
-#line 6196 "sql_yacc.yy"
+#line 6198 "sql_yacc.yy"
{
Select->parsing_place= IN_WHERE;
}
break;
case 1129:
-#line 6200 "sql_yacc.yy"
+#line 6202 "sql_yacc.yy"
{
SELECT_LEX *select= Select;
select->where= (yyvsp[(3) - (3)].item);
@@ -22095,14 +22097,14 @@
break;
case 1131:
-#line 6212 "sql_yacc.yy"
+#line 6214 "sql_yacc.yy"
{
Select->parsing_place= IN_HAVING;
}
break;
case 1132:
-#line 6216 "sql_yacc.yy"
+#line 6218 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
sel->having= (yyvsp[(3) - (3)].item);
@@ -22113,7 +22115,7 @@
break;
case 1133:
-#line 6227 "sql_yacc.yy"
+#line 6229 "sql_yacc.yy"
{
Lex->escape_used= TRUE;
(yyval.item)= (yyvsp[(2) - (2)].item);
@@ -22121,7 +22123,7 @@
break;
case 1134:
-#line 6232 "sql_yacc.yy"
+#line 6234 "sql_yacc.yy"
{
Lex->escape_used= FALSE;
(yyval.item)= ((YYTHD->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ?
@@ -22131,22 +22133,22 @@
break;
case 1137:
-#line 6251 "sql_yacc.yy"
+#line 6253 "sql_yacc.yy"
{ if (add_group_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
break;
case 1138:
-#line 6253 "sql_yacc.yy"
+#line 6255 "sql_yacc.yy"
{ if (add_group_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
break;
case 1139:
-#line 6256 "sql_yacc.yy"
+#line 6258 "sql_yacc.yy"
{}
break;
case 1140:
-#line 6258 "sql_yacc.yy"
+#line 6260 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->current_select->linkage == GLOBAL_OPTIONS_TYPE)
@@ -22162,7 +22164,7 @@
break;
case 1141:
-#line 6271 "sql_yacc.yy"
+#line 6273 "sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->current_select->linkage == GLOBAL_OPTIONS_TYPE)
@@ -22176,7 +22178,7 @@
break;
case 1145:
-#line 6298 "sql_yacc.yy"
+#line 6300 "sql_yacc.yy"
{
THD *thd= YYTHD;
bool ascending= ((yyvsp[(2) - (2)].num) == 1) ? true : false;
@@ -22186,7 +22188,7 @@
break;
case 1148:
-#line 6316 "sql_yacc.yy"
+#line 6318 "sql_yacc.yy"
{
LEX *lex=Lex;
SELECT_LEX *sel= lex->current_select;
@@ -22219,32 +22221,32 @@
break;
case 1150:
-#line 6348 "sql_yacc.yy"
+#line 6350 "sql_yacc.yy"
{ if (add_order_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
break;
case 1151:
-#line 6350 "sql_yacc.yy"
+#line 6352 "sql_yacc.yy"
{ if (add_order_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
break;
case 1152:
-#line 6353 "sql_yacc.yy"
+#line 6355 "sql_yacc.yy"
{ (yyval.num) = 1; }
break;
case 1153:
-#line 6354 "sql_yacc.yy"
+#line 6356 "sql_yacc.yy"
{ (yyval.num) =1; }
break;
case 1154:
-#line 6355 "sql_yacc.yy"
+#line 6357 "sql_yacc.yy"
{ (yyval.num) =0; }
break;
case 1155:
-#line 6360 "sql_yacc.yy"
+#line 6362 "sql_yacc.yy"
{
LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select;
@@ -22254,27 +22256,27 @@
break;
case 1156:
-#line 6366 "sql_yacc.yy"
+#line 6368 "sql_yacc.yy"
{}
break;
case 1157:
-#line 6370 "sql_yacc.yy"
+#line 6372 "sql_yacc.yy"
{}
break;
case 1158:
-#line 6371 "sql_yacc.yy"
+#line 6373 "sql_yacc.yy"
{}
break;
case 1159:
-#line 6375 "sql_yacc.yy"
+#line 6377 "sql_yacc.yy"
{}
break;
case 1160:
-#line 6380 "sql_yacc.yy"
+#line 6382 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
sel->select_limit= (yyvsp[(1) - (1)].item);
@@ -22284,7 +22286,7 @@
break;
case 1161:
-#line 6387 "sql_yacc.yy"
+#line 6389 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
sel->select_limit= (yyvsp[(3) - (3)].item);
@@ -22294,7 +22296,7 @@
break;
case 1162:
-#line 6394 "sql_yacc.yy"
+#line 6396 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
sel->select_limit= (yyvsp[(1) - (3)].item);
@@ -22304,29 +22306,29 @@
break;
case 1163:
-#line 6403 "sql_yacc.yy"
+#line 6405 "sql_yacc.yy"
{
((Item_param *) (yyvsp[(1) - (1)].item))->set_strict_type(INT_RESULT);
}
break;
case 1164:
-#line 6406 "sql_yacc.yy"
+#line 6408 "sql_yacc.yy"
{ (yyval.item)= new Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); }
break;
case 1165:
-#line 6407 "sql_yacc.yy"
+#line 6409 "sql_yacc.yy"
{ (yyval.item)= new Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); }
break;
case 1166:
-#line 6408 "sql_yacc.yy"
+#line 6410 "sql_yacc.yy"
{ (yyval.item)= new Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); }
break;
case 1167:
-#line 6413 "sql_yacc.yy"
+#line 6415 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->current_select->select_limit= 0;
@@ -22334,7 +22336,7 @@
break;
case 1168:
-#line 6418 "sql_yacc.yy"
+#line 6420 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
sel->select_limit= (yyvsp[(2) - (2)].item);
@@ -22343,62 +22345,62 @@
break;
case 1169:
-#line 6425 "sql_yacc.yy"
+#line 6427 "sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
case 1170:
-#line 6426 "sql_yacc.yy"
+#line 6428 "sql_yacc.yy"
{ (yyval.ulong_num)= (ulong) strtol((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); }
break;
case 1171:
-#line 6427 "sql_yacc.yy"
+#line 6429 "sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
case 1172:
-#line 6428 "sql_yacc.yy"
+#line 6430 "sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
case 1173:
-#line 6429 "sql_yacc.yy"
+#line 6431 "sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
case 1174:
-#line 6430 "sql_yacc.yy"
+#line 6432 "sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
case 1175:
-#line 6434 "sql_yacc.yy"
+#line 6436 "sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
case 1176:
-#line 6435 "sql_yacc.yy"
+#line 6437 "sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
case 1177:
-#line 6436 "sql_yacc.yy"
+#line 6438 "sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
case 1178:
-#line 6437 "sql_yacc.yy"
+#line 6439 "sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
case 1179:
-#line 6438 "sql_yacc.yy"
+#line 6440 "sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
case 1181:
-#line 6444 "sql_yacc.yy"
+#line 6446 "sql_yacc.yy"
{
LEX *lex=Lex;
@@ -22426,17 +22428,17 @@
break;
case 1183:
-#line 6472 "sql_yacc.yy"
+#line 6474 "sql_yacc.yy"
{}
break;
case 1184:
-#line 6473 "sql_yacc.yy"
+#line 6475 "sql_yacc.yy"
{}
break;
case 1187:
-#line 6481 "sql_yacc.yy"
+#line 6483 "sql_yacc.yy"
{
THD *thd= YYTHD;
Lex_input_stream *lip= thd->m_lip;
@@ -22450,7 +22452,7 @@
break;
case 1188:
-#line 6495 "sql_yacc.yy"
+#line 6497 "sql_yacc.yy"
{
LEX *lex=Lex;
if (!lex->describe && (!(lex->result= new select_dumpvar())))
@@ -22459,17 +22461,17 @@
break;
case 1189:
-#line 6501 "sql_yacc.yy"
+#line 6503 "sql_yacc.yy"
{}
break;
case 1191:
-#line 6506 "sql_yacc.yy"
+#line 6508 "sql_yacc.yy"
{}
break;
case 1192:
-#line 6511 "sql_yacc.yy"
+#line 6513 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->result)
@@ -22484,7 +22486,7 @@
break;
case 1193:
-#line 6523 "sql_yacc.yy"
+#line 6525 "sql_yacc.yy"
{
LEX *lex=Lex;
sp_variable_t *t;
@@ -22516,7 +22518,7 @@
break;
case 1194:
-#line 6555 "sql_yacc.yy"
+#line 6557 "sql_yacc.yy"
{
if (! Lex->parsing_options.allows_select_into)
{
@@ -22527,7 +22529,7 @@
break;
case 1196:
-#line 6567 "sql_yacc.yy"
+#line 6569 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
@@ -22538,7 +22540,7 @@
break;
case 1198:
-#line 6576 "sql_yacc.yy"
+#line 6578 "sql_yacc.yy"
{
LEX *lex=Lex;
if (!lex->describe)
@@ -22553,14 +22555,14 @@
break;
case 1199:
-#line 6588 "sql_yacc.yy"
+#line 6590 "sql_yacc.yy"
{
Lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
}
break;
case 1200:
-#line 6598 "sql_yacc.yy"
+#line 6600 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_DO;
@@ -22569,14 +22571,14 @@
break;
case 1201:
-#line 6604 "sql_yacc.yy"
+#line 6606 "sql_yacc.yy"
{
Lex->insert_list= (yyvsp[(3) - (3)].item_list);
}
break;
case 1202:
-#line 6615 "sql_yacc.yy"
+#line 6617 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_DROP_TABLE;
@@ -22586,12 +22588,12 @@
break;
case 1203:
-#line 6621 "sql_yacc.yy"
+#line 6623 "sql_yacc.yy"
{}
break;
case 1204:
-#line 6622 "sql_yacc.yy"
+#line 6624 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_DROP_INDEX;
@@ -22606,7 +22608,7 @@
break;
case 1205:
-#line 6634 "sql_yacc.yy"
+#line 6636 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_DROP_DB;
@@ -22616,7 +22618,7 @@
break;
case 1206:
-#line 6641 "sql_yacc.yy"
+#line 6643 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->sphead)
@@ -22631,7 +22633,7 @@
break;
case 1207:
-#line 6653 "sql_yacc.yy"
+#line 6655 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->sphead)
@@ -22646,14 +22648,14 @@
break;
case 1208:
-#line 6665 "sql_yacc.yy"
+#line 6667 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_DROP_USER;
}
break;
case 1209:
-#line 6669 "sql_yacc.yy"
+#line 6671 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_DROP_VIEW;
@@ -22662,7 +22664,7 @@
break;
case 1210:
-#line 6675 "sql_yacc.yy"
+#line 6677 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_DROP_TRIGGER;
@@ -22672,7 +22674,7 @@
break;
case 1213:
-#line 6689 "sql_yacc.yy"
+#line 6691 "sql_yacc.yy"
{
if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (1)].table), NULL, TL_OPTION_UPDATING))
MYSQL_YYABORT;
@@ -22680,7 +22682,7 @@
break;
case 1216:
-#line 6701 "sql_yacc.yy"
+#line 6703 "sql_yacc.yy"
{
if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (1)].table), NULL,
TL_OPTION_UPDATING | TL_OPTION_ALIAS,
@@ -22690,27 +22692,27 @@
break;
case 1217:
-#line 6710 "sql_yacc.yy"
+#line 6712 "sql_yacc.yy"
{ (yyval.num)= 0; }
break;
case 1218:
-#line 6711 "sql_yacc.yy"
+#line 6713 "sql_yacc.yy"
{ (yyval.num)= 1; }
break;
case 1219:
-#line 6715 "sql_yacc.yy"
+#line 6717 "sql_yacc.yy"
{ (yyval.num)= 0; }
break;
case 1220:
-#line 6716 "sql_yacc.yy"
+#line 6718 "sql_yacc.yy"
{ (yyval.num)= 1; }
break;
case 1221:
-#line 6724 "sql_yacc.yy"
+#line 6726 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_INSERT;
@@ -22722,7 +22724,7 @@
break;
case 1222:
-#line 6733 "sql_yacc.yy"
+#line 6735 "sql_yacc.yy"
{
Select->set_lock_for_tables((yyvsp[(3) - (5)].lock_type));
Lex->current_select= &Lex->select_lex;
@@ -22730,12 +22732,12 @@
break;
case 1223:
-#line 6738 "sql_yacc.yy"
+#line 6740 "sql_yacc.yy"
{}
break;
case 1224:
-#line 6743 "sql_yacc.yy"
+#line 6745 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_REPLACE;
@@ -22745,7 +22747,7 @@
break;
case 1225:
-#line 6750 "sql_yacc.yy"
+#line 6752 "sql_yacc.yy"
{
Select->set_lock_for_tables((yyvsp[(3) - (4)].lock_type));
Lex->current_select= &Lex->select_lex;
@@ -22753,12 +22755,12 @@
break;
case 1226:
-#line 6755 "sql_yacc.yy"
+#line 6757 "sql_yacc.yy"
{}
break;
case 1227:
-#line 6760 "sql_yacc.yy"
+#line 6762 "sql_yacc.yy"
{
#ifdef HAVE_QUERY_CACHE
/*
@@ -22774,42 +22776,42 @@
break;
case 1228:
-#line 6772 "sql_yacc.yy"
+#line 6774 "sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
break;
case 1229:
-#line 6773 "sql_yacc.yy"
+#line 6775 "sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_DELAYED; }
break;
case 1230:
-#line 6774 "sql_yacc.yy"
+#line 6776 "sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE; }
break;
case 1231:
-#line 6778 "sql_yacc.yy"
+#line 6780 "sql_yacc.yy"
{ (yyval.lock_type)= (yyvsp[(1) - (1)].lock_type); }
break;
case 1232:
-#line 6779 "sql_yacc.yy"
+#line 6781 "sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_DELAYED; }
break;
case 1233:
-#line 6782 "sql_yacc.yy"
+#line 6784 "sql_yacc.yy"
{}
break;
case 1234:
-#line 6783 "sql_yacc.yy"
+#line 6785 "sql_yacc.yy"
{}
break;
case 1235:
-#line 6787 "sql_yacc.yy"
+#line 6789 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->field_list.empty();
@@ -22819,22 +22821,22 @@
break;
case 1236:
-#line 6795 "sql_yacc.yy"
+#line 6797 "sql_yacc.yy"
{}
break;
case 1237:
-#line 6796 "sql_yacc.yy"
+#line 6798 "sql_yacc.yy"
{}
break;
case 1238:
-#line 6797 "sql_yacc.yy"
+#line 6799 "sql_yacc.yy"
{}
break;
case 1239:
-#line 6799 "sql_yacc.yy"
+#line 6801 "sql_yacc.yy"
{
LEX *lex=Lex;
if (!(lex->insert_list = new List_item) ||
@@ -22844,47 +22846,47 @@
break;
case 1241:
-#line 6808 "sql_yacc.yy"
+#line 6810 "sql_yacc.yy"
{ Lex->field_list.push_back((yyvsp[(3) - (3)].item)); }
break;
case 1242:
-#line 6809 "sql_yacc.yy"
+#line 6811 "sql_yacc.yy"
{ Lex->field_list.push_back((yyvsp[(1) - (1)].item)); }
break;
case 1243:
-#line 6812 "sql_yacc.yy"
+#line 6814 "sql_yacc.yy"
{}
break;
case 1244:
-#line 6813 "sql_yacc.yy"
+#line 6815 "sql_yacc.yy"
{}
break;
case 1245:
-#line 6814 "sql_yacc.yy"
+#line 6816 "sql_yacc.yy"
{ Select->set_braces(0);}
break;
case 1246:
-#line 6814 "sql_yacc.yy"
+#line 6816 "sql_yacc.yy"
{}
break;
case 1247:
-#line 6815 "sql_yacc.yy"
+#line 6817 "sql_yacc.yy"
{ Select->set_braces(1);}
break;
case 1248:
-#line 6815 "sql_yacc.yy"
+#line 6817 "sql_yacc.yy"
{}
break;
case 1253:
-#line 6829 "sql_yacc.yy"
+#line 6831 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->field_list.push_back((yyvsp[(1) - (3)].item)) ||
@@ -22894,27 +22896,27 @@
break;
case 1254:
-#line 6836 "sql_yacc.yy"
+#line 6838 "sql_yacc.yy"
{}
break;
case 1255:
-#line 6837 "sql_yacc.yy"
+#line 6839 "sql_yacc.yy"
{}
break;
case 1256:
-#line 6841 "sql_yacc.yy"
+#line 6843 "sql_yacc.yy"
{}
break;
case 1257:
-#line 6842 "sql_yacc.yy"
+#line 6844 "sql_yacc.yy"
{}
break;
case 1258:
-#line 6847 "sql_yacc.yy"
+#line 6849 "sql_yacc.yy"
{
if (!(Lex->insert_list = new List_item))
MYSQL_YYABORT;
@@ -22922,7 +22924,7 @@
break;
case 1259:
-#line 6852 "sql_yacc.yy"
+#line 6854 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->many_values.push_back(lex->insert_list))
@@ -22931,12 +22933,12 @@
break;
case 1260:
-#line 6859 "sql_yacc.yy"
+#line 6861 "sql_yacc.yy"
{}
break;
case 1262:
-#line 6864 "sql_yacc.yy"
+#line 6866 "sql_yacc.yy"
{
if (Lex->insert_list->push_back((yyvsp[(3) - (3)].item)))
MYSQL_YYABORT;
@@ -22944,7 +22946,7 @@
break;
case 1263:
-#line 6869 "sql_yacc.yy"
+#line 6871 "sql_yacc.yy"
{
if (Lex->insert_list->push_back((yyvsp[(1) - (1)].item)))
MYSQL_YYABORT;
@@ -22952,22 +22954,22 @@
break;
case 1264:
-#line 6876 "sql_yacc.yy"
+#line 6878 "sql_yacc.yy"
{ (yyval.item)= (yyvsp[(1) - (1)].item);}
break;
case 1265:
-#line 6877 "sql_yacc.yy"
+#line 6879 "sql_yacc.yy"
{(yyval.item)= new Item_default_value(Lex->current_context()); }
break;
case 1267:
-#line 6882 "sql_yacc.yy"
+#line 6884 "sql_yacc.yy"
{ Lex->duplicates= DUP_UPDATE; }
break;
case 1269:
-#line 6890 "sql_yacc.yy"
+#line 6892 "sql_yacc.yy"
{
LEX *lex= Lex;
mysql_init_select(lex);
@@ -22978,7 +22980,7 @@
break;
case 1270:
-#line 6899 "sql_yacc.yy"
+#line 6901 "sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->select_lex.table_list.elements > 1)
@@ -23000,12 +23002,12 @@
break;
case 1271:
-#line 6917 "sql_yacc.yy"
+#line 6919 "sql_yacc.yy"
{}
break;
case 1274:
-#line 6926 "sql_yacc.yy"
+#line 6928 "sql_yacc.yy"
{
if (add_item_to_list(YYTHD, (yyvsp[(1) - (3)].item)) || add_value_to_list(YYTHD, (yyvsp[(3) - (3)].item)))
MYSQL_YYABORT;
@@ -23013,7 +23015,7 @@
break;
case 1277:
-#line 6937 "sql_yacc.yy"
+#line 6939 "sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->update_list.push_back((yyvsp[(1) - (3)].item)) ||
@@ -23023,17 +23025,17 @@
break;
case 1278:
-#line 6945 "sql_yacc.yy"
+#line 6947 "sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_DEFAULT; }
break;
case 1279:
-#line 6946 "sql_yacc.yy"
+#line 6948 "sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
break;
case 1280:
-#line 6952 "sql_yacc.yy"
+#line 6954 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_DELETE;
@@ -23045,12 +23047,12 @@
break;
case 1281:
-#line 6960 "sql_yacc.yy"
+#line 6962 "sql_yacc.yy"
{}
break;
case 1282:
-#line 6965 "sql_yacc.yy"
+#line 6967 "sql_yacc.yy"
{
if (!Select->add_table_to_list(YYTHD, (yyvsp[(2) - (2)].table), NULL, TL_OPTION_UPDATING,
Lex->lock_option))
@@ -23059,17 +23061,17 @@
break;
case 1283:
-#line 6971 "sql_yacc.yy"
+#line 6973 "sql_yacc.yy"
{}
break;
case 1284:
-#line 6973 "sql_yacc.yy"
+#line 6975 "sql_yacc.yy"
{ mysql_init_multi_delete(Lex); }
break;
case 1285:
-#line 6975 "sql_yacc.yy"
+#line 6977 "sql_yacc.yy"
{
if (multi_delete_set_locks_and_link_aux_tables(Lex))
MYSQL_YYABORT;
@@ -23077,12 +23079,12 @@
break;
case 1286:
-#line 6980 "sql_yacc.yy"
+#line 6982 "sql_yacc.yy"
{ mysql_init_multi_delete(Lex); }
break;
case 1287:
-#line 6982 "sql_yacc.yy"
+#line 6984 "sql_yacc.yy"
{
if (multi_delete_set_locks_and_link_aux_tables(Lex))
MYSQL_YYABORT;
@@ -23090,17 +23092,17 @@
break;
case 1288:
-#line 6989 "sql_yacc.yy"
+#line 6991 "sql_yacc.yy"
{}
break;
case 1289:
-#line 6990 "sql_yacc.yy"
+#line 6992 "sql_yacc.yy"
{}
break;
case 1290:
-#line 6994 "sql_yacc.yy"
+#line 6996 "sql_yacc.yy"
{
if (!Select->add_table_to_list(YYTHD, new Table_ident((yyvsp[(1) - (3)].lex_str)), (yyvsp[(3) - (3)].lex_str_ptr),
TL_OPTION_UPDATING |
@@ -23110,7 +23112,7 @@
break;
case 1291:
-#line 7001 "sql_yacc.yy"
+#line 7003 "sql_yacc.yy"
{
if (!Select->add_table_to_list(YYTHD,
new Table_ident(YYTHD, (yyvsp[(1) - (5)].lex_str), (yyvsp[(3) - (5)].lex_str), 0),
@@ -23123,42 +23125,42 @@
break;
case 1292:
-#line 7013 "sql_yacc.yy"
+#line 7015 "sql_yacc.yy"
{}
break;
case 1293:
-#line 7014 "sql_yacc.yy"
+#line 7016 "sql_yacc.yy"
{}
break;
case 1294:
-#line 7018 "sql_yacc.yy"
+#line 7020 "sql_yacc.yy"
{}
break;
case 1295:
-#line 7019 "sql_yacc.yy"
+#line 7021 "sql_yacc.yy"
{}
break;
case 1296:
-#line 7022 "sql_yacc.yy"
+#line 7024 "sql_yacc.yy"
{ Select->options|= OPTION_QUICK; }
break;
case 1297:
-#line 7023 "sql_yacc.yy"
+#line 7025 "sql_yacc.yy"
{ Lex->lock_option= TL_WRITE_LOW_PRIORITY; }
break;
case 1298:
-#line 7024 "sql_yacc.yy"
+#line 7026 "sql_yacc.yy"
{ Lex->ignore= 1; }
break;
case 1299:
-#line 7028 "sql_yacc.yy"
+#line 7030 "sql_yacc.yy"
{
LEX* lex= Lex;
lex->sql_command= SQLCOM_TRUNCATE;
@@ -23169,84 +23171,84 @@
break;
case 1306:
-#line 7051 "sql_yacc.yy"
+#line 7053 "sql_yacc.yy"
{
Lex->profile_options|= PROFILE_CPU;
}
break;
case 1307:
-#line 7055 "sql_yacc.yy"
+#line 7057 "sql_yacc.yy"
{
Lex->profile_options|= PROFILE_MEMORY;
}
break;
case 1308:
-#line 7059 "sql_yacc.yy"
+#line 7061 "sql_yacc.yy"
{
Lex->profile_options|= PROFILE_BLOCK_IO;
}
break;
case 1309:
-#line 7063 "sql_yacc.yy"
+#line 7065 "sql_yacc.yy"
{
Lex->profile_options|= PROFILE_CONTEXT;
}
break;
case 1310:
-#line 7067 "sql_yacc.yy"
+#line 7069 "sql_yacc.yy"
{
Lex->profile_options|= PROFILE_PAGE_FAULTS;
}
break;
case 1311:
-#line 7071 "sql_yacc.yy"
+#line 7073 "sql_yacc.yy"
{
Lex->profile_options|= PROFILE_IPC;
}
break;
case 1312:
-#line 7075 "sql_yacc.yy"
+#line 7077 "sql_yacc.yy"
{
Lex->profile_options|= PROFILE_SWAPS;
}
break;
case 1313:
-#line 7079 "sql_yacc.yy"
+#line 7081 "sql_yacc.yy"
{
Lex->profile_options|= PROFILE_SOURCE;
}
break;
case 1314:
-#line 7083 "sql_yacc.yy"
+#line 7085 "sql_yacc.yy"
{
Lex->profile_options|= PROFILE_ALL;
}
break;
case 1315:
-#line 7090 "sql_yacc.yy"
+#line 7092 "sql_yacc.yy"
{
Lex->profile_query_id= 0;
}
break;
case 1316:
-#line 7094 "sql_yacc.yy"
+#line 7096 "sql_yacc.yy"
{
Lex->profile_query_id= atoi((yyvsp[(3) - (3)].lex_str).str);
}
break;
case 1317:
-#line 7102 "sql_yacc.yy"
+#line 7104 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->wild=0;
@@ -23258,12 +23260,12 @@
break;
case 1318:
-#line 7111 "sql_yacc.yy"
+#line 7113 "sql_yacc.yy"
{}
break;
case 1319:
-#line 7116 "sql_yacc.yy"
+#line 7118 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23274,7 +23276,7 @@
break;
case 1320:
-#line 7124 "sql_yacc.yy"
+#line 7126 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23286,7 +23288,7 @@
break;
case 1321:
-#line 7133 "sql_yacc.yy"
+#line 7135 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23298,7 +23300,7 @@
break;
case 1322:
-#line 7142 "sql_yacc.yy"
+#line 7144 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23310,7 +23312,7 @@
break;
case 1323:
-#line 7151 "sql_yacc.yy"
+#line 7153 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23322,12 +23324,12 @@
break;
case 1324:
-#line 7160 "sql_yacc.yy"
+#line 7162 "sql_yacc.yy"
{ Lex->create_info.db_type= (yyvsp[(2) - (2)].db_type); }
break;
case 1326:
-#line 7163 "sql_yacc.yy"
+#line 7165 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23340,7 +23342,7 @@
break;
case 1327:
-#line 7176 "sql_yacc.yy"
+#line 7178 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_SHOW_NEW_MASTER;
Lex->mi.log_file_name = (yyvsp[(8) - (16)].lex_str).str;
@@ -23350,21 +23352,21 @@
break;
case 1328:
-#line 7183 "sql_yacc.yy"
+#line 7185 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_SHOW_BINLOGS;
}
break;
case 1329:
-#line 7187 "sql_yacc.yy"
+#line 7189 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_SHOW_SLAVE_HOSTS;
}
break;
case 1330:
-#line 7191 "sql_yacc.yy"
+#line 7193 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_BINLOG_EVENTS;
@@ -23372,7 +23374,7 @@
break;
case 1332:
-#line 7196 "sql_yacc.yy"
+#line 7198 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23385,7 +23387,7 @@
break;
case 1333:
-#line 7206 "sql_yacc.yy"
+#line 7208 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_COLUMN_TYPES;
@@ -23393,7 +23395,7 @@
break;
case 1334:
-#line 7211 "sql_yacc.yy"
+#line 7213 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
@@ -23402,7 +23404,7 @@
break;
case 1335:
-#line 7217 "sql_yacc.yy"
+#line 7219 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
@@ -23410,7 +23412,7 @@
break;
case 1336:
-#line 7222 "sql_yacc.yy"
+#line 7224 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_PRIVILEGES;
@@ -23418,32 +23420,32 @@
break;
case 1337:
-#line 7227 "sql_yacc.yy"
+#line 7229 "sql_yacc.yy"
{ (void) create_select_for_variable("warning_count"); }
break;
case 1338:
-#line 7229 "sql_yacc.yy"
+#line 7231 "sql_yacc.yy"
{ (void) create_select_for_variable("error_count"); }
break;
case 1339:
-#line 7231 "sql_yacc.yy"
+#line 7233 "sql_yacc.yy"
{ Lex->sql_command = SQLCOM_SHOW_WARNS;}
break;
case 1340:
-#line 7233 "sql_yacc.yy"
+#line 7235 "sql_yacc.yy"
{ Lex->sql_command = SQLCOM_SHOW_ERRORS;}
break;
case 1341:
-#line 7235 "sql_yacc.yy"
+#line 7237 "sql_yacc.yy"
{ Lex->sql_command = SQLCOM_SHOW_PROFILES; }
break;
case 1342:
-#line 7237 "sql_yacc.yy"
+#line 7239 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23454,7 +23456,7 @@
break;
case 1343:
-#line 7245 "sql_yacc.yy"
+#line 7247 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23466,22 +23468,22 @@
break;
case 1344:
-#line 7254 "sql_yacc.yy"
+#line 7256 "sql_yacc.yy"
{ Lex->sql_command = SQLCOM_SHOW_INNODB_STATUS; WARN_DEPRECATED("SHOW INNODB STATUS", "SHOW ENGINE INNODB STATUS"); }
break;
case 1345:
-#line 7256 "sql_yacc.yy"
+#line 7258 "sql_yacc.yy"
{ Lex->sql_command = SQLCOM_SHOW_MUTEX_STATUS; }
break;
case 1346:
-#line 7258 "sql_yacc.yy"
+#line 7260 "sql_yacc.yy"
{ Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;}
break;
case 1347:
-#line 7260 "sql_yacc.yy"
+#line 7262 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23493,7 +23495,7 @@
break;
case 1348:
-#line 7269 "sql_yacc.yy"
+#line 7271 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23504,7 +23506,7 @@
break;
case 1349:
-#line 7277 "sql_yacc.yy"
+#line 7279 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23515,17 +23517,17 @@
break;
case 1350:
-#line 7285 "sql_yacc.yy"
+#line 7287 "sql_yacc.yy"
{ Lex->sql_command= SQLCOM_SHOW_LOGS; WARN_DEPRECATED("SHOW BDB LOGS", "SHOW ENGINE BDB LOGS"); }
break;
case 1351:
-#line 7287 "sql_yacc.yy"
+#line 7289 "sql_yacc.yy"
{ Lex->sql_command= SQLCOM_SHOW_LOGS; WARN_DEPRECATED("SHOW LOGS", "SHOW ENGINE BDB LOGS"); }
break;
case 1352:
-#line 7289 "sql_yacc.yy"
+#line 7291 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_GRANTS;
@@ -23538,7 +23540,7 @@
break;
case 1353:
-#line 7299 "sql_yacc.yy"
+#line 7301 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_GRANTS;
@@ -23548,7 +23550,7 @@
break;
case 1354:
-#line 7306 "sql_yacc.yy"
+#line 7308 "sql_yacc.yy"
{
Lex->sql_command=SQLCOM_SHOW_CREATE_DB;
Lex->create_info.options=(yyvsp[(3) - (4)].num);
@@ -23557,7 +23559,7 @@
break;
case 1355:
-#line 7312 "sql_yacc.yy"
+#line 7314 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -23568,7 +23570,7 @@
break;
case 1356:
-#line 7320 "sql_yacc.yy"
+#line 7322 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -23579,21 +23581,21 @@
break;
case 1357:
-#line 7328 "sql_yacc.yy"
+#line 7330 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_SHOW_MASTER_STAT;
}
break;
case 1358:
-#line 7332 "sql_yacc.yy"
+#line 7334 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
}
break;
case 1359:
-#line 7336 "sql_yacc.yy"
+#line 7338 "sql_yacc.yy"
{
LEX *lex= Lex;
@@ -23603,7 +23605,7 @@
break;
case 1360:
-#line 7343 "sql_yacc.yy"
+#line 7345 "sql_yacc.yy"
{
LEX *lex= Lex;
@@ -23613,7 +23615,7 @@
break;
case 1361:
-#line 7350 "sql_yacc.yy"
+#line 7352 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23626,7 +23628,7 @@
break;
case 1362:
-#line 7360 "sql_yacc.yy"
+#line 7362 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
@@ -23639,7 +23641,7 @@
break;
case 1363:
-#line 7370 "sql_yacc.yy"
+#line 7372 "sql_yacc.yy"
{
#ifdef DBUG_OFF
my_parse_error(ER(ER_SYNTAX_ERROR));
@@ -23652,7 +23654,7 @@
break;
case 1364:
-#line 7380 "sql_yacc.yy"
+#line 7382 "sql_yacc.yy"
{
#ifdef DBUG_OFF
my_parse_error(ER(ER_SYNTAX_ERROR));
@@ -23666,7 +23668,7 @@
break;
case 1365:
-#line 7391 "sql_yacc.yy"
+#line 7393 "sql_yacc.yy"
{
Lex->sql_command= SQLCOM_SHOW_SENNA_STATUS;
Lex->select_lex.db = (yyvsp[(3) - (4)].simple_string);
@@ -23675,7 +23677,7 @@
break;
case 1366:
-#line 7400 "sql_yacc.yy"
+#line 7402 "sql_yacc.yy"
{
switch (Lex->create_info.db_type) {
case DB_TYPE_NDBCLUSTER:
@@ -23692,7 +23694,7 @@
break;
case 1367:
-#line 7414 "sql_yacc.yy"
+#line 7416 "sql_yacc.yy"
{
switch (Lex->create_info.db_type) {
case DB_TYPE_BERKELEY_DB:
@@ -23706,53 +23708,53 @@
break;
case 1372:
-#line 7434 "sql_yacc.yy"
+#line 7436 "sql_yacc.yy"
{ (yyval.simple_string)= 0; }
break;
case 1373:
-#line 7435 "sql_yacc.yy"
+#line 7437 "sql_yacc.yy"
{ (yyval.simple_string)= (yyvsp[(2) - (2)].lex_str).str; }
break;
case 1374:
-#line 7438 "sql_yacc.yy"
+#line 7440 "sql_yacc.yy"
{ Lex->verbose=0; }
break;
case 1375:
-#line 7439 "sql_yacc.yy"
+#line 7441 "sql_yacc.yy"
{ Lex->verbose=1; }
break;
case 1378:
-#line 7446 "sql_yacc.yy"
+#line 7448 "sql_yacc.yy"
{ Lex->mi.log_file_name = 0; }
break;
case 1379:
-#line 7447 "sql_yacc.yy"
+#line 7449 "sql_yacc.yy"
{ Lex->mi.log_file_name = (yyvsp[(2) - (2)].lex_str).str; }
break;
case 1380:
-#line 7450 "sql_yacc.yy"
+#line 7452 "sql_yacc.yy"
{ Lex->mi.pos = 4; /* skip magic number */ }
break;
case 1381:
-#line 7451 "sql_yacc.yy"
+#line 7453 "sql_yacc.yy"
{ Lex->mi.pos = (yyvsp[(2) - (2)].ulonglong_number); }
break;
case 1383:
-#line 7456 "sql_yacc.yy"
+#line 7458 "sql_yacc.yy"
{ Lex->wild= new (YYTHD->mem_root) String((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length,
system_charset_info); }
break;
case 1384:
-#line 7459 "sql_yacc.yy"
+#line 7461 "sql_yacc.yy"
{
Select->where= (yyvsp[(2) - (2)].item);
if ((yyvsp[(2) - (2)].item))
@@ -23761,7 +23763,7 @@
break;
case 1385:
-#line 7470 "sql_yacc.yy"
+#line 7472 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->lock_option= TL_READ;
@@ -23777,17 +23779,17 @@
break;
case 1386:
-#line 7482 "sql_yacc.yy"
+#line 7484 "sql_yacc.yy"
{}
break;
case 1387:
-#line 7484 "sql_yacc.yy"
+#line 7486 "sql_yacc.yy"
{ Lex->describe|= DESCRIBE_NORMAL; }
break;
case 1388:
-#line 7486 "sql_yacc.yy"
+#line 7488 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->select_lex.options|= SELECT_DESCRIBE;
@@ -23795,32 +23797,32 @@
break;
case 1391:
-#line 7497 "sql_yacc.yy"
+#line 7499 "sql_yacc.yy"
{}
break;
case 1392:
-#line 7498 "sql_yacc.yy"
+#line 7500 "sql_yacc.yy"
{ Lex->describe|= DESCRIBE_EXTENDED; }
break;
case 1393:
-#line 7502 "sql_yacc.yy"
+#line 7504 "sql_yacc.yy"
{}
break;
case 1394:
-#line 7503 "sql_yacc.yy"
+#line 7505 "sql_yacc.yy"
{ Lex->wild= (yyvsp[(1) - (1)].string); }
break;
case 1395:
-#line 7505 "sql_yacc.yy"
+#line 7507 "sql_yacc.yy"
{ Lex->wild= new (YYTHD->mem_root) String((const char*) (yyvsp[(1) - (1)].lex_str).str,(yyvsp[(1) - (1)].lex_str).length,system_charset_info); }
break;
case 1396:
-#line 7512 "sql_yacc.yy"
+#line 7514 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_FLUSH;
@@ -23830,82 +23832,82 @@
break;
case 1397:
-#line 7519 "sql_yacc.yy"
+#line 7521 "sql_yacc.yy"
{}
break;
case 1400:
-#line 7527 "sql_yacc.yy"
+#line 7529 "sql_yacc.yy"
{ Lex->type|= REFRESH_TABLES; }
break;
case 1401:
-#line 7527 "sql_yacc.yy"
+#line 7529 "sql_yacc.yy"
{}
break;
case 1402:
-#line 7528 "sql_yacc.yy"
+#line 7530 "sql_yacc.yy"
{ Lex->type|= REFRESH_TABLES | REFRESH_READ_LOCK; }
break;
case 1403:
-#line 7529 "sql_yacc.yy"
+#line 7531 "sql_yacc.yy"
{ Lex->type|= REFRESH_QUERY_CACHE_FREE; }
break;
case 1404:
-#line 7530 "sql_yacc.yy"
+#line 7532 "sql_yacc.yy"
{ Lex->type|= REFRESH_HOSTS; }
break;
case 1405:
-#line 7531 "sql_yacc.yy"
+#line 7533 "sql_yacc.yy"
{ Lex->type|= REFRESH_GRANT; }
break;
case 1406:
-#line 7532 "sql_yacc.yy"
+#line 7534 "sql_yacc.yy"
{ Lex->type|= REFRESH_LOG; }
break;
case 1407:
-#line 7533 "sql_yacc.yy"
+#line 7535 "sql_yacc.yy"
{ Lex->type|= REFRESH_STATUS; }
break;
case 1408:
-#line 7534 "sql_yacc.yy"
+#line 7536 "sql_yacc.yy"
{ Lex->type|= REFRESH_SLAVE; }
break;
case 1409:
-#line 7535 "sql_yacc.yy"
+#line 7537 "sql_yacc.yy"
{ Lex->type|= REFRESH_MASTER; }
break;
case 1410:
-#line 7536 "sql_yacc.yy"
+#line 7538 "sql_yacc.yy"
{ Lex->type|= REFRESH_DES_KEY_FILE; }
break;
case 1411:
-#line 7537 "sql_yacc.yy"
+#line 7539 "sql_yacc.yy"
{ Lex->type|= REFRESH_USER_RESOURCES; }
break;
case 1412:
-#line 7540 "sql_yacc.yy"
+#line 7542 "sql_yacc.yy"
{;}
break;
case 1413:
-#line 7541 "sql_yacc.yy"
+#line 7543 "sql_yacc.yy"
{;}
break;
case 1414:
-#line 7545 "sql_yacc.yy"
+#line 7547 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_RESET; lex->type=0;
@@ -23913,27 +23915,27 @@
break;
case 1415:
-#line 7549 "sql_yacc.yy"
+#line 7551 "sql_yacc.yy"
{}
break;
case 1418:
-#line 7557 "sql_yacc.yy"
+#line 7559 "sql_yacc.yy"
{ Lex->type|= REFRESH_SLAVE; }
break;
case 1419:
-#line 7558 "sql_yacc.yy"
+#line 7560 "sql_yacc.yy"
{ Lex->type|= REFRESH_MASTER; }
break;
case 1420:
-#line 7559 "sql_yacc.yy"
+#line 7561 "sql_yacc.yy"
{ Lex->type|= REFRESH_QUERY_CACHE;}
break;
case 1421:
-#line 7563 "sql_yacc.yy"
+#line 7565 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->type=0;
@@ -23942,19 +23944,19 @@
break;
case 1422:
-#line 7568 "sql_yacc.yy"
+#line 7570 "sql_yacc.yy"
{}
break;
case 1424:
-#line 7577 "sql_yacc.yy"
+#line 7579 "sql_yacc.yy"
{
Lex->to_log = (yyvsp[(2) - (2)].lex_str).str;
}
break;
case 1425:
-#line 7581 "sql_yacc.yy"
+#line 7583 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->value_list.empty();
@@ -23964,12 +23966,12 @@
break;
case 1426:
-#line 7592 "sql_yacc.yy"
+#line 7594 "sql_yacc.yy"
{ Lex->sql_command= SQLCOM_KILL; }
break;
case 1427:
-#line 7593 "sql_yacc.yy"
+#line 7595 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->value_list.empty();
@@ -23978,22 +23980,22 @@
break;
case 1428:
-#line 7600 "sql_yacc.yy"
+#line 7602 "sql_yacc.yy"
{ Lex->type= 0; }
break;
case 1429:
-#line 7601 "sql_yacc.yy"
+#line 7603 "sql_yacc.yy"
{ Lex->type= 0; }
break;
case 1430:
-#line 7602 "sql_yacc.yy"
+#line 7604 "sql_yacc.yy"
{ Lex->type= ONLY_KILL_QUERY; }
break;
case 1431:
-#line 7608 "sql_yacc.yy"
+#line 7610 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command=SQLCOM_CHANGE_DB;
@@ -24002,7 +24004,7 @@
break;
case 1432:
-#line 7617 "sql_yacc.yy"
+#line 7619 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -24018,12 +24020,12 @@
break;
case 1433:
-#line 7630 "sql_yacc.yy"
+#line 7632 "sql_yacc.yy"
{}
break;
case 1434:
-#line 7633 "sql_yacc.yy"
+#line 7635 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->sphead)
@@ -24041,7 +24043,7 @@
break;
case 1435:
-#line 7650 "sql_yacc.yy"
+#line 7652 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_LOAD;
@@ -24055,7 +24057,7 @@
break;
case 1436:
-#line 7661 "sql_yacc.yy"
+#line 7663 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -24065,7 +24067,7 @@
break;
case 1437:
-#line 7668 "sql_yacc.yy"
+#line 7670 "sql_yacc.yy"
{
LEX *lex=Lex;
if (!Select->add_table_to_list(YYTHD, (yyvsp[(10) - (10)].table), NULL, TL_OPTION_UPDATING,
@@ -24078,17 +24080,17 @@
break;
case 1438:
-#line 7678 "sql_yacc.yy"
+#line 7680 "sql_yacc.yy"
{ Lex->exchange->cs= (yyvsp[(12) - (12)].charset); }
break;
case 1439:
-#line 7681 "sql_yacc.yy"
+#line 7683 "sql_yacc.yy"
{}
break;
case 1440:
-#line 7684 "sql_yacc.yy"
+#line 7686 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_LOAD_MASTER_DATA;
WARN_DEPRECATED("LOAD DATA FROM MASTER",
@@ -24098,22 +24100,22 @@
break;
case 1441:
-#line 7692 "sql_yacc.yy"
+#line 7694 "sql_yacc.yy"
{ (yyval.num)=0;}
break;
case 1442:
-#line 7693 "sql_yacc.yy"
+#line 7695 "sql_yacc.yy"
{ (yyval.num)=1;}
break;
case 1443:
-#line 7696 "sql_yacc.yy"
+#line 7698 "sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_DEFAULT; }
break;
case 1444:
-#line 7698 "sql_yacc.yy"
+#line 7700 "sql_yacc.yy"
{
#ifdef HAVE_QUERY_CACHE
/*
@@ -24128,27 +24130,27 @@
break;
case 1445:
-#line 7709 "sql_yacc.yy"
+#line 7711 "sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
break;
case 1446:
-#line 7713 "sql_yacc.yy"
+#line 7715 "sql_yacc.yy"
{ Lex->duplicates=DUP_ERROR; }
break;
case 1447:
-#line 7714 "sql_yacc.yy"
+#line 7716 "sql_yacc.yy"
{ Lex->duplicates=DUP_REPLACE; }
break;
case 1448:
-#line 7715 "sql_yacc.yy"
+#line 7717 "sql_yacc.yy"
{ Lex->ignore= 1; }
break;
case 1453:
-#line 7727 "sql_yacc.yy"
+#line 7729 "sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->field_term= (yyvsp[(3) - (3)].string);
@@ -24156,7 +24158,7 @@
break;
case 1454:
-#line 7732 "sql_yacc.yy"
+#line 7734 "sql_yacc.yy"
{
LEX *lex= Lex;
DBUG_ASSERT(lex->exchange != 0);
@@ -24166,7 +24168,7 @@
break;
case 1455:
-#line 7739 "sql_yacc.yy"
+#line 7741 "sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->enclosed= (yyvsp[(3) - (3)].string);
@@ -24174,7 +24176,7 @@
break;
case 1456:
-#line 7744 "sql_yacc.yy"
+#line 7746 "sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->escaped= (yyvsp[(3) - (3)].string);
@@ -24182,7 +24184,7 @@
break;
case 1461:
-#line 7759 "sql_yacc.yy"
+#line 7761 "sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->line_term= (yyvsp[(3) - (3)].string);
@@ -24190,7 +24192,7 @@
break;
case 1462:
-#line 7764 "sql_yacc.yy"
+#line 7766 "sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->line_start= (yyvsp[(3) - (3)].string);
@@ -24198,7 +24200,7 @@
break;
case 1464:
-#line 7772 "sql_yacc.yy"
+#line 7774 "sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->skip_lines= atol((yyvsp[(2) - (3)].lex_str).str);
@@ -24206,52 +24208,52 @@
break;
case 1465:
-#line 7778 "sql_yacc.yy"
+#line 7780 "sql_yacc.yy"
{ }
break;
case 1466:
-#line 7779 "sql_yacc.yy"
+#line 7781 "sql_yacc.yy"
{ }
break;
case 1467:
-#line 7780 "sql_yacc.yy"
+#line 7782 "sql_yacc.yy"
{ }
break;
case 1468:
-#line 7784 "sql_yacc.yy"
+#line 7786 "sql_yacc.yy"
{ Lex->field_list.push_back((yyvsp[(3) - (3)].item)); }
break;
case 1469:
-#line 7786 "sql_yacc.yy"
+#line 7788 "sql_yacc.yy"
{ Lex->field_list.push_back((yyvsp[(1) - (1)].item)); }
break;
case 1470:
-#line 7790 "sql_yacc.yy"
+#line 7792 "sql_yacc.yy"
{(yyval.item)= (yyvsp[(1) - (1)].item);}
break;
case 1471:
-#line 7792 "sql_yacc.yy"
+#line 7794 "sql_yacc.yy"
{ (yyval.item)= new Item_user_var_as_out_param((yyvsp[(2) - (2)].lex_str)); }
break;
case 1472:
-#line 7796 "sql_yacc.yy"
+#line 7798 "sql_yacc.yy"
{ }
break;
case 1473:
-#line 7797 "sql_yacc.yy"
+#line 7799 "sql_yacc.yy"
{ }
break;
case 1474:
-#line 7804 "sql_yacc.yy"
+#line 7806 "sql_yacc.yy"
{
LEX_STRING tmp;
THD *thd= YYTHD;
@@ -24272,7 +24274,7 @@
break;
case 1475:
-#line 7822 "sql_yacc.yy"
+#line 7824 "sql_yacc.yy"
{
uint repertoire= Lex->text_string_is_7bit ?
MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
@@ -24283,7 +24285,7 @@
break;
case 1476:
-#line 7830 "sql_yacc.yy"
+#line 7832 "sql_yacc.yy"
{
(yyval.item)= new Item_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length, Lex->underscore_charset);
((Item_string*) (yyval.item))->set_repertoire_from_value();
@@ -24291,7 +24293,7 @@
break;
case 1477:
-#line 7835 "sql_yacc.yy"
+#line 7837 "sql_yacc.yy"
{
Item_string* item= (Item_string*) (yyvsp[(1) - (2)].item);
item->append((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
@@ -24310,12 +24312,12 @@
break;
case 1478:
-#line 7854 "sql_yacc.yy"
+#line 7856 "sql_yacc.yy"
{ (yyval.string)= new (YYTHD->mem_root) String((yyvsp[(1) - (1)].lex_str).str,(yyvsp[(1) - (1)].lex_str).length,YYTHD->variables.collation_connection); }
break;
case 1479:
-#line 7856 "sql_yacc.yy"
+#line 7858 "sql_yacc.yy"
{
Item *tmp= new Item_hex_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
/*
@@ -24329,7 +24331,7 @@
break;
case 1480:
-#line 7867 "sql_yacc.yy"
+#line 7869 "sql_yacc.yy"
{
Item *tmp= new Item_bin_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
/*
@@ -24342,7 +24344,7 @@
break;
case 1481:
-#line 7880 "sql_yacc.yy"
+#line 7882 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -24363,17 +24365,17 @@
break;
case 1482:
-#line 7900 "sql_yacc.yy"
+#line 7902 "sql_yacc.yy"
{ (yyval.item) = (yyvsp[(1) - (1)].item); }
break;
case 1483:
-#line 7901 "sql_yacc.yy"
+#line 7903 "sql_yacc.yy"
{ (yyval.item) = (yyvsp[(2) - (2)].item_num); }
break;
case 1484:
-#line 7903 "sql_yacc.yy"
+#line 7905 "sql_yacc.yy"
{
(yyvsp[(2) - (2)].item_num)->max_length++;
(yyval.item)= (yyvsp[(2) - (2)].item_num)->neg();
@@ -24381,17 +24383,17 @@
break;
case 1485:
-#line 7911 "sql_yacc.yy"
+#line 7913 "sql_yacc.yy"
{ (yyval.item) = (yyvsp[(1) - (1)].item); }
break;
case 1486:
-#line 7912 "sql_yacc.yy"
+#line 7914 "sql_yacc.yy"
{ (yyval.item) = (yyvsp[(1) - (1)].item_num); }
break;
case 1487:
-#line 7914 "sql_yacc.yy"
+#line 7916 "sql_yacc.yy"
{
(yyval.item) = new Item_null();
YYTHD->m_lip->next_state=MY_LEX_OPERATOR_OR_IDENT;
@@ -24399,27 +24401,27 @@
break;
case 1488:
-#line 7918 "sql_yacc.yy"
+#line 7920 "sql_yacc.yy"
{ (yyval.item)= new Item_int((char*) "FALSE",0,1); }
break;
case 1489:
-#line 7919 "sql_yacc.yy"
+#line 7921 "sql_yacc.yy"
{ (yyval.item)= new Item_int((char*) "TRUE",1,1); }
break;
case 1490:
-#line 7920 "sql_yacc.yy"
+#line 7922 "sql_yacc.yy"
{ (yyval.item) = new Item_hex_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);}
break;
case 1491:
-#line 7921 "sql_yacc.yy"
+#line 7923 "sql_yacc.yy"
{ (yyval.item)= new Item_bin_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); }
break;
case 1492:
-#line 7923 "sql_yacc.yy"
+#line 7925 "sql_yacc.yy"
{
Item *tmp= new Item_hex_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
/*
@@ -24438,7 +24440,7 @@
break;
case 1493:
-#line 7939 "sql_yacc.yy"
+#line 7941 "sql_yacc.yy"
{
Item *tmp= new Item_bin_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
/*
@@ -24455,37 +24457,37 @@
break;
case 1494:
-#line 7952 "sql_yacc.yy"
+#line 7954 "sql_yacc.yy"
{ (yyval.item) = (yyvsp[(2) - (2)].item); }
break;
case 1495:
-#line 7953 "sql_yacc.yy"
+#line 7955 "sql_yacc.yy"
{ (yyval.item) = (yyvsp[(2) - (2)].item); }
break;
case 1496:
-#line 7954 "sql_yacc.yy"
+#line 7956 "sql_yacc.yy"
{ (yyval.item) = (yyvsp[(2) - (2)].item); }
break;
case 1497:
-#line 7957 "sql_yacc.yy"
+#line 7959 "sql_yacc.yy"
{ int error; (yyval.item_num) = new Item_int((yyvsp[(1) - (1)].lex_str).str, (longlong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, NULL, &error), (yyvsp[(1) - (1)].lex_str).length); }
break;
case 1498:
-#line 7958 "sql_yacc.yy"
+#line 7960 "sql_yacc.yy"
{ int error; (yyval.item_num) = new Item_int((yyvsp[(1) - (1)].lex_str).str, (longlong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, NULL, &error), (yyvsp[(1) - (1)].lex_str).length); }
break;
case 1499:
-#line 7959 "sql_yacc.yy"
+#line 7961 "sql_yacc.yy"
{ (yyval.item_num) = new Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); }
break;
case 1500:
-#line 7961 "sql_yacc.yy"
+#line 7963 "sql_yacc.yy"
{
(yyval.item_num)= new Item_decimal((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length, YYTHD->charset());
if (YYTHD->net.report_error)
@@ -24496,7 +24498,7 @@
break;
case 1501:
-#line 7969 "sql_yacc.yy"
+#line 7971 "sql_yacc.yy"
{
(yyval.item_num) = new Item_float((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
if (YYTHD->net.report_error)
@@ -24507,17 +24509,17 @@
break;
case 1502:
-#line 7983 "sql_yacc.yy"
+#line 7985 "sql_yacc.yy"
{ (yyval.item)=(yyvsp[(1) - (1)].item); }
break;
case 1503:
-#line 7984 "sql_yacc.yy"
+#line 7986 "sql_yacc.yy"
{ (yyval.item)=(yyvsp[(1) - (1)].item); }
break;
case 1504:
-#line 7988 "sql_yacc.yy"
+#line 7990 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
(yyval.item) = new Item_field(Lex->current_context(), NullS, (yyvsp[(1) - (3)].lex_str).str, "*");
@@ -24526,7 +24528,7 @@
break;
case 1505:
-#line 7994 "sql_yacc.yy"
+#line 7996 "sql_yacc.yy"
{
SELECT_LEX *sel= Select;
(yyval.item) = new Item_field(Lex->current_context(), (YYTHD->client_capabilities &
@@ -24537,12 +24539,12 @@
break;
case 1506:
-#line 8004 "sql_yacc.yy"
+#line 8006 "sql_yacc.yy"
{ (yyval.item)=(yyvsp[(1) - (1)].item); }
break;
case 1507:
-#line 8008 "sql_yacc.yy"
+#line 8010 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -24582,12 +24584,12 @@
break;
case 1508:
-#line 8044 "sql_yacc.yy"
+#line 8046 "sql_yacc.yy"
{ (yyval.item)= (yyvsp[(1) - (1)].item); }
break;
case 1509:
-#line 8049 "sql_yacc.yy"
+#line 8051 "sql_yacc.yy"
{
SELECT_LEX *sel=Select;
(yyval.item)= (sel->parsing_place != IN_HAVING ||
@@ -24598,12 +24600,12 @@
break;
case 1510:
-#line 8056 "sql_yacc.yy"
+#line 8058 "sql_yacc.yy"
{ (yyval.item)= (yyvsp[(1) - (1)].item); }
break;
case 1511:
-#line 8061 "sql_yacc.yy"
+#line 8063 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -24674,7 +24676,7 @@
break;
case 1512:
-#line 8129 "sql_yacc.yy"
+#line 8131 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -24692,7 +24694,7 @@
break;
case 1513:
-#line 8144 "sql_yacc.yy"
+#line 8146 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -24716,12 +24718,12 @@
break;
case 1514:
-#line 8167 "sql_yacc.yy"
+#line 8169 "sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
break;
case 1515:
-#line 8169 "sql_yacc.yy"
+#line 8171 "sql_yacc.yy"
{
TABLE_LIST *table= (TABLE_LIST*) Select->table_list.first;
if (my_strcasecmp(table_alias_charset, (yyvsp[(1) - (5)].lex_str).str, table->db))
@@ -24740,7 +24742,7 @@
break;
case 1516:
-#line 8185 "sql_yacc.yy"
+#line 8187 "sql_yacc.yy"
{
TABLE_LIST *table= (TABLE_LIST*) Select->table_list.first;
if (my_strcasecmp(table_alias_charset, (yyvsp[(1) - (3)].lex_str).str, table->alias))
@@ -24753,37 +24755,37 @@
break;
case 1517:
-#line 8194 "sql_yacc.yy"
+#line 8196 "sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str);}
break;
case 1518:
-#line 8197 "sql_yacc.yy"
+#line 8199 "sql_yacc.yy"
{ (yyval.table)=new Table_ident((yyvsp[(1) - (1)].lex_str)); }
break;
case 1519:
-#line 8198 "sql_yacc.yy"
+#line 8200 "sql_yacc.yy"
{ (yyval.table)=new Table_ident(YYTHD, (yyvsp[(1) - (3)].lex_str),(yyvsp[(3) - (3)].lex_str),0);}
break;
case 1520:
-#line 8199 "sql_yacc.yy"
+#line 8201 "sql_yacc.yy"
{ (yyval.table)=new Table_ident((yyvsp[(2) - (2)].lex_str));}
break;
case 1521:
-#line 8203 "sql_yacc.yy"
+#line 8205 "sql_yacc.yy"
{ LEX_STRING db={(char*) any_db,3}; (yyval.table)=new Table_ident(YYTHD, db,(yyvsp[(1) - (1)].lex_str),0); }
break;
case 1522:
-#line 8207 "sql_yacc.yy"
+#line 8209 "sql_yacc.yy"
{ (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
break;
case 1523:
-#line 8209 "sql_yacc.yy"
+#line 8211 "sql_yacc.yy"
{
THD *thd= YYTHD;
if (thd->charset_is_system_charset)
@@ -24808,7 +24810,7 @@
break;
case 1524:
-#line 8234 "sql_yacc.yy"
+#line 8236 "sql_yacc.yy"
{
THD *thd= YYTHD;
if (thd->charset_is_system_charset)
@@ -24820,7 +24822,7 @@
break;
case 1525:
-#line 8246 "sql_yacc.yy"
+#line 8248 "sql_yacc.yy"
{
THD *thd= YYTHD;
if (thd->charset_is_collation_connection)
@@ -24832,7 +24834,7 @@
break;
case 1526:
-#line 8259 "sql_yacc.yy"
+#line 8261 "sql_yacc.yy"
{
THD *thd= YYTHD;
if (thd->charset_is_character_set_filesystem)
@@ -24844,12 +24846,12 @@
break;
case 1527:
-#line 8270 "sql_yacc.yy"
+#line 8272 "sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
break;
case 1528:
-#line 8272 "sql_yacc.yy"
+#line 8274 "sql_yacc.yy"
{
THD *thd= YYTHD;
(yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length);
@@ -24858,12 +24860,12 @@
break;
case 1529:
-#line 8280 "sql_yacc.yy"
+#line 8282 "sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
break;
case 1530:
-#line 8282 "sql_yacc.yy"
+#line 8284 "sql_yacc.yy"
{
THD *thd= YYTHD;
(yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length);
@@ -24872,22 +24874,22 @@
break;
case 1531:
-#line 8290 "sql_yacc.yy"
+#line 8292 "sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
break;
case 1532:
-#line 8291 "sql_yacc.yy"
+#line 8293 "sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
break;
case 1533:
-#line 8292 "sql_yacc.yy"
+#line 8294 "sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
break;
case 1534:
-#line 8296 "sql_yacc.yy"
+#line 8298 "sql_yacc.yy"
{
THD *thd= YYTHD;
if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
@@ -24903,7 +24905,7 @@
break;
case 1535:
-#line 8309 "sql_yacc.yy"
+#line 8311 "sql_yacc.yy"
{
THD *thd= YYTHD;
if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
@@ -24919,7 +24921,7 @@
break;
case 1536:
-#line 8322 "sql_yacc.yy"
+#line 8324 "sql_yacc.yy"
{
if (!((yyval.lex_user)=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user))))
MYSQL_YYABORT;
@@ -24933,1372 +24935,1372 @@
break;
case 1537:
-#line 8335 "sql_yacc.yy"
+#line 8337 "sql_yacc.yy"
{}
break;
case 1538:
-#line 8336 "sql_yacc.yy"
+#line 8338 "sql_yacc.yy"
{}
break;
case 1539:
-#line 8337 "sql_yacc.yy"
+#line 8339 "sql_yacc.yy"
{}
break;
case 1540:
-#line 8338 "sql_yacc.yy"
+#line 8340 "sql_yacc.yy"
{}
break;
case 1541:
-#line 8339 "sql_yacc.yy"
+#line 8341 "sql_yacc.yy"
{}
break;
case 1542:
-#line 8340 "sql_yacc.yy"
+#line 8342 "sql_yacc.yy"
{}
break;
case 1543:
-#line 8341 "sql_yacc.yy"
+#line 8343 "sql_yacc.yy"
{}
break;
case 1544:
-#line 8342 "sql_yacc.yy"
+#line 8344 "sql_yacc.yy"
{}
break;
case 1545:
-#line 8343 "sql_yacc.yy"
+#line 8345 "sql_yacc.yy"
{}
break;
case 1546:
-#line 8344 "sql_yacc.yy"
+#line 8346 "sql_yacc.yy"
{}
break;
case 1547:
-#line 8345 "sql_yacc.yy"
+#line 8347 "sql_yacc.yy"
{}
break;
case 1548:
-#line 8346 "sql_yacc.yy"
+#line 8348 "sql_yacc.yy"
{}
break;
case 1549:
-#line 8347 "sql_yacc.yy"
+#line 8349 "sql_yacc.yy"
{}
break;
case 1550:
-#line 8348 "sql_yacc.yy"
+#line 8350 "sql_yacc.yy"
{}
break;
case 1551:
-#line 8349 "sql_yacc.yy"
+#line 8351 "sql_yacc.yy"
{}
break;
case 1552:
-#line 8350 "sql_yacc.yy"
+#line 8352 "sql_yacc.yy"
{}
break;
case 1553:
-#line 8351 "sql_yacc.yy"
+#line 8353 "sql_yacc.yy"
{}
break;
case 1554:
-#line 8352 "sql_yacc.yy"
+#line 8354 "sql_yacc.yy"
{}
break;
case 1555:
-#line 8353 "sql_yacc.yy"
+#line 8355 "sql_yacc.yy"
{}
break;
case 1556:
-#line 8354 "sql_yacc.yy"
+#line 8356 "sql_yacc.yy"
{}
break;
case 1557:
-#line 8355 "sql_yacc.yy"
+#line 8357 "sql_yacc.yy"
{}
break;
case 1558:
-#line 8356 "sql_yacc.yy"
+#line 8358 "sql_yacc.yy"
{}
break;
case 1559:
-#line 8357 "sql_yacc.yy"
+#line 8359 "sql_yacc.yy"
{}
break;
case 1560:
-#line 8358 "sql_yacc.yy"
+#line 8360 "sql_yacc.yy"
{}
break;
case 1561:
-#line 8359 "sql_yacc.yy"
+#line 8361 "sql_yacc.yy"
{}
break;
case 1562:
-#line 8360 "sql_yacc.yy"
+#line 8362 "sql_yacc.yy"
{}
break;
case 1563:
-#line 8361 "sql_yacc.yy"
+#line 8363 "sql_yacc.yy"
{}
break;
case 1564:
-#line 8362 "sql_yacc.yy"
+#line 8364 "sql_yacc.yy"
{}
break;
case 1565:
-#line 8363 "sql_yacc.yy"
+#line 8365 "sql_yacc.yy"
{}
break;
case 1566:
-#line 8364 "sql_yacc.yy"
+#line 8366 "sql_yacc.yy"
{}
break;
case 1567:
-#line 8365 "sql_yacc.yy"
+#line 8367 "sql_yacc.yy"
{}
break;
case 1568:
-#line 8366 "sql_yacc.yy"
+#line 8368 "sql_yacc.yy"
{}
break;
case 1569:
-#line 8367 "sql_yacc.yy"
+#line 8369 "sql_yacc.yy"
{}
break;
case 1570:
-#line 8368 "sql_yacc.yy"
+#line 8370 "sql_yacc.yy"
{}
break;
case 1571:
-#line 8369 "sql_yacc.yy"
+#line 8371 "sql_yacc.yy"
{}
break;
case 1572:
-#line 8370 "sql_yacc.yy"
+#line 8372 "sql_yacc.yy"
{}
break;
case 1573:
-#line 8371 "sql_yacc.yy"
+#line 8373 "sql_yacc.yy"
{}
break;
case 1574:
-#line 8381 "sql_yacc.yy"
+#line 8383 "sql_yacc.yy"
{}
break;
case 1575:
-#line 8382 "sql_yacc.yy"
+#line 8384 "sql_yacc.yy"
{}
break;
case 1576:
-#line 8383 "sql_yacc.yy"
+#line 8385 "sql_yacc.yy"
{}
break;
case 1577:
-#line 8384 "sql_yacc.yy"
+#line 8386 "sql_yacc.yy"
{}
break;
case 1578:
-#line 8385 "sql_yacc.yy"
+#line 8387 "sql_yacc.yy"
{}
break;
case 1579:
-#line 8386 "sql_yacc.yy"
+#line 8388 "sql_yacc.yy"
{}
break;
case 1580:
-#line 8387 "sql_yacc.yy"
+#line 8389 "sql_yacc.yy"
{}
break;
case 1581:
-#line 8388 "sql_yacc.yy"
+#line 8390 "sql_yacc.yy"
{}
break;
case 1582:
-#line 8389 "sql_yacc.yy"
+#line 8391 "sql_yacc.yy"
{}
break;
case 1583:
-#line 8390 "sql_yacc.yy"
+#line 8392 "sql_yacc.yy"
{}
break;
case 1584:
-#line 8391 "sql_yacc.yy"
+#line 8393 "sql_yacc.yy"
{}
break;
case 1585:
-#line 8392 "sql_yacc.yy"
+#line 8394 "sql_yacc.yy"
{}
break;
case 1586:
-#line 8393 "sql_yacc.yy"
+#line 8395 "sql_yacc.yy"
{}
break;
case 1587:
-#line 8394 "sql_yacc.yy"
+#line 8396 "sql_yacc.yy"
{}
break;
case 1588:
-#line 8395 "sql_yacc.yy"
+#line 8397 "sql_yacc.yy"
{}
break;
case 1589:
-#line 8396 "sql_yacc.yy"
+#line 8398 "sql_yacc.yy"
{}
break;
case 1590:
-#line 8397 "sql_yacc.yy"
+#line 8399 "sql_yacc.yy"
{}
break;
case 1591:
-#line 8398 "sql_yacc.yy"
+#line 8400 "sql_yacc.yy"
{}
break;
case 1592:
-#line 8399 "sql_yacc.yy"
+#line 8401 "sql_yacc.yy"
{}
break;
case 1593:
-#line 8400 "sql_yacc.yy"
+#line 8402 "sql_yacc.yy"
{}
break;
case 1594:
-#line 8401 "sql_yacc.yy"
+#line 8403 "sql_yacc.yy"
{}
break;
case 1595:
-#line 8402 "sql_yacc.yy"
+#line 8404 "sql_yacc.yy"
{}
break;
case 1596:
-#line 8403 "sql_yacc.yy"
+#line 8405 "sql_yacc.yy"
{}
break;
case 1597:
-#line 8404 "sql_yacc.yy"
+#line 8406 "sql_yacc.yy"
{}
break;
case 1598:
-#line 8405 "sql_yacc.yy"
+#line 8407 "sql_yacc.yy"
{}
break;
case 1599:
-#line 8406 "sql_yacc.yy"
+#line 8408 "sql_yacc.yy"
{}
break;
case 1600:
-#line 8407 "sql_yacc.yy"
+#line 8409 "sql_yacc.yy"
{}
break;
case 1601:
-#line 8408 "sql_yacc.yy"
+#line 8410 "sql_yacc.yy"
{}
break;
case 1602:
-#line 8409 "sql_yacc.yy"
+#line 8411 "sql_yacc.yy"
{}
break;
case 1603:
-#line 8410 "sql_yacc.yy"
+#line 8412 "sql_yacc.yy"
{}
break;
case 1604:
-#line 8411 "sql_yacc.yy"
+#line 8413 "sql_yacc.yy"
{}
break;
case 1605:
-#line 8412 "sql_yacc.yy"
+#line 8414 "sql_yacc.yy"
{}
break;
case 1606:
-#line 8413 "sql_yacc.yy"
+#line 8415 "sql_yacc.yy"
{}
break;
case 1607:
-#line 8414 "sql_yacc.yy"
+#line 8416 "sql_yacc.yy"
{}
break;
case 1608:
-#line 8415 "sql_yacc.yy"
+#line 8417 "sql_yacc.yy"
{}
break;
case 1609:
-#line 8416 "sql_yacc.yy"
+#line 8418 "sql_yacc.yy"
{}
break;
case 1610:
-#line 8417 "sql_yacc.yy"
+#line 8419 "sql_yacc.yy"
{}
break;
case 1611:
-#line 8418 "sql_yacc.yy"
+#line 8420 "sql_yacc.yy"
{}
break;
case 1612:
-#line 8419 "sql_yacc.yy"
+#line 8421 "sql_yacc.yy"
{}
break;
case 1613:
-#line 8420 "sql_yacc.yy"
+#line 8422 "sql_yacc.yy"
{}
break;
case 1614:
-#line 8421 "sql_yacc.yy"
+#line 8423 "sql_yacc.yy"
{}
break;
case 1615:
-#line 8422 "sql_yacc.yy"
+#line 8424 "sql_yacc.yy"
{}
break;
case 1616:
-#line 8423 "sql_yacc.yy"
+#line 8425 "sql_yacc.yy"
{}
break;
case 1617:
-#line 8424 "sql_yacc.yy"
+#line 8426 "sql_yacc.yy"
{}
break;
case 1618:
-#line 8425 "sql_yacc.yy"
+#line 8427 "sql_yacc.yy"
{}
break;
case 1619:
-#line 8426 "sql_yacc.yy"
+#line 8428 "sql_yacc.yy"
{}
break;
case 1620:
-#line 8427 "sql_yacc.yy"
+#line 8429 "sql_yacc.yy"
{}
break;
case 1621:
-#line 8428 "sql_yacc.yy"
+#line 8430 "sql_yacc.yy"
{}
break;
case 1622:
-#line 8429 "sql_yacc.yy"
+#line 8431 "sql_yacc.yy"
{}
break;
case 1623:
-#line 8430 "sql_yacc.yy"
+#line 8432 "sql_yacc.yy"
{}
break;
case 1624:
-#line 8431 "sql_yacc.yy"
+#line 8433 "sql_yacc.yy"
{}
break;
case 1625:
-#line 8432 "sql_yacc.yy"
+#line 8434 "sql_yacc.yy"
{}
break;
case 1626:
-#line 8433 "sql_yacc.yy"
+#line 8435 "sql_yacc.yy"
{}
break;
case 1627:
-#line 8434 "sql_yacc.yy"
+#line 8436 "sql_yacc.yy"
{}
break;
case 1628:
-#line 8435 "sql_yacc.yy"
+#line 8437 "sql_yacc.yy"
{}
break;
case 1629:
-#line 8436 "sql_yacc.yy"
+#line 8438 "sql_yacc.yy"
{}
break;
case 1630:
-#line 8437 "sql_yacc.yy"
+#line 8439 "sql_yacc.yy"
{}
break;
case 1631:
-#line 8438 "sql_yacc.yy"
+#line 8440 "sql_yacc.yy"
{}
break;
case 1632:
-#line 8439 "sql_yacc.yy"
+#line 8441 "sql_yacc.yy"
{}
break;
case 1633:
-#line 8440 "sql_yacc.yy"
+#line 8442 "sql_yacc.yy"
{}
break;
case 1634:
-#line 8441 "sql_yacc.yy"
+#line 8443 "sql_yacc.yy"
{}
break;
case 1635:
-#line 8442 "sql_yacc.yy"
+#line 8444 "sql_yacc.yy"
{}
break;
case 1636:
-#line 8443 "sql_yacc.yy"
+#line 8445 "sql_yacc.yy"
{}
break;
case 1637:
-#line 8444 "sql_yacc.yy"
+#line 8446 "sql_yacc.yy"
{}
break;
case 1638:
-#line 8445 "sql_yacc.yy"
+#line 8447 "sql_yacc.yy"
{}
break;
case 1639:
-#line 8446 "sql_yacc.yy"
+#line 8448 "sql_yacc.yy"
{}
break;
case 1640:
-#line 8447 "sql_yacc.yy"
+#line 8449 "sql_yacc.yy"
{}
break;
case 1641:
-#line 8448 "sql_yacc.yy"
+#line 8450 "sql_yacc.yy"
{}
break;
case 1642:
-#line 8449 "sql_yacc.yy"
+#line 8451 "sql_yacc.yy"
{}
break;
case 1643:
-#line 8450 "sql_yacc.yy"
+#line 8452 "sql_yacc.yy"
{}
break;
case 1644:
-#line 8451 "sql_yacc.yy"
+#line 8453 "sql_yacc.yy"
{}
break;
case 1645:
-#line 8452 "sql_yacc.yy"
+#line 8454 "sql_yacc.yy"
{}
break;
case 1646:
-#line 8453 "sql_yacc.yy"
+#line 8455 "sql_yacc.yy"
{}
break;
case 1647:
-#line 8454 "sql_yacc.yy"
+#line 8456 "sql_yacc.yy"
{}
break;
case 1648:
-#line 8455 "sql_yacc.yy"
+#line 8457 "sql_yacc.yy"
{}
break;
case 1649:
-#line 8456 "sql_yacc.yy"
+#line 8458 "sql_yacc.yy"
{}
break;
case 1650:
-#line 8457 "sql_yacc.yy"
+#line 8459 "sql_yacc.yy"
{}
break;
case 1651:
-#line 8458 "sql_yacc.yy"
+#line 8460 "sql_yacc.yy"
{}
break;
case 1652:
-#line 8459 "sql_yacc.yy"
+#line 8461 "sql_yacc.yy"
{}
break;
case 1653:
-#line 8460 "sql_yacc.yy"
+#line 8462 "sql_yacc.yy"
{}
break;
case 1654:
-#line 8461 "sql_yacc.yy"
+#line 8463 "sql_yacc.yy"
{}
break;
case 1655:
-#line 8462 "sql_yacc.yy"
+#line 8464 "sql_yacc.yy"
{}
break;
case 1656:
-#line 8463 "sql_yacc.yy"
+#line 8465 "sql_yacc.yy"
{}
break;
case 1657:
-#line 8464 "sql_yacc.yy"
+#line 8466 "sql_yacc.yy"
{}
break;
case 1658:
-#line 8465 "sql_yacc.yy"
+#line 8467 "sql_yacc.yy"
{}
break;
case 1659:
-#line 8466 "sql_yacc.yy"
+#line 8468 "sql_yacc.yy"
{}
break;
case 1660:
-#line 8467 "sql_yacc.yy"
+#line 8469 "sql_yacc.yy"
{}
break;
case 1661:
-#line 8468 "sql_yacc.yy"
+#line 8470 "sql_yacc.yy"
{}
break;
case 1662:
-#line 8469 "sql_yacc.yy"
+#line 8471 "sql_yacc.yy"
{}
break;
case 1663:
-#line 8470 "sql_yacc.yy"
+#line 8472 "sql_yacc.yy"
{}
break;
case 1664:
-#line 8471 "sql_yacc.yy"
+#line 8473 "sql_yacc.yy"
{}
break;
case 1665:
-#line 8472 "sql_yacc.yy"
+#line 8474 "sql_yacc.yy"
{}
break;
case 1666:
-#line 8473 "sql_yacc.yy"
+#line 8475 "sql_yacc.yy"
{}
break;
case 1667:
-#line 8474 "sql_yacc.yy"
+#line 8476 "sql_yacc.yy"
{}
break;
case 1668:
-#line 8475 "sql_yacc.yy"
+#line 8477 "sql_yacc.yy"
{}
break;
case 1669:
-#line 8476 "sql_yacc.yy"
+#line 8478 "sql_yacc.yy"
{}
break;
case 1670:
-#line 8477 "sql_yacc.yy"
+#line 8479 "sql_yacc.yy"
{}
break;
case 1671:
-#line 8478 "sql_yacc.yy"
+#line 8480 "sql_yacc.yy"
{}
break;
case 1672:
-#line 8479 "sql_yacc.yy"
+#line 8481 "sql_yacc.yy"
{}
break;
case 1673:
-#line 8480 "sql_yacc.yy"
+#line 8482 "sql_yacc.yy"
{}
break;
case 1674:
-#line 8481 "sql_yacc.yy"
+#line 8483 "sql_yacc.yy"
{}
break;
case 1675:
-#line 8482 "sql_yacc.yy"
+#line 8484 "sql_yacc.yy"
{}
break;
case 1676:
-#line 8483 "sql_yacc.yy"
+#line 8485 "sql_yacc.yy"
{}
break;
case 1677:
-#line 8484 "sql_yacc.yy"
+#line 8486 "sql_yacc.yy"
{}
break;
case 1678:
-#line 8485 "sql_yacc.yy"
+#line 8487 "sql_yacc.yy"
{}
break;
case 1679:
-#line 8486 "sql_yacc.yy"
+#line 8488 "sql_yacc.yy"
{}
break;
case 1680:
-#line 8487 "sql_yacc.yy"
+#line 8489 "sql_yacc.yy"
{}
break;
case 1681:
-#line 8488 "sql_yacc.yy"
+#line 8490 "sql_yacc.yy"
{}
break;
case 1682:
-#line 8489 "sql_yacc.yy"
+#line 8491 "sql_yacc.yy"
{}
break;
case 1683:
-#line 8490 "sql_yacc.yy"
+#line 8492 "sql_yacc.yy"
{}
break;
case 1684:
-#line 8491 "sql_yacc.yy"
+#line 8493 "sql_yacc.yy"
{}
break;
case 1685:
-#line 8492 "sql_yacc.yy"
+#line 8494 "sql_yacc.yy"
{}
break;
case 1686:
-#line 8493 "sql_yacc.yy"
+#line 8495 "sql_yacc.yy"
{}
break;
case 1687:
-#line 8494 "sql_yacc.yy"
+#line 8496 "sql_yacc.yy"
{}
break;
case 1688:
-#line 8495 "sql_yacc.yy"
+#line 8497 "sql_yacc.yy"
{}
break;
case 1689:
-#line 8496 "sql_yacc.yy"
+#line 8498 "sql_yacc.yy"
{}
break;
case 1690:
-#line 8497 "sql_yacc.yy"
+#line 8499 "sql_yacc.yy"
{}
break;
case 1691:
-#line 8498 "sql_yacc.yy"
+#line 8500 "sql_yacc.yy"
{}
break;
case 1692:
-#line 8499 "sql_yacc.yy"
+#line 8501 "sql_yacc.yy"
{}
break;
case 1693:
-#line 8500 "sql_yacc.yy"
+#line 8502 "sql_yacc.yy"
{}
break;
case 1694:
-#line 8501 "sql_yacc.yy"
+#line 8503 "sql_yacc.yy"
{}
break;
case 1695:
-#line 8502 "sql_yacc.yy"
+#line 8504 "sql_yacc.yy"
{}
break;
case 1696:
-#line 8503 "sql_yacc.yy"
+#line 8505 "sql_yacc.yy"
{}
break;
case 1697:
-#line 8504 "sql_yacc.yy"
+#line 8506 "sql_yacc.yy"
{}
break;
case 1698:
-#line 8505 "sql_yacc.yy"
+#line 8507 "sql_yacc.yy"
{}
break;
case 1699:
-#line 8506 "sql_yacc.yy"
+#line 8508 "sql_yacc.yy"
{}
break;
case 1700:
-#line 8507 "sql_yacc.yy"
+#line 8509 "sql_yacc.yy"
{}
break;
case 1701:
-#line 8508 "sql_yacc.yy"
+#line 8510 "sql_yacc.yy"
{}
break;
case 1702:
-#line 8509 "sql_yacc.yy"
+#line 8511 "sql_yacc.yy"
{}
break;
case 1703:
-#line 8510 "sql_yacc.yy"
+#line 8512 "sql_yacc.yy"
{}
break;
case 1704:
-#line 8511 "sql_yacc.yy"
+#line 8513 "sql_yacc.yy"
{}
break;
case 1705:
-#line 8512 "sql_yacc.yy"
+#line 8514 "sql_yacc.yy"
{}
break;
case 1706:
-#line 8513 "sql_yacc.yy"
+#line 8515 "sql_yacc.yy"
{}
break;
case 1707:
-#line 8514 "sql_yacc.yy"
+#line 8516 "sql_yacc.yy"
{}
break;
case 1708:
-#line 8515 "sql_yacc.yy"
+#line 8517 "sql_yacc.yy"
{}
break;
case 1709:
-#line 8516 "sql_yacc.yy"
+#line 8518 "sql_yacc.yy"
{}
break;
case 1710:
-#line 8517 "sql_yacc.yy"
+#line 8519 "sql_yacc.yy"
{}
break;
case 1711:
-#line 8518 "sql_yacc.yy"
+#line 8520 "sql_yacc.yy"
{}
break;
case 1712:
-#line 8519 "sql_yacc.yy"
+#line 8521 "sql_yacc.yy"
{}
break;
case 1713:
-#line 8520 "sql_yacc.yy"
+#line 8522 "sql_yacc.yy"
{}
break;
case 1714:
-#line 8521 "sql_yacc.yy"
+#line 8523 "sql_yacc.yy"
{}
break;
case 1715:
-#line 8522 "sql_yacc.yy"
+#line 8524 "sql_yacc.yy"
{}
break;
case 1716:
-#line 8523 "sql_yacc.yy"
+#line 8525 "sql_yacc.yy"
{}
break;
case 1717:
-#line 8524 "sql_yacc.yy"
+#line 8526 "sql_yacc.yy"
{}
break;
case 1718:
-#line 8525 "sql_yacc.yy"
+#line 8527 "sql_yacc.yy"
{}
break;
case 1719:
-#line 8526 "sql_yacc.yy"
+#line 8528 "sql_yacc.yy"
{}
break;
case 1720:
-#line 8527 "sql_yacc.yy"
+#line 8529 "sql_yacc.yy"
{}
break;
case 1721:
-#line 8528 "sql_yacc.yy"
+#line 8530 "sql_yacc.yy"
{}
break;
case 1722:
-#line 8529 "sql_yacc.yy"
+#line 8531 "sql_yacc.yy"
{}
break;
case 1723:
-#line 8530 "sql_yacc.yy"
+#line 8532 "sql_yacc.yy"
{}
break;
case 1724:
-#line 8531 "sql_yacc.yy"
+#line 8533 "sql_yacc.yy"
{}
break;
case 1725:
-#line 8532 "sql_yacc.yy"
+#line 8534 "sql_yacc.yy"
{}
break;
case 1726:
-#line 8533 "sql_yacc.yy"
+#line 8535 "sql_yacc.yy"
{}
break;
case 1727:
-#line 8534 "sql_yacc.yy"
+#line 8536 "sql_yacc.yy"
{}
break;
case 1728:
-#line 8535 "sql_yacc.yy"
+#line 8537 "sql_yacc.yy"
{}
break;
case 1729:
-#line 8536 "sql_yacc.yy"
+#line 8538 "sql_yacc.yy"
{}
break;
case 1730:
-#line 8537 "sql_yacc.yy"
+#line 8539 "sql_yacc.yy"
{}
break;
case 1731:
-#line 8538 "sql_yacc.yy"
+#line 8540 "sql_yacc.yy"
{}
break;
case 1732:
-#line 8539 "sql_yacc.yy"
+#line 8541 "sql_yacc.yy"
{}
break;
case 1733:
-#line 8540 "sql_yacc.yy"
+#line 8542 "sql_yacc.yy"
{}
break;
case 1734:
-#line 8541 "sql_yacc.yy"
+#line 8543 "sql_yacc.yy"
{}
break;
case 1735:
-#line 8542 "sql_yacc.yy"
+#line 8544 "sql_yacc.yy"
{}
break;
case 1736:
-#line 8543 "sql_yacc.yy"
+#line 8545 "sql_yacc.yy"
{}
break;
case 1737:
-#line 8544 "sql_yacc.yy"
+#line 8546 "sql_yacc.yy"
{}
break;
case 1738:
-#line 8545 "sql_yacc.yy"
+#line 8547 "sql_yacc.yy"
{}
break;
case 1739:
-#line 8546 "sql_yacc.yy"
+#line 8548 "sql_yacc.yy"
{}
break;
case 1740:
-#line 8547 "sql_yacc.yy"
+#line 8549 "sql_yacc.yy"
{}
break;
case 1741:
-#line 8548 "sql_yacc.yy"
+#line 8550 "sql_yacc.yy"
{}
break;
case 1742:
-#line 8549 "sql_yacc.yy"
+#line 8551 "sql_yacc.yy"
{}
break;
case 1743:
-#line 8550 "sql_yacc.yy"
+#line 8552 "sql_yacc.yy"
{}
break;
case 1744:
-#line 8551 "sql_yacc.yy"
+#line 8553 "sql_yacc.yy"
{}
break;
case 1745:
-#line 8552 "sql_yacc.yy"
+#line 8554 "sql_yacc.yy"
{}
break;
case 1746:
-#line 8553 "sql_yacc.yy"
+#line 8555 "sql_yacc.yy"
{}
break;
case 1747:
-#line 8554 "sql_yacc.yy"
+#line 8556 "sql_yacc.yy"
{}
break;
case 1748:
-#line 8555 "sql_yacc.yy"
+#line 8557 "sql_yacc.yy"
{}
break;
case 1749:
-#line 8556 "sql_yacc.yy"
+#line 8558 "sql_yacc.yy"
{}
break;
case 1750:
-#line 8557 "sql_yacc.yy"
+#line 8559 "sql_yacc.yy"
{}
break;
case 1751:
-#line 8558 "sql_yacc.yy"
+#line 8560 "sql_yacc.yy"
{}
break;
case 1752:
-#line 8559 "sql_yacc.yy"
+#line 8561 "sql_yacc.yy"
{}
break;
case 1753:
-#line 8560 "sql_yacc.yy"
+#line 8562 "sql_yacc.yy"
{}
break;
case 1754:
-#line 8561 "sql_yacc.yy"
+#line 8563 "sql_yacc.yy"
{}
break;
case 1755:
-#line 8562 "sql_yacc.yy"
+#line 8564 "sql_yacc.yy"
{}
break;
case 1756:
-#line 8563 "sql_yacc.yy"
+#line 8565 "sql_yacc.yy"
{}
break;
case 1757:
-#line 8564 "sql_yacc.yy"
+#line 8566 "sql_yacc.yy"
{}
break;
case 1758:
-#line 8565 "sql_yacc.yy"
+#line 8567 "sql_yacc.yy"
{}
break;
case 1759:
-#line 8566 "sql_yacc.yy"
+#line 8568 "sql_yacc.yy"
{}
break;
case 1760:
-#line 8567 "sql_yacc.yy"
+#line 8569 "sql_yacc.yy"
{}
break;
case 1761:
-#line 8568 "sql_yacc.yy"
+#line 8570 "sql_yacc.yy"
{}
break;
case 1762:
-#line 8569 "sql_yacc.yy"
+#line 8571 "sql_yacc.yy"
{}
break;
case 1763:
-#line 8570 "sql_yacc.yy"
+#line 8572 "sql_yacc.yy"
{}
break;
case 1764:
-#line 8571 "sql_yacc.yy"
+#line 8573 "sql_yacc.yy"
{}
break;
case 1765:
-#line 8572 "sql_yacc.yy"
+#line 8574 "sql_yacc.yy"
{}
break;
case 1766:
-#line 8573 "sql_yacc.yy"
+#line 8575 "sql_yacc.yy"
{}
break;
case 1767:
-#line 8574 "sql_yacc.yy"
+#line 8576 "sql_yacc.yy"
{}
break;
case 1768:
-#line 8575 "sql_yacc.yy"
+#line 8577 "sql_yacc.yy"
{}
break;
case 1769:
-#line 8576 "sql_yacc.yy"
+#line 8578 "sql_yacc.yy"
{}
break;
case 1770:
-#line 8577 "sql_yacc.yy"
+#line 8579 "sql_yacc.yy"
{}
break;
case 1771:
-#line 8578 "sql_yacc.yy"
+#line 8580 "sql_yacc.yy"
{}
break;
case 1772:
-#line 8579 "sql_yacc.yy"
+#line 8581 "sql_yacc.yy"
{}
break;
case 1773:
-#line 8580 "sql_yacc.yy"
+#line 8582 "sql_yacc.yy"
{}
break;
case 1774:
-#line 8581 "sql_yacc.yy"
+#line 8583 "sql_yacc.yy"
{}
break;
case 1775:
-#line 8582 "sql_yacc.yy"
+#line 8584 "sql_yacc.yy"
{}
break;
case 1776:
-#line 8583 "sql_yacc.yy"
+#line 8585 "sql_yacc.yy"
{}
break;
case 1777:
-#line 8584 "sql_yacc.yy"
+#line 8586 "sql_yacc.yy"
{}
break;
case 1778:
-#line 8585 "sql_yacc.yy"
+#line 8587 "sql_yacc.yy"
{}
break;
case 1779:
-#line 8586 "sql_yacc.yy"
+#line 8588 "sql_yacc.yy"
{}
break;
case 1780:
-#line 8587 "sql_yacc.yy"
+#line 8589 "sql_yacc.yy"
{}
break;
case 1781:
-#line 8588 "sql_yacc.yy"
+#line 8590 "sql_yacc.yy"
{}
break;
case 1782:
-#line 8589 "sql_yacc.yy"
+#line 8591 "sql_yacc.yy"
{}
break;
case 1783:
-#line 8590 "sql_yacc.yy"
+#line 8592 "sql_yacc.yy"
{}
break;
case 1784:
-#line 8591 "sql_yacc.yy"
+#line 8593 "sql_yacc.yy"
{}
break;
case 1785:
-#line 8592 "sql_yacc.yy"
+#line 8594 "sql_yacc.yy"
{}
break;
case 1786:
-#line 8593 "sql_yacc.yy"
+#line 8595 "sql_yacc.yy"
{}
break;
case 1787:
-#line 8594 "sql_yacc.yy"
+#line 8596 "sql_yacc.yy"
{}
break;
case 1788:
-#line 8595 "sql_yacc.yy"
+#line 8597 "sql_yacc.yy"
{}
break;
case 1789:
-#line 8596 "sql_yacc.yy"
+#line 8598 "sql_yacc.yy"
{}
break;
case 1790:
-#line 8597 "sql_yacc.yy"
+#line 8599 "sql_yacc.yy"
{}
break;
case 1791:
-#line 8598 "sql_yacc.yy"
+#line 8600 "sql_yacc.yy"
{}
break;
case 1792:
-#line 8599 "sql_yacc.yy"
+#line 8601 "sql_yacc.yy"
{}
break;
case 1793:
-#line 8600 "sql_yacc.yy"
+#line 8602 "sql_yacc.yy"
{}
break;
case 1794:
-#line 8601 "sql_yacc.yy"
+#line 8603 "sql_yacc.yy"
{}
break;
case 1795:
-#line 8602 "sql_yacc.yy"
+#line 8604 "sql_yacc.yy"
{}
break;
case 1796:
-#line 8603 "sql_yacc.yy"
+#line 8605 "sql_yacc.yy"
{}
break;
case 1797:
-#line 8604 "sql_yacc.yy"
+#line 8606 "sql_yacc.yy"
{}
break;
case 1798:
-#line 8605 "sql_yacc.yy"
+#line 8607 "sql_yacc.yy"
{}
break;
case 1799:
-#line 8606 "sql_yacc.yy"
+#line 8608 "sql_yacc.yy"
{}
break;
case 1800:
-#line 8607 "sql_yacc.yy"
+#line 8609 "sql_yacc.yy"
{}
break;
case 1801:
-#line 8608 "sql_yacc.yy"
+#line 8610 "sql_yacc.yy"
{}
break;
case 1802:
-#line 8609 "sql_yacc.yy"
+#line 8611 "sql_yacc.yy"
{}
break;
case 1803:
-#line 8610 "sql_yacc.yy"
+#line 8612 "sql_yacc.yy"
{}
break;
case 1804:
-#line 8611 "sql_yacc.yy"
+#line 8613 "sql_yacc.yy"
{}
break;
case 1805:
-#line 8612 "sql_yacc.yy"
+#line 8614 "sql_yacc.yy"
{}
break;
case 1806:
-#line 8613 "sql_yacc.yy"
+#line 8615 "sql_yacc.yy"
{}
break;
case 1807:
-#line 8614 "sql_yacc.yy"
+#line 8616 "sql_yacc.yy"
{}
break;
case 1808:
-#line 8615 "sql_yacc.yy"
+#line 8617 "sql_yacc.yy"
{}
break;
case 1809:
-#line 8616 "sql_yacc.yy"
+#line 8618 "sql_yacc.yy"
{}
break;
case 1810:
-#line 8623 "sql_yacc.yy"
+#line 8625 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SET_OPTION;
@@ -26310,22 +26312,22 @@
break;
case 1811:
-#line 8632 "sql_yacc.yy"
+#line 8634 "sql_yacc.yy"
{}
break;
case 1812:
-#line 8636 "sql_yacc.yy"
+#line 8638 "sql_yacc.yy"
{}
break;
case 1813:
-#line 8637 "sql_yacc.yy"
+#line 8639 "sql_yacc.yy"
{}
break;
case 1816:
-#line 8644 "sql_yacc.yy"
+#line 8646 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -26358,7 +26360,7 @@
break;
case 1817:
-#line 8674 "sql_yacc.yy"
+#line 8676 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -26407,77 +26409,77 @@
break;
case 1818:
-#line 8721 "sql_yacc.yy"
+#line 8723 "sql_yacc.yy"
{}
break;
case 1819:
-#line 8722 "sql_yacc.yy"
+#line 8724 "sql_yacc.yy"
{ (yyval.var_type)=OPT_GLOBAL; }
break;
case 1820:
-#line 8723 "sql_yacc.yy"
+#line 8725 "sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
case 1821:
-#line 8724 "sql_yacc.yy"
+#line 8726 "sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
case 1822:
-#line 8728 "sql_yacc.yy"
+#line 8730 "sql_yacc.yy"
{ (yyval.num)= OPT_DEFAULT; }
break;
case 1823:
-#line 8729 "sql_yacc.yy"
+#line 8731 "sql_yacc.yy"
{ Lex->one_shot_set= 1; (yyval.num)= OPT_SESSION; }
break;
case 1824:
-#line 8733 "sql_yacc.yy"
+#line 8735 "sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
case 1825:
-#line 8734 "sql_yacc.yy"
+#line 8736 "sql_yacc.yy"
{ (yyval.var_type)=OPT_GLOBAL; }
break;
case 1826:
-#line 8735 "sql_yacc.yy"
+#line 8737 "sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
case 1827:
-#line 8736 "sql_yacc.yy"
+#line 8738 "sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
case 1828:
-#line 8740 "sql_yacc.yy"
+#line 8742 "sql_yacc.yy"
{ (yyval.var_type)=OPT_DEFAULT; }
break;
case 1829:
-#line 8741 "sql_yacc.yy"
+#line 8743 "sql_yacc.yy"
{ (yyval.var_type)=OPT_GLOBAL; }
break;
case 1830:
-#line 8742 "sql_yacc.yy"
+#line 8744 "sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
case 1831:
-#line 8743 "sql_yacc.yy"
+#line 8745 "sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
case 1834:
-#line 8752 "sql_yacc.yy"
+#line 8754 "sql_yacc.yy"
{
LEX *lex=Lex;
@@ -26560,7 +26562,7 @@
break;
case 1835:
-#line 8832 "sql_yacc.yy"
+#line 8834 "sql_yacc.yy"
{
LEX *lex=Lex;
if ((yyvsp[(1) - (5)].var_type))
@@ -26573,14 +26575,14 @@
break;
case 1836:
-#line 8845 "sql_yacc.yy"
+#line 8847 "sql_yacc.yy"
{
Lex->var_list.push_back(new set_var_user(new Item_func_set_user_var((yyvsp[(2) - (4)].lex_str),(yyvsp[(4) - (4)].item))));
}
break;
case 1837:
-#line 8849 "sql_yacc.yy"
+#line 8851 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->var_list.push_back(new set_var((yyvsp[(3) - (6)].var_type), (yyvsp[(4) - (6)].variable).var, &(yyvsp[(4) - (6)].variable).base_name, (yyvsp[(6) - (6)].item)));
@@ -26588,7 +26590,7 @@
break;
case 1838:
-#line 8854 "sql_yacc.yy"
+#line 8856 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= Lex;
@@ -26598,7 +26600,7 @@
break;
case 1839:
-#line 8861 "sql_yacc.yy"
+#line 8863 "sql_yacc.yy"
{
LEX *lex= Lex;
sp_pcontext *spc= lex->spcont;
@@ -26616,7 +26618,7 @@
break;
case 1840:
-#line 8876 "sql_yacc.yy"
+#line 8878 "sql_yacc.yy"
{
LEX *lex= Lex;
(yyvsp[(2) - (3)].charset)= (yyvsp[(2) - (3)].charset) ? (yyvsp[(2) - (3)].charset) : global_system_variables.character_set_client;
@@ -26632,7 +26634,7 @@
break;
case 1841:
-#line 8889 "sql_yacc.yy"
+#line 8891 "sql_yacc.yy"
{
THD *thd=YYTHD;
LEX_USER *user;
@@ -26656,14 +26658,14 @@
break;
case 1842:
-#line 8910 "sql_yacc.yy"
+#line 8912 "sql_yacc.yy"
{
Lex->var_list.push_back(new set_var_password((yyvsp[(3) - (5)].lex_user),(yyvsp[(5) - (5)].simple_string)));
}
break;
case 1843:
-#line 8917 "sql_yacc.yy"
+#line 8919 "sql_yacc.yy"
{
LEX *lex= Lex;
sp_pcontext *spc= lex->spcont;
@@ -26704,7 +26706,7 @@
break;
case 1844:
-#line 8955 "sql_yacc.yy"
+#line 8957 "sql_yacc.yy"
{
LEX *lex= Lex;
if (check_reserved_words(&(yyvsp[(1) - (3)].lex_str)))
@@ -26750,7 +26752,7 @@
break;
case 1845:
-#line 8998 "sql_yacc.yy"
+#line 9000 "sql_yacc.yy"
{
sys_var *tmp=find_sys_var((yyvsp[(3) - (3)].lex_str).str, (yyvsp[(3) - (3)].lex_str).length);
if (!tmp)
@@ -26764,32 +26766,32 @@
break;
case 1846:
-#line 9011 "sql_yacc.yy"
+#line 9013 "sql_yacc.yy"
{ (yyval.tx_isolation)= ISO_READ_UNCOMMITTED; }
break;
case 1847:
-#line 9012 "sql_yacc.yy"
+#line 9014 "sql_yacc.yy"
{ (yyval.tx_isolation)= ISO_READ_COMMITTED; }
break;
case 1848:
-#line 9013 "sql_yacc.yy"
+#line 9015 "sql_yacc.yy"
{ (yyval.tx_isolation)= ISO_REPEATABLE_READ; }
break;
case 1849:
-#line 9014 "sql_yacc.yy"
+#line 9016 "sql_yacc.yy"
{ (yyval.tx_isolation)= ISO_SERIALIZABLE; }
break;
case 1850:
-#line 9018 "sql_yacc.yy"
+#line 9020 "sql_yacc.yy"
{ (yyval.simple_string)=(yyvsp[(1) - (1)].lex_str).str;}
break;
case 1851:
-#line 9020 "sql_yacc.yy"
+#line 9022 "sql_yacc.yy"
{
(yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).length ? YYTHD->variables.old_passwords ?
Item_func_old_password::alloc(YYTHD, (yyvsp[(3) - (4)].lex_str).str) :
@@ -26799,7 +26801,7 @@
break;
case 1852:
-#line 9027 "sql_yacc.yy"
+#line 9029 "sql_yacc.yy"
{
(yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).length ? Item_func_old_password::alloc(YYTHD, (yyvsp[(3) - (4)].lex_str).str) :
(yyvsp[(3) - (4)].lex_str).str;
@@ -26807,32 +26809,32 @@
break;
case 1853:
-#line 9035 "sql_yacc.yy"
+#line 9037 "sql_yacc.yy"
{ (yyval.item)=(yyvsp[(1) - (1)].item); }
break;
case 1854:
-#line 9036 "sql_yacc.yy"
+#line 9038 "sql_yacc.yy"
{ (yyval.item)=0; }
break;
case 1855:
-#line 9037 "sql_yacc.yy"
+#line 9039 "sql_yacc.yy"
{ (yyval.item)=new Item_string("ON", 2, system_charset_info); }
break;
case 1856:
-#line 9038 "sql_yacc.yy"
+#line 9040 "sql_yacc.yy"
{ (yyval.item)=new Item_string("ALL", 3, system_charset_info); }
break;
case 1857:
-#line 9039 "sql_yacc.yy"
+#line 9041 "sql_yacc.yy"
{ (yyval.item)=new Item_string("binary", 6, system_charset_info); }
break;
case 1858:
-#line 9047 "sql_yacc.yy"
+#line 9049 "sql_yacc.yy"
{
LEX *lex= Lex;
@@ -26846,12 +26848,12 @@
break;
case 1859:
-#line 9058 "sql_yacc.yy"
+#line 9060 "sql_yacc.yy"
{}
break;
case 1864:
-#line 9071 "sql_yacc.yy"
+#line 9073 "sql_yacc.yy"
{
if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (3)].table), (yyvsp[(2) - (3)].lex_str_ptr), 0, (thr_lock_type) (yyvsp[(3) - (3)].num)))
MYSQL_YYABORT;
@@ -26859,27 +26861,27 @@
break;
case 1865:
-#line 9078 "sql_yacc.yy"
+#line 9080 "sql_yacc.yy"
{ (yyval.num)=TL_READ_NO_INSERT; }
break;
case 1866:
-#line 9079 "sql_yacc.yy"
+#line 9081 "sql_yacc.yy"
{ (yyval.num)=TL_WRITE_DEFAULT; }
break;
case 1867:
-#line 9080 "sql_yacc.yy"
+#line 9082 "sql_yacc.yy"
{ (yyval.num)=TL_WRITE_LOW_PRIORITY; }
break;
case 1868:
-#line 9081 "sql_yacc.yy"
+#line 9083 "sql_yacc.yy"
{ (yyval.num)= TL_READ; }
break;
case 1869:
-#line 9086 "sql_yacc.yy"
+#line 9088 "sql_yacc.yy"
{
LEX *lex= Lex;
@@ -26893,12 +26895,12 @@
break;
case 1870:
-#line 9097 "sql_yacc.yy"
+#line 9099 "sql_yacc.yy"
{}
break;
case 1871:
-#line 9107 "sql_yacc.yy"
+#line 9109 "sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->sphead)
@@ -26913,7 +26915,7 @@
break;
case 1872:
-#line 9119 "sql_yacc.yy"
+#line 9121 "sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->sphead)
@@ -26928,7 +26930,7 @@
break;
case 1873:
-#line 9131 "sql_yacc.yy"
+#line 9133 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->sphead)
@@ -26946,52 +26948,52 @@
break;
case 1874:
-#line 9145 "sql_yacc.yy"
+#line 9147 "sql_yacc.yy"
{}
break;
case 1875:
-#line 9149 "sql_yacc.yy"
+#line 9151 "sql_yacc.yy"
{ Lex->ident= null_lex_str; }
break;
case 1876:
-#line 9150 "sql_yacc.yy"
+#line 9152 "sql_yacc.yy"
{ Lex->ident= (yyvsp[(1) - (2)].lex_str); }
break;
case 1877:
-#line 9154 "sql_yacc.yy"
+#line 9156 "sql_yacc.yy"
{ Lex->ha_read_mode = RFIRST; }
break;
case 1878:
-#line 9155 "sql_yacc.yy"
+#line 9157 "sql_yacc.yy"
{ Lex->ha_read_mode = RNEXT; }
break;
case 1879:
-#line 9159 "sql_yacc.yy"
+#line 9161 "sql_yacc.yy"
{ Lex->ha_read_mode = RFIRST; }
break;
case 1880:
-#line 9160 "sql_yacc.yy"
+#line 9162 "sql_yacc.yy"
{ Lex->ha_read_mode = RNEXT; }
break;
case 1881:
-#line 9161 "sql_yacc.yy"
+#line 9163 "sql_yacc.yy"
{ Lex->ha_read_mode = RPREV; }
break;
case 1882:
-#line 9162 "sql_yacc.yy"
+#line 9164 "sql_yacc.yy"
{ Lex->ha_read_mode = RLAST; }
break;
case 1883:
-#line 9164 "sql_yacc.yy"
+#line 9166 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->ha_read_mode = RKEY;
@@ -27002,42 +27004,42 @@
break;
case 1884:
-#line 9170 "sql_yacc.yy"
+#line 9172 "sql_yacc.yy"
{ }
break;
case 1885:
-#line 9174 "sql_yacc.yy"
+#line 9176 "sql_yacc.yy"
{ (yyval.ha_rkey_mode)=HA_READ_KEY_EXACT; }
break;
case 1886:
-#line 9175 "sql_yacc.yy"
+#line 9177 "sql_yacc.yy"
{ (yyval.ha_rkey_mode)=HA_READ_KEY_OR_NEXT; }
break;
case 1887:
-#line 9176 "sql_yacc.yy"
+#line 9178 "sql_yacc.yy"
{ (yyval.ha_rkey_mode)=HA_READ_KEY_OR_PREV; }
break;
case 1888:
-#line 9177 "sql_yacc.yy"
+#line 9179 "sql_yacc.yy"
{ (yyval.ha_rkey_mode)=HA_READ_AFTER_KEY; }
break;
case 1889:
-#line 9178 "sql_yacc.yy"
+#line 9180 "sql_yacc.yy"
{ (yyval.ha_rkey_mode)=HA_READ_BEFORE_KEY; }
break;
case 1890:
-#line 9185 "sql_yacc.yy"
+#line 9187 "sql_yacc.yy"
{}
break;
case 1891:
-#line 9190 "sql_yacc.yy"
+#line 9192 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_REVOKE;
@@ -27046,7 +27048,7 @@
break;
case 1892:
-#line 9197 "sql_yacc.yy"
+#line 9199 "sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -27061,7 +27063,7 @@
break;
case 1893:
-#line 9210 "sql_yacc.yy"
+#line 9212 "sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -27075,19 +27077,19 @@
break;
case 1894:
-#line 9222 "sql_yacc.yy"
+#line 9224 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_REVOKE_ALL;
}
break;
case 1895:
-#line 9229 "sql_yacc.yy"
+#line 9231 "sql_yacc.yy"
{}
break;
case 1896:
-#line 9235 "sql_yacc.yy"
+#line 9237 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_GRANT;
@@ -27096,7 +27098,7 @@
break;
case 1897:
-#line 9243 "sql_yacc.yy"
+#line 9245 "sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -27110,7 +27112,7 @@
break;
case 1898:
-#line 9256 "sql_yacc.yy"
+#line 9258 "sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -27124,12 +27126,12 @@
break;
case 1901:
-#line 9273 "sql_yacc.yy"
+#line 9275 "sql_yacc.yy"
{ }
break;
case 1902:
-#line 9275 "sql_yacc.yy"
+#line 9277 "sql_yacc.yy"
{
Lex->all_privileges= 1;
Lex->grant= GLOBAL_ACLS;
@@ -27137,172 +27139,172 @@
break;
case 1907:
-#line 9291 "sql_yacc.yy"
+#line 9293 "sql_yacc.yy"
{ Lex->which_columns = SELECT_ACL;}
break;
case 1908:
-#line 9291 "sql_yacc.yy"
+#line 9293 "sql_yacc.yy"
{}
break;
case 1909:
-#line 9292 "sql_yacc.yy"
+#line 9294 "sql_yacc.yy"
{ Lex->which_columns = INSERT_ACL;}
break;
case 1910:
-#line 9292 "sql_yacc.yy"
+#line 9294 "sql_yacc.yy"
{}
break;
case 1911:
-#line 9293 "sql_yacc.yy"
+#line 9295 "sql_yacc.yy"
{ Lex->which_columns = UPDATE_ACL; }
break;
case 1912:
-#line 9293 "sql_yacc.yy"
+#line 9295 "sql_yacc.yy"
{}
break;
case 1913:
-#line 9294 "sql_yacc.yy"
+#line 9296 "sql_yacc.yy"
{ Lex->which_columns = REFERENCES_ACL;}
break;
case 1914:
-#line 9294 "sql_yacc.yy"
+#line 9296 "sql_yacc.yy"
{}
break;
case 1915:
-#line 9295 "sql_yacc.yy"
+#line 9297 "sql_yacc.yy"
{ Lex->grant |= DELETE_ACL;}
break;
case 1916:
-#line 9296 "sql_yacc.yy"
+#line 9298 "sql_yacc.yy"
{}
break;
case 1917:
-#line 9297 "sql_yacc.yy"
+#line 9299 "sql_yacc.yy"
{ Lex->grant |= INDEX_ACL;}
break;
case 1918:
-#line 9298 "sql_yacc.yy"
+#line 9300 "sql_yacc.yy"
{ Lex->grant |= ALTER_ACL;}
break;
case 1919:
-#line 9299 "sql_yacc.yy"
+#line 9301 "sql_yacc.yy"
{ Lex->grant |= CREATE_ACL;}
break;
case 1920:
-#line 9300 "sql_yacc.yy"
+#line 9302 "sql_yacc.yy"
{ Lex->grant |= DROP_ACL;}
break;
case 1921:
-#line 9301 "sql_yacc.yy"
+#line 9303 "sql_yacc.yy"
{ Lex->grant |= EXECUTE_ACL;}
break;
case 1922:
-#line 9302 "sql_yacc.yy"
+#line 9304 "sql_yacc.yy"
{ Lex->grant |= RELOAD_ACL;}
break;
case 1923:
-#line 9303 "sql_yacc.yy"
+#line 9305 "sql_yacc.yy"
{ Lex->grant |= SHUTDOWN_ACL;}
break;
case 1924:
-#line 9304 "sql_yacc.yy"
+#line 9306 "sql_yacc.yy"
{ Lex->grant |= PROCESS_ACL;}
break;
case 1925:
-#line 9305 "sql_yacc.yy"
+#line 9307 "sql_yacc.yy"
{ Lex->grant |= FILE_ACL;}
break;
case 1926:
-#line 9306 "sql_yacc.yy"
+#line 9308 "sql_yacc.yy"
{ Lex->grant |= GRANT_ACL;}
break;
case 1927:
-#line 9307 "sql_yacc.yy"
+#line 9309 "sql_yacc.yy"
{ Lex->grant |= SHOW_DB_ACL;}
break;
case 1928:
-#line 9308 "sql_yacc.yy"
+#line 9310 "sql_yacc.yy"
{ Lex->grant |= SUPER_ACL;}
break;
case 1929:
-#line 9309 "sql_yacc.yy"
+#line 9311 "sql_yacc.yy"
{ Lex->grant |= CREATE_TMP_ACL;}
break;
case 1930:
-#line 9310 "sql_yacc.yy"
+#line 9312 "sql_yacc.yy"
{ Lex->grant |= LOCK_TABLES_ACL; }
break;
case 1931:
-#line 9311 "sql_yacc.yy"
+#line 9313 "sql_yacc.yy"
{ Lex->grant |= REPL_SLAVE_ACL; }
break;
case 1932:
-#line 9312 "sql_yacc.yy"
+#line 9314 "sql_yacc.yy"
{ Lex->grant |= REPL_CLIENT_ACL; }
break;
case 1933:
-#line 9313 "sql_yacc.yy"
+#line 9315 "sql_yacc.yy"
{ Lex->grant |= CREATE_VIEW_ACL; }
break;
case 1934:
-#line 9314 "sql_yacc.yy"
+#line 9316 "sql_yacc.yy"
{ Lex->grant |= SHOW_VIEW_ACL; }
break;
case 1935:
-#line 9315 "sql_yacc.yy"
+#line 9317 "sql_yacc.yy"
{ Lex->grant |= CREATE_PROC_ACL; }
break;
case 1936:
-#line 9316 "sql_yacc.yy"
+#line 9318 "sql_yacc.yy"
{ Lex->grant |= ALTER_PROC_ACL; }
break;
case 1937:
-#line 9317 "sql_yacc.yy"
+#line 9319 "sql_yacc.yy"
{ Lex->grant |= CREATE_USER_ACL; }
break;
case 1938:
-#line 9322 "sql_yacc.yy"
+#line 9324 "sql_yacc.yy"
{}
break;
case 1939:
-#line 9323 "sql_yacc.yy"
+#line 9325 "sql_yacc.yy"
{}
break;
case 1942:
-#line 9333 "sql_yacc.yy"
+#line 9335 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->x509_subject)
@@ -27315,7 +27317,7 @@
break;
case 1943:
-#line 9343 "sql_yacc.yy"
+#line 9345 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->x509_issuer)
@@ -27328,7 +27330,7 @@
break;
case 1944:
-#line 9353 "sql_yacc.yy"
+#line 9355 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->ssl_cipher)
@@ -27341,7 +27343,7 @@
break;
case 1945:
-#line 9366 "sql_yacc.yy"
+#line 9368 "sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->copy_db_to(&lex->current_select->db, NULL))
@@ -27358,7 +27360,7 @@
break;
case 1946:
-#line 9380 "sql_yacc.yy"
+#line 9382 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->current_select->db = (yyvsp[(1) - (3)].lex_str).str;
@@ -27374,7 +27376,7 @@
break;
case 1947:
-#line 9393 "sql_yacc.yy"
+#line 9395 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->current_select->db = NULL;
@@ -27390,7 +27392,7 @@
break;
case 1948:
-#line 9406 "sql_yacc.yy"
+#line 9408 "sql_yacc.yy"
{
LEX *lex=Lex;
if (!lex->current_select->add_table_to_list(lex->thd, (yyvsp[(1) - (1)].table),NULL,
@@ -27402,12 +27404,12 @@
break;
case 1949:
-#line 9418 "sql_yacc.yy"
+#line 9420 "sql_yacc.yy"
{ if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user))) MYSQL_YYABORT;}
break;
case 1950:
-#line 9420 "sql_yacc.yy"
+#line 9422 "sql_yacc.yy"
{
if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
MYSQL_YYABORT;
@@ -27415,12 +27417,12 @@
break;
case 1951:
-#line 9428 "sql_yacc.yy"
+#line 9430 "sql_yacc.yy"
{ if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user))) MYSQL_YYABORT;}
break;
case 1952:
-#line 9430 "sql_yacc.yy"
+#line 9432 "sql_yacc.yy"
{
if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
MYSQL_YYABORT;
@@ -27428,7 +27430,7 @@
break;
case 1953:
-#line 9439 "sql_yacc.yy"
+#line 9441 "sql_yacc.yy"
{
(yyval.lex_user)=(yyvsp[(1) - (4)].lex_user); (yyvsp[(1) - (4)].lex_user)->password=(yyvsp[(4) - (4)].lex_str);
if ((yyvsp[(4) - (4)].lex_str).length)
@@ -27456,17 +27458,17 @@
break;
case 1954:
-#line 9464 "sql_yacc.yy"
+#line 9466 "sql_yacc.yy"
{ (yyval.lex_user)= (yyvsp[(1) - (5)].lex_user); (yyvsp[(1) - (5)].lex_user)->password= (yyvsp[(5) - (5)].lex_str); }
break;
case 1955:
-#line 9466 "sql_yacc.yy"
+#line 9468 "sql_yacc.yy"
{ (yyval.lex_user)= (yyvsp[(1) - (1)].lex_user); (yyvsp[(1) - (1)].lex_user)->password= null_lex_str; }
break;
case 1956:
-#line 9472 "sql_yacc.yy"
+#line 9474 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->grant |= lex->which_columns;
@@ -27474,7 +27476,7 @@
break;
case 1960:
-#line 9484 "sql_yacc.yy"
+#line 9486 "sql_yacc.yy"
{
String *new_str = new (YYTHD->mem_root) String((const char*) (yyvsp[(1) - (1)].lex_str).str,(yyvsp[(1) - (1)].lex_str).length,system_charset_info);
List_iterator <LEX_COLUMN> iter(Lex->columns);
@@ -27495,55 +27497,55 @@
break;
case 1962:
-#line 9506 "sql_yacc.yy"
+#line 9508 "sql_yacc.yy"
{
Lex->ssl_type=SSL_TYPE_SPECIFIED;
}
break;
case 1963:
-#line 9510 "sql_yacc.yy"
+#line 9512 "sql_yacc.yy"
{
Lex->ssl_type=SSL_TYPE_ANY;
}
break;
case 1964:
-#line 9514 "sql_yacc.yy"
+#line 9516 "sql_yacc.yy"
{
Lex->ssl_type=SSL_TYPE_X509;
}
break;
case 1965:
-#line 9518 "sql_yacc.yy"
+#line 9520 "sql_yacc.yy"
{
Lex->ssl_type=SSL_TYPE_NONE;
}
break;
case 1966:
-#line 9524 "sql_yacc.yy"
+#line 9526 "sql_yacc.yy"
{}
break;
case 1968:
-#line 9528 "sql_yacc.yy"
+#line 9530 "sql_yacc.yy"
{}
break;
case 1969:
-#line 9529 "sql_yacc.yy"
+#line 9531 "sql_yacc.yy"
{}
break;
case 1970:
-#line 9533 "sql_yacc.yy"
+#line 9535 "sql_yacc.yy"
{ Lex->grant |= GRANT_ACL;}
break;
case 1971:
-#line 9535 "sql_yacc.yy"
+#line 9537 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->mqh.questions=(yyvsp[(2) - (2)].ulong_num);
@@ -27552,7 +27554,7 @@
break;
case 1972:
-#line 9541 "sql_yacc.yy"
+#line 9543 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->mqh.updates=(yyvsp[(2) - (2)].ulong_num);
@@ -27561,7 +27563,7 @@
break;
case 1973:
-#line 9547 "sql_yacc.yy"
+#line 9549 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->mqh.conn_per_hour= (yyvsp[(2) - (2)].ulong_num);
@@ -27570,7 +27572,7 @@
break;
case 1974:
-#line 9553 "sql_yacc.yy"
+#line 9555 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->mqh.user_conn= (yyvsp[(2) - (2)].ulong_num);
@@ -27579,7 +27581,7 @@
break;
case 1975:
-#line 9562 "sql_yacc.yy"
+#line 9564 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_BEGIN;
@@ -27588,62 +27590,62 @@
break;
case 1976:
-#line 9567 "sql_yacc.yy"
+#line 9569 "sql_yacc.yy"
{}
break;
case 1977:
-#line 9571 "sql_yacc.yy"
+#line 9573 "sql_yacc.yy"
{}
break;
case 1978:
-#line 9572 "sql_yacc.yy"
+#line 9574 "sql_yacc.yy"
{}
break;
case 1979:
-#line 9576 "sql_yacc.yy"
+#line 9578 "sql_yacc.yy"
{ (yyval.num)= (YYTHD->variables.completion_type == 1); }
break;
case 1980:
-#line 9577 "sql_yacc.yy"
+#line 9579 "sql_yacc.yy"
{ (yyval.num)=0; }
break;
case 1981:
-#line 9578 "sql_yacc.yy"
+#line 9580 "sql_yacc.yy"
{ (yyval.num)=1; }
break;
case 1982:
-#line 9582 "sql_yacc.yy"
+#line 9584 "sql_yacc.yy"
{ (yyval.num)= (YYTHD->variables.completion_type == 2); }
break;
case 1983:
-#line 9583 "sql_yacc.yy"
+#line 9585 "sql_yacc.yy"
{ (yyval.num)=1; }
break;
case 1984:
-#line 9584 "sql_yacc.yy"
+#line 9586 "sql_yacc.yy"
{ (yyval.num)=0; }
break;
case 1985:
-#line 9588 "sql_yacc.yy"
+#line 9590 "sql_yacc.yy"
{}
break;
case 1986:
-#line 9589 "sql_yacc.yy"
+#line 9591 "sql_yacc.yy"
{}
break;
case 1987:
-#line 9594 "sql_yacc.yy"
+#line 9596 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_COMMIT;
@@ -27653,7 +27655,7 @@
break;
case 1988:
-#line 9604 "sql_yacc.yy"
+#line 9606 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_ROLLBACK;
@@ -27663,7 +27665,7 @@
break;
case 1989:
-#line 9612 "sql_yacc.yy"
+#line 9614 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_ROLLBACK_TO_SAVEPOINT;
@@ -27672,7 +27674,7 @@
break;
case 1990:
-#line 9621 "sql_yacc.yy"
+#line 9623 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SAVEPOINT;
@@ -27681,7 +27683,7 @@
break;
case 1991:
-#line 9630 "sql_yacc.yy"
+#line 9632 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_RELEASE_SAVEPOINT;
@@ -27690,12 +27692,12 @@
break;
case 1992:
-#line 9643 "sql_yacc.yy"
+#line 9645 "sql_yacc.yy"
{}
break;
case 1994:
-#line 9649 "sql_yacc.yy"
+#line 9651 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->result)
@@ -27722,7 +27724,7 @@
break;
case 1995:
-#line 9673 "sql_yacc.yy"
+#line 9675 "sql_yacc.yy"
{
/*
Remove from the name resolution context stack the context of the
@@ -27733,22 +27735,22 @@
break;
case 1996:
-#line 9683 "sql_yacc.yy"
+#line 9685 "sql_yacc.yy"
{ (yyval.num)= 0; }
break;
case 1997:
-#line 9684 "sql_yacc.yy"
+#line 9686 "sql_yacc.yy"
{ (yyval.num)= 1; }
break;
case 1998:
-#line 9685 "sql_yacc.yy"
+#line 9687 "sql_yacc.yy"
{ (yyval.num)= 1; }
break;
case 1999:
-#line 9689 "sql_yacc.yy"
+#line 9691 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -27767,7 +27769,7 @@
break;
case 2000:
-#line 9705 "sql_yacc.yy"
+#line 9707 "sql_yacc.yy"
{
THD *thd= YYTHD;
thd->lex->current_select->no_table_names_allowed= 0;
@@ -27776,29 +27778,29 @@
break;
case 2003:
-#line 9718 "sql_yacc.yy"
+#line 9720 "sql_yacc.yy"
{ (yyval.num)=1; }
break;
case 2004:
-#line 9719 "sql_yacc.yy"
+#line 9721 "sql_yacc.yy"
{ (yyval.num)=1; }
break;
case 2005:
-#line 9720 "sql_yacc.yy"
+#line 9722 "sql_yacc.yy"
{ (yyval.num)=0; }
break;
case 2006:
-#line 9725 "sql_yacc.yy"
+#line 9727 "sql_yacc.yy"
{
(yyval.select_lex)= (yyvsp[(3) - (4)].select_lex);
}
break;
case 2007:
-#line 9729 "sql_yacc.yy"
+#line 9731 "sql_yacc.yy"
{
THD *thd= YYTHD;
/*
@@ -27818,19 +27820,19 @@
break;
case 2008:
-#line 9745 "sql_yacc.yy"
+#line 9747 "sql_yacc.yy"
{ (yyval.select_lex)= (yyvsp[(3) - (7)].select_lex); }
break;
case 2009:
-#line 9749 "sql_yacc.yy"
+#line 9751 "sql_yacc.yy"
{
(yyval.select_lex)= Lex->current_select->master_unit()->first_select();
}
break;
case 2010:
-#line 9754 "sql_yacc.yy"
+#line 9756 "sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->sql_command == (int)SQLCOM_HA_READ ||
@@ -27853,7 +27855,7 @@
break;
case 2011:
-#line 9775 "sql_yacc.yy"
+#line 9777 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->pop_context();
@@ -27871,32 +27873,32 @@
break;
case 2012:
-#line 9798 "sql_yacc.yy"
+#line 9800 "sql_yacc.yy"
{}
break;
case 2013:
-#line 9800 "sql_yacc.yy"
+#line 9802 "sql_yacc.yy"
{}
break;
case 2014:
-#line 9805 "sql_yacc.yy"
+#line 9807 "sql_yacc.yy"
{}
break;
case 2015:
-#line 9807 "sql_yacc.yy"
+#line 9809 "sql_yacc.yy"
{}
break;
case 2016:
-#line 9809 "sql_yacc.yy"
+#line 9811 "sql_yacc.yy"
{}
break;
case 2017:
-#line 9820 "sql_yacc.yy"
+#line 9822 "sql_yacc.yy"
{
/*
We have to distinguish missing DEFINER-clause from case when
@@ -27910,74 +27912,74 @@
break;
case 2018:
-#line 9831 "sql_yacc.yy"
+#line 9833 "sql_yacc.yy"
{
YYTHD->lex->definer= get_current_user(YYTHD, (yyvsp[(3) - (3)].lex_user));
}
break;
case 2019:
-#line 9844 "sql_yacc.yy"
+#line 9846 "sql_yacc.yy"
{}
break;
case 2020:
-#line 9846 "sql_yacc.yy"
+#line 9848 "sql_yacc.yy"
{}
break;
case 2021:
-#line 9848 "sql_yacc.yy"
+#line 9850 "sql_yacc.yy"
{}
break;
case 2022:
-#line 9853 "sql_yacc.yy"
+#line 9855 "sql_yacc.yy"
{ Lex->create_view_mode= VIEW_CREATE_OR_REPLACE; }
break;
case 2023:
-#line 9858 "sql_yacc.yy"
+#line 9860 "sql_yacc.yy"
{ Lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED; }
break;
case 2024:
-#line 9860 "sql_yacc.yy"
+#line 9862 "sql_yacc.yy"
{ Lex->create_view_algorithm= VIEW_ALGORITHM_MERGE; }
break;
case 2025:
-#line 9862 "sql_yacc.yy"
+#line 9864 "sql_yacc.yy"
{ Lex->create_view_algorithm= VIEW_ALGORITHM_TMPTABLE; }
break;
case 2026:
-#line 9867 "sql_yacc.yy"
+#line 9869 "sql_yacc.yy"
{ Lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED; }
break;
case 2027:
-#line 9869 "sql_yacc.yy"
+#line 9871 "sql_yacc.yy"
{}
break;
case 2028:
-#line 9874 "sql_yacc.yy"
+#line 9876 "sql_yacc.yy"
{ Lex->create_view_suid= VIEW_SUID_DEFAULT; }
break;
case 2029:
-#line 9876 "sql_yacc.yy"
+#line 9878 "sql_yacc.yy"
{ Lex->create_view_suid= VIEW_SUID_DEFINER; }
break;
case 2030:
-#line 9878 "sql_yacc.yy"
+#line 9880 "sql_yacc.yy"
{ Lex->create_view_suid= VIEW_SUID_INVOKER; }
break;
case 2031:
-#line 9883 "sql_yacc.yy"
+#line 9885 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -27989,17 +27991,17 @@
break;
case 2032:
-#line 9892 "sql_yacc.yy"
+#line 9894 "sql_yacc.yy"
{}
break;
case 2033:
-#line 9897 "sql_yacc.yy"
+#line 9899 "sql_yacc.yy"
{}
break;
case 2035:
-#line 9903 "sql_yacc.yy"
+#line 9905 "sql_yacc.yy"
{
Lex->view_list.push_back((LEX_STRING*)
sql_memdup(&(yyvsp[(1) - (1)].lex_str), sizeof(LEX_STRING)));
@@ -28007,7 +28009,7 @@
break;
case 2036:
-#line 9908 "sql_yacc.yy"
+#line 9910 "sql_yacc.yy"
{
Lex->view_list.push_back((LEX_STRING*)
sql_memdup(&(yyvsp[(3) - (3)].lex_str), sizeof(LEX_STRING)));
@@ -28015,7 +28017,7 @@
break;
case 2037:
-#line 9915 "sql_yacc.yy"
+#line 9917 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->parsing_options.allows_variable= FALSE;
@@ -28026,7 +28028,7 @@
break;
case 2038:
-#line 9923 "sql_yacc.yy"
+#line 9925 "sql_yacc.yy"
{
LEX *lex= Lex;
lex->parsing_options.allows_variable= TRUE;
@@ -28037,7 +28039,7 @@
break;
case 2039:
-#line 9934 "sql_yacc.yy"
+#line 9936 "sql_yacc.yy"
{
THD *thd=YYTHD;
LEX *lex= thd->lex;
@@ -28049,7 +28051,7 @@
break;
case 2040:
-#line 9943 "sql_yacc.yy"
+#line 9945 "sql_yacc.yy"
{
THD *thd=YYTHD;
LEX *lex= thd->lex;
@@ -28061,27 +28063,27 @@
break;
case 2041:
-#line 9955 "sql_yacc.yy"
+#line 9957 "sql_yacc.yy"
{ Lex->create_view_check= VIEW_CHECK_NONE; }
break;
case 2042:
-#line 9957 "sql_yacc.yy"
+#line 9959 "sql_yacc.yy"
{ Lex->create_view_check= VIEW_CHECK_CASCADED; }
break;
case 2043:
-#line 9959 "sql_yacc.yy"
+#line 9961 "sql_yacc.yy"
{ Lex->create_view_check= VIEW_CHECK_CASCADED; }
break;
case 2044:
-#line 9961 "sql_yacc.yy"
+#line 9963 "sql_yacc.yy"
{ Lex->create_view_check= VIEW_CHECK_LOCAL; }
break;
case 2045:
-#line 9973 "sql_yacc.yy"
+#line 9975 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -28124,7 +28126,7 @@
break;
case 2046:
-#line 10013 "sql_yacc.yy"
+#line 10015 "sql_yacc.yy"
{
LEX *lex= Lex;
sp_head *sp= lex->sphead;
@@ -28153,7 +28155,7 @@
break;
case 2047:
-#line 10048 "sql_yacc.yy"
+#line 10050 "sql_yacc.yy"
{
LEX *lex=Lex;
lex->udf.type= (yyvsp[(1) - (4)].udf_type);
@@ -28163,12 +28165,12 @@
break;
case 2048:
-#line 10055 "sql_yacc.yy"
+#line 10057 "sql_yacc.yy"
{}
break;
case 2049:
-#line 10057 "sql_yacc.yy"
+#line 10059 "sql_yacc.yy"
{
LEX *lex= Lex;
sp_head *sp;
@@ -28200,7 +28202,7 @@
break;
case 2050:
-#line 10086 "sql_yacc.yy"
+#line 10088 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -28211,7 +28213,7 @@
break;
case 2051:
-#line 10095 "sql_yacc.yy"
+#line 10097 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -28223,7 +28225,7 @@
break;
case 2052:
-#line 10104 "sql_yacc.yy"
+#line 10106 "sql_yacc.yy"
{
THD *thd= YYTHD;
LEX *lex= thd->lex;
@@ -28235,7 +28237,7 @@
break;
case 2053:
-#line 10113 "sql_yacc.yy"
+#line 10115 "sql_yacc.yy"
{
LEX *lex= Lex;
sp_head *sp= lex->sphead;
@@ -28250,49 +28252,49 @@
break;
case 2054:
-#line 10129 "sql_yacc.yy"
+#line 10131 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_START;
}
break;
case 2055:
-#line 10133 "sql_yacc.yy"
+#line 10135 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_END;
}
break;
case 2056:
-#line 10137 "sql_yacc.yy"
+#line 10139 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_PREPARE;
}
break;
case 2057:
-#line 10141 "sql_yacc.yy"
+#line 10143 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_COMMIT;
}
break;
case 2058:
-#line 10145 "sql_yacc.yy"
+#line 10147 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_ROLLBACK;
}
break;
case 2059:
-#line 10149 "sql_yacc.yy"
+#line 10151 "sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_RECOVER;
}
break;
case 2060:
-#line 10155 "sql_yacc.yy"
+#line 10157 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (1)].string)->length() <= MAXGTRIDSIZE);
if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
@@ -28302,7 +28304,7 @@
break;
case 2061:
-#line 10162 "sql_yacc.yy"
+#line 10164 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].string)->length() <= MAXGTRIDSIZE && (yyvsp[(3) - (3)].string)->length() <= MAXBQUALSIZE);
if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
@@ -28312,7 +28314,7 @@
break;
case 2062:
-#line 10169 "sql_yacc.yy"
+#line 10171 "sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].string)->length() <= MAXGTRIDSIZE && (yyvsp[(3) - (5)].string)->length() <= MAXBQUALSIZE);
if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
@@ -28322,63 +28324,63 @@
break;
case 2063:
-#line 10177 "sql_yacc.yy"
+#line 10179 "sql_yacc.yy"
{}
break;
case 2064:
-#line 10178 "sql_yacc.yy"
+#line 10180 "sql_yacc.yy"
{}
break;
case 2065:
-#line 10182 "sql_yacc.yy"
+#line 10184 "sql_yacc.yy"
{ Lex->xa_opt=XA_NONE; }
break;
case 2066:
-#line 10183 "sql_yacc.yy"
+#line 10185 "sql_yacc.yy"
{ Lex->xa_opt=XA_JOIN; }
break;
case 2067:
-#line 10184 "sql_yacc.yy"
+#line 10186 "sql_yacc.yy"
{ Lex->xa_opt=XA_RESUME; }
break;
case 2068:
-#line 10188 "sql_yacc.yy"
+#line 10190 "sql_yacc.yy"
{ Lex->xa_opt=XA_NONE; }
break;
case 2069:
-#line 10189 "sql_yacc.yy"
+#line 10191 "sql_yacc.yy"
{ Lex->xa_opt=XA_ONE_PHASE; }
break;
case 2070:
-#line 10193 "sql_yacc.yy"
+#line 10195 "sql_yacc.yy"
{ Lex->xa_opt=XA_NONE; }
break;
case 2071:
-#line 10194 "sql_yacc.yy"
+#line 10196 "sql_yacc.yy"
{ Lex->xa_opt=XA_SUSPEND; }
break;
case 2073:
-#line 10199 "sql_yacc.yy"
+#line 10201 "sql_yacc.yy"
{ }
break;
case 2074:
-#line 10200 "sql_yacc.yy"
+#line 10202 "sql_yacc.yy"
{ Lex->xa_opt=XA_FOR_MIGRATE; }
break;
/* Line 1267 of yacc.c. */
-#line 28382 "sql_yacc.cc"
+#line 28384 "sql_yacc.cc"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
Modified: mysql-5.0.51-tritonn-1.0.8/sql/sql_yacc.yy
===================================================================
--- mysql-5.0.51-tritonn-1.0.8/sql/sql_yacc.yy 2007-12-10 07:01:42 UTC (rev 51)
+++ mysql-5.0.51-tritonn-1.0.8/sql/sql_yacc.yy 2007-12-10 10:56:06 UTC (rev 52)
@@ -3665,11 +3665,13 @@
}
| SENNA_DELIMITED_SYM {
#ifdef ENABLE_SENNA
+ Lex->senna_flags &= ~SEN_INDEX_NGRAM;
Lex->senna_flags |= SEN_INDEX_DELIMITED;
#endif /* ENABLE_SENNA */
}
| SENNA_MECAB_SYM {
#ifdef ENABLE_SENNA
+ Lex->senna_flags &= ~SEN_INDEX_DELIMITED;
Lex->senna_flags &= ~SEN_INDEX_NGRAM;
#endif /* ENABLE_SENNA */
}