fixed #64 negative value at SET global; added case to test 229; fixed ubertest on windows

src/sphinxql.y

@@ -1073,7 +1073,7 @@ set_global_stmt:
 			pParser->SetStatement ( $3, SET_GLOBAL_SVAR );
 			pParser->ToString ( pParser->m_pStmt->m_sSetValue, $5 ).Unquote();
 		}
-	| TOK_SET TOK_GLOBAL ident_set '=' TOK_CONST_INT
+	| TOK_SET TOK_GLOBAL ident_set '=' const_int
 		{
 			pParser->SetStatement ( $3, SET_GLOBAL_SVAR );
 			pParser->m_pStmt->m_iSetValue = $5.m_iValue;

src/yysphinxql.c

@@ -790,76 +790,76 @@ static const yytype_int16 yypact[] =
      209,   213,   244,   250,   252,   254,   256,  1930,  -802,  1930,
     1930,  3868,    41,   -35,  -802,  3982,    14,  -802,   257,   -41,
     -802,  3982,   178,   237,  -802,   253,   278,   309,  4702,  4450,
-    3124,   298,   282,   300,  4108,   314,  -802,   347,  -802,  -802,
+    3250,   298,   282,   300,  4108,   314,  -802,   347,  -802,  -802,
      347,  -802,  -802,  -802,  -802,   347,  -802,   347,   337,  -802,
     -802,  4450,   302,  -802,  4450,  -802,   -50,  -802,  1930,   148,
-    -802,  4450,   347,   328,    75,   315,    42,   331,   330,    13,
-    -802,   332,  -802,  -802,   337,   398,   345,  1042,  1930,  2078,
-     -10,  2078,  2078,   305,  1930,  2078,  2078,  1930,  1930,  1190,
-    1930,  1930,   306,   310,   311,   312,  -802,  -802,  5000,  -802,
-    -802,    85,   327,  -802,  -802,  2226,    51,  -802,  2745,  1338,
+    -802,  4450,   347,   336,    75,   315,    42,   351,   331,    13,
+    -802,   332,  -802,  -802,   337,   400,   346,  1042,  1930,  2078,
+     -10,  2078,  2078,   306,  1930,  2078,  2078,  1930,  1930,  1190,
+    1930,  1930,   310,   312,   313,   316,  -802,  -802,  5000,  -802,
+    -802,    85,   324,  -802,  -802,  2226,    51,  -802,  2745,  1338,
     4450,  -802,  -802,  1930,  1930,  1930,  1930,  1930,  1930,  1930,
     1930,  1930,  1930,  1930,  1930,  1930,  1930,  1930,  1930,  1930,
-    1930,   456,   452,  -802,  -802,  -802,   -33,  1930,  3124,  3124,
-     334,   335,   409,  -802,  -802,  -802,  -802,  -802,   325,  -802,
-    2872,   400,   361,     7,   375,  -802,   478,  -802,  -802,  -802,
+    1930,   456,   452,  -802,  -802,  -802,   -33,  1930,  3250,  3250,
+     334,   335,   411,  -802,  -802,  -802,  -802,  -802,   329,  -802,
+    2872,   401,   375,     7,   377,  -802,   480,  -802,  -802,  -802,
     -802,  4450,  -802,  -802,    27,    12,  -802,  4450,  4450,  5252,
-    -802,  3982,    49,  1486,  4828,   286,  -802,   341,  -802,  -802,
-     458,   459,   390,  -802,  -802,  -802,  -802,    99,    35,  -802,
-    -802,  -802,   346,  -802,   476,   486,  2364,  -802,   488,  -802,
-     489,  -802,   490,   366,  1634,  -802,  5252,    47,  -802,  5068,
-     104,  4450,   352,   107,   111,  -802,  5105,   116,   121,   610,
+    -802,  3982,    49,  1486,  4828,   286,  -802,   343,  -802,  -802,
+     458,   459,   394,  -802,  -802,  -802,  -802,    99,    35,  -802,
+    -802,  -802,   348,  -802,   476,   487,  2364,  -802,   488,  -802,
+     490,  -802,   491,   367,  1634,  -802,  5252,    47,  -802,  5068,
+     104,  4450,   379,   107,   111,  -802,  5105,   116,   121,   610,
      660,  -802,   123,   728,  5135,  -802,  1782,  1930,  1930,  -802,
-    3868,  -802,  2998,   370,   378,  -802,  -802,    13,  -802,  5252,
+    3868,  -802,  3124,   370,   378,  -802,  -802,    13,  -802,  5252,
     -802,  -802,  -802,  5272,  5285,   340,  4980,   153,  -802,   153,
      238,   238,   238,   238,    63,    63,  -802,  -802,  -802,  5237,
-     377,  -802,  -802,   445,   153,   325,   325,   381,  3628,   520,
-    3124,  -802,  -802,  -802,  -802,   525,  -802,  -802,  -802,  -802,
-     461,   347,  -802,   347,  -802,   401,   384,  -802,   432,   532,
-    -802,   434,   531,  4450,  -802,  -802,     9,    86,  -802,   407,
-    -802,  -802,  -802,  1930,   460,  1930,  4222,   421,  4450,  4450,
-    4450,  -802,  -802,  -802,  -802,  -802,   129,   132,    42,   399,
-    -802,  -802,  -802,  -802,  -802,   441,   442,  -802,   403,   404,
-     410,   412,   413,   415,   416,  -802,   417,   418,   419,  2491,
-      51,  -802,   424,   137,  -802,   176,   207,  -802,  -802,  -802,
-    -802,  1338,   408,  -802,  2078,  -802,  -802,   420,  -802,  -802,
+     380,  -802,  -802,   444,   153,   329,   329,   381,  2998,   521,
+    3250,  -802,  -802,  -802,  -802,   527,  -802,  -802,  -802,  -802,
+     462,   347,  -802,   347,  -802,   403,   385,  -802,   433,   533,
+    -802,   435,   532,  4450,  -802,  -802,     9,    86,  -802,   410,
+    -802,  -802,  -802,  1930,   460,  1930,  4222,   425,  4450,  4450,
+    4450,  -802,  -802,  -802,  -802,  -802,   129,   132,    42,   402,
+    -802,  -802,  -802,  -802,  -802,   441,   442,  -802,   404,   407,
+     409,   412,   413,   415,   416,  -802,   417,   418,   419,  2491,
+      51,  -802,   427,   137,  -802,   176,   207,  -802,  -802,  -802,
+    -802,  1338,   420,  -802,  2078,  -802,  -802,   421,  -802,  -802,
     -802,  -802,  -802,  -802,  -802,  1930,  -802,  1930,  -802,  1930,
-    -802,  4832,  4900,   436,  -802,  -802,  -802,  -802,  -802,   466,
-     515,  -802,  4450,   566,  -802,    46,  -802,  -802,   439,  -802,
-     146,  -802,  -802,  2618,  4450,  -802,  -802,  -802,  -802,   443,
-     446,  -802,    82,  4450,   337,    80,  -802,   545,   504,  -802,
-     430,  -802,  -802,  -802,   149,   433,   303,  -802,   454,  -802,
-      46,  -802,   574,    52,  -802,   435,  -802,  -802,   575,   577,
-    4450,  4450,  4450,   447,  4450,   444,   448,  4450,   579,   450,
+    -802,  4832,  4900,   434,  -802,  -802,  -802,  -802,  -802,   469,
+     516,  -802,  4450,   567,  -802,    46,  -802,  -802,   443,  -802,
+     146,  -802,  -802,  2618,  4450,  -802,  -802,  -802,  -802,   446,
+     445,  -802,    82,  4450,   337,    80,  -802,   546,   504,  -802,
+     431,  -802,  -802,  -802,   149,   436,   303,  -802,   454,  -802,
+      46,  -802,   574,    52,  -802,   438,  -802,  -802,   576,   577,
+    4450,  4450,  4450,   447,  4450,   448,   450,  4450,   583,   467,
       94,  2491,  2491,  2491,    80,    30,    77,    23,    92,    80,
-      80,    80,    80,    56,    46,   468,    46,    46,    46,    46,
-      46,    46,    65,   457,  -802,  -802,  5171,  5206,  4932,  2998,
-    1338,   469,   586,   465,   533,  -802,   151,   471,    -2,   503,
-    -802,  -802,  -802,  -802,  4450,   472,  -802,   600,  4450,    39,
-    -802,  -802,  -802,  -802,  -802,  -802,  3250,  -802,  -802,  4222,
+      80,    80,    80,    56,    46,   461,    46,    46,    46,    46,
+      46,    46,    65,   457,  -802,  -802,  5171,  5206,  4932,  3124,
+    1338,   468,   587,   465,   534,  -802,   151,   470,    -2,   502,
+    -802,  -802,  -802,  -802,  4450,   471,  -802,   611,  4450,    39,
+    -802,  -802,  -802,  -802,  -802,  -802,  3376,  -802,  -802,  4222,
       69,   -48,  -802,  -802,  -802,  -802,  -802,  -802,  -802,  -802,
-    -802,  -802,  -802,   498,  -802,  -802,  -802,  -802,  4336,    69,
-    -802,  -802,   477,   483,    51,   484,   487,   493,  -802,  -802,
-     495,   497,  -802,  -802,   137,   494,  -802,   506,   517,  -802,
-      68,  -802,   538,  -802,  -802,  -802,  -802,  -802,  -802,  -802,
+    -802,  -802,  -802,   506,  -802,  -802,  -802,  -802,  4336,    69,
+    -802,  -802,   472,   477,    51,   483,   484,   486,  -802,  -802,
+     493,   495,  -802,  -802,   137,   505,  -802,   515,   517,  -802,
+      68,  -802,   554,  -802,  -802,  -802,  -802,  -802,  -802,  -802,
     -802,  -802,  -802,  -802,  -802,  -802,  -802,    46,    37,   518,
-      46,  -802,  -802,  -802,  -802,  -802,  -802,    46,   502,  3754,
-     507,  -802,  -802,   509,  -802,   -22,   550,  -802,   621,   596,
-     599,  -802,  4450,  -802,    46,  -802,  -802,  -802,   526,   159,
-    -802,   650,  -802,  -802,  -802,   169,   513,    81,   512,  -802,
-    -802,    40,   173,  -802,   659,   433,  -802,  -802,  -802,  -802,
+      46,  -802,  -802,  -802,  -802,  -802,  -802,    46,   503,  3754,
+     501,  -802,  -802,   508,  -802,   -22,   572,  -802,   622,   602,
+     600,  -802,  4450,  -802,    46,  -802,  -802,  -802,   526,   159,
+    -802,   652,  -802,  -802,  -802,   169,   514,    81,   513,  -802,
+    -802,    40,   173,  -802,   661,   436,  -802,  -802,  -802,  -802,
     -802,   643,  -802,  -802,  -802,  -802,  -802,  -802,  -802,  -802,
-      80,    80,  -802,   175,   188,  -802,   534,  -802,    68,    46,
-     201,   536,    46,  -802,  -802,  -802,   519,  -802,  -802,  2078,
-    4450,   641,   598,  3376,   589,  3502,   460,    51,   528,  -802,
-     205,    46,  -802,  4450,   529,  -802,   530,  -802,  -802,  3376,
-    -802,    69,   541,   537,  -802,  -802,  -802,  -802,  -802,  -802,
+      80,    80,  -802,   175,   188,  -802,   536,  -802,    68,    46,
+     201,   538,    46,  -802,  -802,  -802,   522,  -802,  -802,  2078,
+    4450,   641,   601,  3502,   589,  3628,   460,    51,   528,  -802,
+     205,    46,  -802,  4450,   529,  -802,   530,  -802,  -802,  3502,
+    -802,    69,   548,   537,  -802,  -802,  -802,  -802,  -802,  -802,
     -802,  -802,   671,    46,   210,   217,  -802,  -802,    46,   222,
-    3754,   239,  3376,   676,  -802,  -802,   542,   653,  -802,   504,
-    -802,  -802,  -802,  -802,  -802,  -802,  -802,  -802,   682,   659,
-    -802,  -802,  -802,  -802,  -802,  -802,  -802,   544,   512,   547,
-    3376,  3376,   337,  -802,  -802,   551,   689,  -802,   512,  -802,
-    2078,  -802,   241,   549,  -802
+    3754,   239,  3502,   677,  -802,  -802,   541,   662,  -802,   504,
+    -802,  -802,  -802,  -802,  -802,  -802,  -802,  -802,   685,   661,
+    -802,  -802,  -802,  -802,  -802,  -802,  -802,   545,   513,   547,
+    3502,  3502,   337,  -802,  -802,   550,   693,  -802,   513,  -802,
+    2078,  -802,   241,   552,  -802
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -965,20 +965,20 @@ static const yytype_uint16 yydefact[] =
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -802,  -802,  -802,   -13,    -4,  -802,   449,  -802,   296,  -802,
-    -802,  -177,  -802,  -802,  -802,   127,    45,   396,  -202,  -802,
-     -12,  -802,  -385,  -802,  -802,  -513,  -138,  -683,  -802,   -47,
-    -581,  -570,  -119,  -802,  -802,  -802,  -802,  -802,  -802,  -135,
-    -802,  -801,  -147,  -602,  -802,  -272,  -802,  -802,   119,  -802,
-    -137,   118,  -802,  -278,   163,  -802,  -802,   289,    54,  -802,
-    -220,  -802,  -802,  -802,  -802,  -802,   260,  -802,    55,   251,
-    -802,  -802,  -802,  -802,  -802,    25,  -802,  -802,   -76,  -802,
-    -506,  -802,  -802,  -169,  -802,  -802,  -802,   214,  -802,  -802,
+    -802,  -802,  -802,   -13,    -4,  -802,   449,  -802,   299,  -802,
+    -802,  -175,  -802,  -802,  -802,   127,    45,   398,  -202,  -802,
+     -12,  -802,  -385,  -802,  -802,  -513,  -136,  -683,  -802,   -47,
+    -581,  -570,  -117,  -802,  -802,  -802,  -802,  -802,  -802,  -134,
+    -802,  -801,  -146,  -602,  -802,  -272,  -802,  -802,   122,  -802,
+    -132,   118,  -802,  -278,   163,  -802,  -802,   289,    54,  -802,
+    -220,  -802,  -802,  -802,  -802,  -802,   260,  -802,    55,   259,
+    -802,  -802,  -802,  -802,  -802,    25,  -802,  -802,   -75,  -802,
+    -506,  -802,  -802,  -168,  -802,  -802,  -802,   214,  -802,  -802,
     -802,    15,  -802,  -802,  -802,  -802,  -802,  -802,  -802,  -802,
      133,  -802,  -802,  -802,  -802,  -802,  -802,    66,  -802,  -802,
-    -802,   712,  -802,  -802,  -802,  -802,  -802,  -802,  -802,  -802,
+    -802,   714,  -802,  -802,  -802,  -802,  -802,  -802,  -802,  -802,
     -802,  -802,  -802,  -802,   423,  -802,  -802,  -802,  -802,  -802,
-    -802,  -802,   -49,  -358,  -802,   429,  -802,   437,  -802,  -802,
+    -802,  -802,   -26,  -358,  -802,   429,  -802,   451,  -802,  -802,
      258,  -802,   255,  -802,  -802,  -802
 };
 
@@ -1049,42 +1049,42 @@ static const yytype_int16 yytable[] =
      554,   288,   540,   465,   466,   245,   409,   289,   246,   290,
      248,   291,   416,   292,   330,   419,   420,   557,   423,   424,
      249,   338,   339,   711,  -470,   350,   351,   355,   314,   356,
-     361,   379,   313,   434,   849,   365,   300,   439,   574,   394,
+     361,   586,   313,   434,   849,   365,   300,   439,   574,   379,
      382,   441,   442,   443,   444,   445,   446,   447,   449,   450,
-     451,   452,   453,   454,   455,   456,   457,   458,   459,   395,
-     400,   398,   402,   415,   425,   464,   314,   426,   427,   428,
-     432,   460,   186,   469,   476,   470,   347,   467,   468,   480,
-     481,   389,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   483,   547,   484,   547,   506,   599,
-     510,   439,   508,   509,   526,   518,   548,   549,   550,  -511,
-     558,   547,   612,   520,   616,   617,   618,   315,   316,   317,
+     451,   452,   453,   454,   455,   456,   457,   458,   459,   394,
+     395,   398,   400,   402,   415,   464,   314,   432,   425,   426,
+     427,   460,   186,   428,   476,   469,   347,   467,   468,   470,
+     480,   389,   318,   319,   320,   321,   322,   323,   324,   325,
+     326,   327,   328,   329,   481,   547,   483,   547,   484,   599,
+     506,   439,   508,   509,   510,   526,   548,   518,   549,   550,
+    -511,   547,   612,   520,   616,   617,   618,   315,   316,   317,
      318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   298,   577,   547,   521,   583,   584,   585,   588,
-     511,   578,   590,   594,   593,   540,   595,   596,   597,   598,
-     605,   522,   523,   615,   607,   571,   572,   627,   628,   629,
-     630,   631,   547,   547,   641,   690,   663,   632,   694,   633,
-     634,   881,   635,   636,   637,   638,   639,   670,   665,   669,
-     672,   675,   677,   715,   696,   688,   687,   331,   674,   503,
-     700,   713,   716,   720,   719,   721,   524,   731,   726,   685,
-     485,   777,   728,   779,   782,   787,   729,   737,   732,   496,
-     744,   747,   749,   751,   753,   755,   769,   759,   792,   761,
-     762,   763,   764,   765,   766,   760,   807,   776,   784,   791,
-     825,   369,   575,   369,   643,   813,   722,   723,   724,   234,
-     724,   814,   815,   724,   841,   816,   820,   540,   540,   540,
-     919,   817,   922,   818,   235,   819,   236,   821,   829,   832,
-     843,   844,   237,   389,   313,   838,   839,   845,   854,   851,
-     856,   859,   862,   717,   873,   574,   878,   238,   880,   439,
-     882,   883,   389,   887,   898,   239,   890,   894,   895,   900,
-     788,   909,   911,   666,   599,   667,   899,   668,   314,   240,
-     913,   910,   540,   915,   921,   612,   916,   924,   920,   241,
-     552,   242,   243,   906,   313,   438,   671,   888,   376,   875,
-     826,   889,   896,   686,   809,   775,   893,   664,   244,   573,
-     831,   589,   245,   774,   800,   246,   247,   248,   587,   865,
-     914,   252,   624,   848,   812,   435,   692,   249,   314,   315,
+     328,   329,   298,   577,   547,   521,   584,   558,   585,   583,
+     588,   578,   511,   590,   594,   540,   593,   595,   596,   597,
+     598,   522,   523,   605,   607,   571,   572,   615,   628,   629,
+     627,   630,   547,   547,   631,   690,   632,   641,   694,   633,
+     634,   881,   635,   636,   637,   638,   639,   669,   663,   665,
+     670,   672,   675,   715,   688,   696,   677,   331,   674,   687,
+     503,   713,   716,   700,   720,   721,   524,   719,   726,   685,
+     485,   731,   777,   779,   787,   782,   728,   737,   729,   496,
+     744,   747,   749,   751,   753,   755,   769,   759,   760,   761,
+     762,   763,   764,   765,   766,   732,   776,   784,   791,   792,
+     813,   369,   575,   369,   807,   814,   722,   723,   724,   234,
+     724,   815,   816,   724,   817,   643,   825,   540,   540,   540,
+     919,   818,   922,   819,   235,   820,   236,   821,   829,   838,
+     832,   843,   237,   389,   313,   839,   841,   844,   845,   851,
+     854,   856,   859,   717,   862,   574,   873,   238,   878,   439,
+     882,   880,   389,   887,   883,   239,   890,   894,   895,   900,
+     788,   898,   909,   666,   599,   667,   899,   668,   314,   240,
+     910,   911,   540,   913,   915,   612,   916,   920,   921,   241,
+     924,   242,   243,   552,   313,   906,   671,   438,   376,   888,
+     826,   875,   889,   896,   809,   775,   686,   664,   244,   573,
+     831,   893,   245,   774,   800,   246,   247,   248,   587,   589,
+     865,   914,   624,   252,   812,   435,   692,   249,   314,   315,
      316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   793,   461,   448,     0,   564,   565,
+     326,   327,   328,   329,   793,   461,   848,     0,   564,   565,
      610,   606,     0,     0,     0,   835,     0,     0,     0,     0,
-       0,     0,   313,   866,   868,     0,     0,     0,   847,     0,
+     448,     0,   313,   866,   868,     0,     0,     0,   847,     0,
        0,     0,   876,     0,     0,     0,     0,     0,   439,   315,
      316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
      326,   327,   328,   329,   892,     0,   314,     0,   566,   567,
@@ -1307,7 +1307,7 @@ static const yytype_int16 yytable[] =
      137,   138,   139,     0,   140,   141,   142,   143,   144,   145,
      146,   147,   148,   149,   150,   151,   152,   153,   154,   474,
      155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,    67,     0,   383,     0,     0,     0,     0,     0,     0,
+     165,    67,     0,   383,     0,     0,   471,     0,     0,     0,
        0,     0,   475,    68,    69,    70,    71,    72,     0,    73,
       74,    75,    76,    77,    78,    79,    80,     0,    81,    82,
       83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
@@ -1319,32 +1319,32 @@ static const yytype_int16 yytable[] =
      132,   133,     0,   134,   135,   136,   137,   138,   139,     0,
      140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
      150,   151,   152,   153,   154,     0,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,    67,     0,   343,
-     344,     0,   345,     0,     0,     0,     0,     0,   475,    68,
+     159,   160,   161,   162,   163,   164,   165,    67,     0,   383,
+       0,     0,     0,     0,     0,     0,     0,     0,   475,    68,
       69,    70,    71,    72,     0,    73,    74,    75,    76,    77,
       78,    79,    80,     0,    81,    82,    83,    84,    85,    86,
       87,    88,    89,    90,    91,    92,    93,    94,     0,    95,
       96,     0,     0,    97,    98,    99,     0,   100,   101,   102,
      103,   104,   105,   106,     0,     0,   107,   108,   109,   110,
      111,   112,     0,   113,   114,   115,   116,     0,   117,   118,
-     119,   120,     0,   121,   122,   123,   346,   124,     0,   125,
+     119,   120,     0,   121,   122,   123,     0,   124,     0,   125,
      126,   127,   128,   129,   130,   131,   132,   133,     0,   134,
      135,   136,   137,   138,   139,     0,   140,   141,   142,   143,
      144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
      154,     0,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,    67,   527,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    68,    69,    70,    71,    72,
-       0,    73,    74,    75,    76,    77,    78,   530,    80,     0,
-      81,    82,    83,    84,    85,    86,    87,   531,    89,    90,
-      91,    92,    93,    94,     0,   532,    96,   533,     0,    97,
-      98,    99,     0,   100,   101,   102,   534,   104,   105,   106,
-     535,     0,   107,   108,   109,   110,   536,   112,     0,   113,
+     163,   164,   165,    67,     0,   343,   344,     0,   345,     0,
+       0,     0,     0,     0,   475,    68,    69,    70,    71,    72,
+       0,    73,    74,    75,    76,    77,    78,    79,    80,     0,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,     0,    95,    96,     0,     0,    97,
+      98,    99,     0,   100,   101,   102,   103,   104,   105,   106,
+       0,     0,   107,   108,   109,   110,   111,   112,     0,   113,
      114,   115,   116,     0,   117,   118,   119,   120,     0,   121,
-     122,   123,     0,   124,     0,   125,   126,   127,   128,   129,
-     796,   131,   132,   133,     0,   134,   135,   136,   137,   138,
+     122,   123,   346,   124,     0,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,     0,   134,   135,   136,   137,   138,
      139,     0,   140,   141,   142,   143,   144,   145,   146,   147,
      148,   149,   150,   151,   152,   153,   154,     0,   155,   156,
-     157,   158,   159,   160,   161,   538,   163,   164,   165,    67,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,    67,
      527,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,    68,    69,    70,    71,    72,     0,    73,    74,    75,
       76,    77,    78,   530,    80,     0,    81,    82,    83,    84,
@@ -1353,13 +1353,13 @@ static const yytype_int16 yytable[] =
      101,   102,   534,   104,   105,   106,   535,     0,   107,   108,
      109,   110,   536,   112,     0,   113,   114,   115,   116,     0,
      117,   118,   119,   120,     0,   121,   122,   123,     0,   124,
-       0,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+       0,   125,   126,   127,   128,   129,   796,   131,   132,   133,
        0,   134,   135,   136,   137,   138,   139,     0,   140,   141,
      142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
      152,   153,   154,     0,   155,   156,   157,   158,   159,   160,
      161,   538,   163,   164,   165,    67,   527,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,    68,    69,    70,
-     528,   529,     0,    73,    74,    75,    76,    77,    78,   530,
+      71,    72,     0,    73,    74,    75,    76,    77,    78,   530,
       80,     0,    81,    82,    83,    84,    85,    86,    87,   531,
       89,    90,    91,    92,    93,    94,     0,   532,    96,   533,
        0,    97,    98,    99,     0,   100,   101,   102,   534,   104,
@@ -1370,19 +1370,19 @@ static const yytype_int16 yytable[] =
      137,   138,   139,     0,   140,   141,   142,   143,   144,   145,
      146,   147,   148,   149,   150,   151,   152,   153,   154,     0,
      155,   156,   157,   158,   159,   160,   161,   538,   163,   164,
-     165,    67,     0,   586,     0,     0,   471,     0,     0,     0,
-       0,     0,     0,    68,    69,    70,    71,    72,     0,    73,
-      74,    75,    76,    77,    78,    79,    80,     0,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,     0,    95,    96,     0,     0,    97,    98,    99,
-       0,   100,   101,   102,   103,   104,   105,   106,     0,     0,
-     107,   108,   109,   110,   111,   112,     0,   113,   114,   115,
+     165,    67,   527,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    68,    69,    70,   528,   529,     0,    73,
+      74,    75,    76,    77,    78,   530,    80,     0,    81,    82,
+      83,    84,    85,    86,    87,   531,    89,    90,    91,    92,
+      93,    94,     0,   532,    96,   533,     0,    97,    98,    99,
+       0,   100,   101,   102,   534,   104,   105,   106,   535,     0,
+     107,   108,   109,   110,   536,   112,     0,   113,   114,   115,
      116,     0,   117,   118,   119,   120,     0,   121,   122,   123,
        0,   124,     0,   125,   126,   127,   128,   129,   130,   131,
      132,   133,     0,   134,   135,   136,   137,   138,   139,     0,
      140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
      150,   151,   152,   153,   154,     0,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,    67,     0,   833,
+     159,   160,   161,   538,   163,   164,   165,    67,     0,   833,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    68,
       69,    70,    71,    72,     0,    73,    74,    75,    76,    77,
       78,    79,    80,     0,    81,    82,    83,    84,    85,    86,
@@ -1596,42 +1596,42 @@ static const yytype_int16 yycheck[] =
      149,   147,   396,   338,   339,   109,   278,   147,   112,   147,
      114,   147,   284,   147,   147,   287,   288,   411,   290,   291,
      124,   133,   103,   110,   116,   133,   116,   103,    78,    72,
-      83,    93,    44,   305,   782,   123,   430,   309,   432,    98,
+      83,   468,    44,   305,   782,   123,   430,   309,   432,    93,
      115,   313,   314,   315,   316,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,   326,   327,   328,   329,   330,   119,
-      52,   119,   107,   148,   148,   337,    78,   147,   147,   147,
-     133,     5,    10,    54,   468,   140,   470,   133,   133,    69,
-     109,   518,   132,   133,   134,   135,   136,   137,   138,   139,
-     140,   141,   142,   143,   109,   843,     8,   845,   147,   493,
-     100,   373,    34,    34,     8,   149,     8,     8,     8,   133,
-     148,   859,   506,    27,   508,   509,   510,   129,   130,   131,
+     322,   323,   324,   325,   326,   327,   328,   329,   330,    98,
+     119,   119,    52,   107,   148,   337,    78,   133,   148,   147,
+     147,     5,    10,   147,   468,    54,   470,   133,   133,   140,
+      69,   518,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   109,   843,   109,   845,     8,   493,
+     147,   373,    34,    34,   100,     8,     8,   149,     8,     8,
+     133,   859,   506,    27,   508,   509,   510,   129,   130,   131,
      132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
-     142,   143,   404,   153,   882,    49,   149,    82,   147,     9,
-       5,   153,    71,   149,   133,   539,   104,     5,   104,     8,
-     133,    65,    66,   122,    84,   427,   428,   148,   107,   107,
-     147,   147,   910,   911,   130,   602,   148,   147,   605,   147,
-     147,   839,   147,   147,   147,   147,   147,   101,   148,   133,
-      55,     5,   133,   620,    29,   129,   133,    73,   582,   149,
-     147,   127,     8,     8,   149,     8,   110,     8,   141,   593,
-     594,     5,   148,   128,    61,    92,   148,   644,   148,   603,
-     647,   648,   649,   650,   651,   652,   149,   654,     8,   656,
-     657,   658,   659,   660,   661,   147,   118,   148,   147,   147,
-      82,   503,   669,   505,   130,   148,   630,   631,   632,    16,
-     634,   148,   148,   637,    84,   148,   130,   641,   642,   643,
-     912,   148,   920,   148,    31,   148,    33,   130,   130,   147,
-      29,    55,    39,   700,    44,   148,   147,    58,     8,   133,
-     147,   149,     3,    20,   130,   669,   130,    54,   149,   551,
-      29,    73,   719,    84,   133,    62,   148,   148,   148,     8,
-     684,     5,    29,   565,   688,   567,   149,   569,    78,    76,
-       8,   149,   696,   149,     5,   699,   149,   148,   147,    86,
-     404,    88,    89,   880,    44,   309,   579,   845,   259,   828,
-     757,   846,   859,   594,   718,   670,   853,   554,   105,   430,
-     767,   470,   109,   669,   699,   112,   113,   114,   468,   805,
-     899,    19,   518,   782,   719,   306,   603,   124,    78,   129,
+     142,   143,   404,   153,   882,    49,    82,   148,   147,   149,
+       9,   153,     5,    71,   149,   539,   133,   104,     5,   104,
+       8,    65,    66,   133,    84,   427,   428,   122,   107,   107,
+     148,   147,   910,   911,   147,   602,   147,   130,   605,   147,
+     147,   839,   147,   147,   147,   147,   147,   133,   148,   148,
+     101,    55,     5,   620,   129,    29,   133,    73,   582,   133,
+     149,   127,     8,   147,     8,     8,   110,   149,   141,   593,
+     594,     8,     5,   128,    92,    61,   148,   644,   148,   603,
+     647,   648,   649,   650,   651,   652,   149,   654,   147,   656,
+     657,   658,   659,   660,   661,   148,   148,   147,   147,     8,
+     148,   503,   669,   505,   118,   148,   630,   631,   632,    16,
+     634,   148,   148,   637,   148,   130,    82,   641,   642,   643,
+     912,   148,   920,   148,    31,   130,    33,   130,   130,   148,
+     147,    29,    39,   700,    44,   147,    84,    55,    58,   133,
+       8,   147,   149,    20,     3,   669,   130,    54,   130,   551,
+      29,   149,   719,    84,    73,    62,   148,   148,   148,     8,
+     684,   133,     5,   565,   688,   567,   149,   569,    78,    76,
+     149,    29,   696,     8,   149,   699,   149,   147,     5,    86,
+     148,    88,    89,   404,    44,   880,   579,   309,   259,   845,
+     757,   828,   846,   859,   718,   670,   594,   554,   105,   430,
+     767,   853,   109,   669,   699,   112,   113,   114,   468,   470,
+     805,   899,   518,    19,   719,   306,   603,   124,    78,   129,
      130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-     140,   141,   142,   143,   688,   332,   319,    -1,   148,   149,
+     140,   141,   142,   143,   688,   332,   782,    -1,   148,   149,
      505,   503,    -1,    -1,    -1,   769,    -1,    -1,    -1,    -1,
-      -1,    -1,    44,   820,   821,    -1,    -1,    -1,   782,    -1,
+     319,    -1,    44,   820,   821,    -1,    -1,    -1,   782,    -1,
       -1,    -1,   829,    -1,    -1,    -1,    -1,    -1,   670,   129,
      130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
      140,   141,   142,   143,   851,    -1,    78,    -1,   148,   149,
@@ -1854,7 +1854,7 @@ static const yytype_int16 yycheck[] =
       98,    99,   100,    -1,   102,   103,   104,   105,   106,   107,
      108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
      118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,     3,    -1,     5,    -1,    -1,    -1,    -1,    -1,    -1,
+     128,     3,    -1,     5,    -1,    -1,     8,    -1,    -1,    -1,
       -1,    -1,   140,    15,    16,    17,    18,    19,    -1,    21,
       22,    23,    24,    25,    26,    27,    28,    -1,    30,    31,
       32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
@@ -1867,27 +1867,27 @@ static const yytype_int16 yycheck[] =
      102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
      112,   113,   114,   115,   116,    -1,   118,   119,   120,   121,
      122,   123,   124,   125,   126,   127,   128,     3,    -1,     5,
-       6,    -1,     8,    -1,    -1,    -1,    -1,    -1,   140,    15,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   140,    15,
       16,    17,    18,    19,    -1,    21,    22,    23,    24,    25,
       26,    27,    28,    -1,    30,    31,    32,    33,    34,    35,
       36,    37,    38,    39,    40,    41,    42,    43,    -1,    45,
       46,    -1,    -1,    49,    50,    51,    -1,    53,    54,    55,
       56,    57,    58,    59,    -1,    -1,    62,    63,    64,    65,
       66,    67,    -1,    69,    70,    71,    72,    -1,    74,    75,
-      76,    77,    -1,    79,    80,    81,    82,    83,    -1,    85,
+      76,    77,    -1,    79,    80,    81,    -1,    83,    -1,    85,
       86,    87,    88,    89,    90,    91,    92,    93,    -1,    95,
       96,    97,    98,    99,   100,    -1,   102,   103,   104,   105,
      106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
      116,    -1,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,     3,     4,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    15,    16,    17,    18,    19,
+     126,   127,   128,     3,    -1,     5,     6,    -1,     8,    -1,
+      -1,    -1,    -1,    -1,   140,    15,    16,    17,    18,    19,
       -1,    21,    22,    23,    24,    25,    26,    27,    28,    -1,
       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    -1,    45,    46,    47,    -1,    49,
+      40,    41,    42,    43,    -1,    45,    46,    -1,    -1,    49,
       50,    51,    -1,    53,    54,    55,    56,    57,    58,    59,
-      60,    -1,    62,    63,    64,    65,    66,    67,    -1,    69,
+      -1,    -1,    62,    63,    64,    65,    66,    67,    -1,    69,
       70,    71,    72,    -1,    74,    75,    76,    77,    -1,    79,
-      80,    81,    -1,    83,    -1,    85,    86,    87,    88,    89,
+      80,    81,    82,    83,    -1,    85,    86,    87,    88,    89,
       90,    91,    92,    93,    -1,    95,    96,    97,    98,    99,
      100,    -1,   102,   103,   104,   105,   106,   107,   108,   109,
      110,   111,   112,   113,   114,   115,   116,    -1,   118,   119,
@@ -1917,12 +1917,12 @@ static const yytype_int16 yycheck[] =
       98,    99,   100,    -1,   102,   103,   104,   105,   106,   107,
      108,   109,   110,   111,   112,   113,   114,   115,   116,    -1,
      118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,     3,    -1,     5,    -1,    -1,     8,    -1,    -1,    -1,
+     128,     3,     4,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    15,    16,    17,    18,    19,    -1,    21,
       22,    23,    24,    25,    26,    27,    28,    -1,    30,    31,
       32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    -1,    45,    46,    -1,    -1,    49,    50,    51,
-      -1,    53,    54,    55,    56,    57,    58,    59,    -1,    -1,
+      42,    43,    -1,    45,    46,    47,    -1,    49,    50,    51,
+      -1,    53,    54,    55,    56,    57,    58,    59,    60,    -1,
       62,    63,    64,    65,    66,    67,    -1,    69,    70,    71,
       72,    -1,    74,    75,    76,    77,    -1,    79,    80,    81,
       -1,    83,    -1,    85,    86,    87,    88,    89,    90,    91,
@@ -2161,7 +2161,7 @@ static const yytype_uint16 yystos[] =
        8,   101,   162,   148,   149,   148,   148,   158,   148,   148,
      148,   148,   148,   148,   148,   149,   148,   149,   148,   149,
      148,   205,   205,   211,   158,   183,   212,   153,   153,   166,
-     175,   176,    51,   149,    82,   147,     5,   220,     9,   223,
+     175,   176,    51,   149,    82,   147,   183,   220,     9,   223,
       71,   214,   214,   133,   149,   104,     5,   104,     8,   158,
      260,   261,   133,   149,   176,   133,   294,    84,   193,   194,
      296,    60,   158,   229,   230,   122,   158,   158,   158,   148,

test/settings.inc

@@ -224,7 +224,7 @@ function PublishLocals ( &$locals, $benchmark )
 
 	if ( $windows ) {
 		$ext = ".exe";
-		$pref = $benchmark ? "RelWithDebInfo\\" : "Debug\\";
+		$pref = $benchmark ? "RelWithDebInfo\\" : "";
 	} else
 	{
 		$ext = '';

test/test_229/test.xml

@@ -50,6 +50,11 @@ index rt
 <sphinxql>SHOW STATUS LIKE 'qcache_cached%'</sphinxql>
 <sphinxql>SHOW STATUS LIKE 'qcache_hits%'</sphinxql>
 <sphinxql>SELECT *,WEIGHT() FROM rt WHERE MATCH('another') OPTION ranker=expr('-1')</sphinxql>
+
+<!-- regression negative value for set global -->
+<sphinxql>SET GLOBAL query_log_min_msec=-1</sphinxql>
+<sphinxql>SET GLOBAL query_log_min_msec=1</sphinxql>
+<sphinxql>SET GLOBAL query_log_min_msec=0</sphinxql>
 </sphqueries>
 
 </test>