PageRenderTime 33ms CodeModel.GetById 13ms RepoModel.GetById 1ms app.codeStats 0ms

/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch

https://gitlab.com/cronmod-dev/buildroot
Patch | 1421 lines | 1380 code | 41 blank | 0 comment | 0 complexity | fa271adb96185f54e2f1e960ed777e7e MD5 | raw file
    

  1. fix the yacc code in mysql
    2. 

  2. 

  3. Signed-off-by: Marcelo Gutierrez (UTN/FRH) <kuyurix@gmail.com>
    4. 

  4. ---
    5. 

  5. diff -uNr mysql-5.1.73.orig/sql/sql_lex.cc mysql-5.1.73/sql/sql_lex.cc
    6. 

  6. --- mysql-5.1.73.orig/sql/sql_lex.cc	2013-11-04 18:52:27.000000000 +0000
    7. 

  7. +++ mysql-5.1.73/sql/sql_lex.cc	2014-02-12 14:12:04.244111625 +0000
    8. 

  8. @@ -775,14 +775,13 @@
    9. 

  9.  				(which can't be followed by a signed number)
    10. 

  10.  */
    11. 

  11.  
    12. 

  12. -int MYSQLlex(void *arg, void *yythd)
    13. 

  13. +int MYSQLlex(void *arg, THD *thd)
    14. 

  14.  {
    15. 

  15.    reg1	uchar c= 0;
    16. 

  16.    bool comment_closed;
    17. 

  17.    int	tokval, result_state;
    18. 

  18.    uint length;
    19. 

  19.    enum my_lex_states state;
    20. 

  20. -  THD *thd= (THD *)yythd;
    21. 

  21.    Lex_input_stream *lip= & thd->m_parser_state->m_lip;
    22. 

  22.    LEX *lex= thd->lex;
    23. 

  23.    YYSTYPE *yylval=(YYSTYPE*) arg;
    24. 

  24. diff -uNr mysql-5.1.73.orig/sql/sql_lex.h mysql-5.1.73/sql/sql_lex.h
    25. 

  25. --- mysql-5.1.73.orig/sql/sql_lex.h	2013-11-04 18:52:27.000000000 +0000
    26. 

  26. +++ mysql-5.1.73/sql/sql_lex.h	2014-02-12 14:17:19.424106423 +0000
    27. 

  27. @@ -2072,7 +2072,7 @@
    28. 

  28.  extern void lex_free(void);
    29. 

  29.  extern void lex_start(THD *thd);
    30. 

  30.  extern void lex_end(LEX *lex);
    31. 

  31. -extern int MYSQLlex(void *arg, void *yythd);
    32. 

  32. +extern int MYSQLlex(void *arg, THD *thd);
    33. 

  33.  
    34. 

  34.  extern void trim_whitespace(CHARSET_INFO *cs, LEX_STRING *str);
    35. 

  35.  
    36. 

  36. diff -uNr mysql-5.1.73.orig/sql/sql_parse.cc mysql-5.1.73/sql/sql_parse.cc
    37. 

  37. --- mysql-5.1.73.orig/sql/sql_parse.cc	2013-11-04 18:52:27.000000000 +0000
    38. 

  38. +++ mysql-5.1.73/sql/sql_parse.cc	2014-02-12 14:19:20.424104427 +0000
    39. 

  39. @@ -8012,7 +8012,7 @@
    40. 

  40.  }
    41. 

  41.  
    42. 

  42.  
    43. 

  43. -extern int MYSQLparse(void *thd); // from sql_yacc.cc
    44. 

  44. +extern int MYSQLparse(THD *thd); // from sql_yacc.cc
    45. 

  45.  
    46. 

  46.  
    47. 

  47.  /**
    48. 

  48. diff -uNr mysql-5.1.73.orig/sql/sql_yacc.yy mysql-5.1.73/sql/sql_yacc.yy
    49. 

  49. --- mysql-5.1.73.orig/sql/sql_yacc.yy	2013-11-04 18:52:27.000000000 +0000
    50. 

  50. +++ mysql-5.1.73/sql/sql_yacc.yy	2014-02-12 20:17:06.707750140 +0000
    51. 

  51. @@ -23,19 +23,13 @@
    52. 

  52.  */
    53. 

  53.  
    54. 

  54.  %{
    55. 

  55. -/* thd is passed as an argument to yyparse(), and subsequently to yylex().
    56. 

  56. -** The type will be void*, so it must be  cast to (THD*) when used.
    57. 

  57. -** Use the YYTHD macro for this.
    58. 

  58. -*/
    59. 

  59. -#define YYPARSE_PARAM yythd
    60. 

  60. -#define YYLEX_PARAM yythd
    61. 

  61. -#define YYTHD ((THD *)yythd)
    62. 

  62. -#define YYLIP (& YYTHD->m_parser_state->m_lip)
    63. 

  63. +
    64. 

  64. +#define YYLIP (& thd->m_parser_state->m_lip)
    65. 

  65.  
    66. 

  66.  #define MYSQL_YACC
    67. 

  67.  #define YYINITDEPTH 100
    68. 

  68.  #define YYMAXDEPTH 3200                        /* Because of 64K stack */
    69. 

  69. -#define Lex (YYTHD->lex)
    70. 

  70. +#define Lex (thd->lex)
    71. 

  71.  #define Select Lex->current_select
    72. 

  72.  #include "mysql_priv.h"
    73. 

  73.  #include "slave.h"
    74. 

  74. @@ -55,7 +49,7 @@
    75. 

  75.  #pragma warning (disable : 4065)
    76. 

  76.  #endif
    77. 

  77.  
    78. 

  78. -int yylex(void *yylval, void *yythd);
    79. 

  79. +int yylex(void *yylval, THD *thd);
    80. 

  80.  
    81. 

  81.  const LEX_STRING null_lex_str= {0,0};
    82. 

  82.  
    83. 

  83. @@ -64,7 +58,7 @@
    84. 

  84.      ulong val= *(F);                          \
    85. 

  85.      if (my_yyoverflow((B), (D), &val))        \
    86. 

  86.      {                                         \
    87. 

  87. -      yyerror((char*) (A));                   \
    88. 

  88. +      yyerror(current_thd, (char*) (A));      \
    89. 

  89.        return 2;                               \
    90. 

  90.      }                                         \
    91. 

  91.      else                                      \
    92. 

  92. @@ -76,7 +70,7 @@
    93. 

  93.  #define MYSQL_YYABORT                         \
    94. 

  94.    do                                          \
    95. 

  95.    {                                           \
    96. 

  96. -    LEX::cleanup_lex_after_parse_error(YYTHD);\
    97. 

  97. +    LEX::cleanup_lex_after_parse_error(thd);\
    98. 

  98.      YYABORT;                                  \
    99. 

  99.    } while (0)
    100. 

  100.  
    101. 

  101. @@ -159,9 +153,8 @@
    102. 

  102.    to abort from the parser.
    103. 

  103.  */
    104. 

  104.  
    105. 

  105. -void MYSQLerror(const char *s)
    106. 

  106. +void MYSQLerror(THD *thd, const char *s)
    107. 

  107.  {
    108. 

  108. -  THD *thd= current_thd;
    109. 

  109.  
    110. 

  110.    /*
    111. 

  111.      Restore the original LEX if it was replaced when parsing
    112. 

  112. @@ -675,7 +668,10 @@
    113. 

  113.  bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
    114. 

  114.  %}
    115. 

  115.  
    116. 

  116. -%pure_parser                                    /* We have threads */
    117. 

  117. +/* We have threads */
    118. 

  118. +%define api.pure
    119. 

  119. +%parse-param { THD *thd }
    120. 

  120. +%lex-param { THD *thd }
    121. 

  121.  /*
    122. 

  122.    Currently there are 169 shift/reduce conflicts.
    123. 

  123.    We should not introduce new conflicts any more.
    124. 

  124. @@ -1516,7 +1512,6 @@
    125. 

  125.  query:
    126. 

  126.            END_OF_INPUT
    127. 

  127.            {
    128. 

  128. -            THD *thd= YYTHD;
    129. 

  129.              if (!thd->bootstrap &&
    130. 

  130.                (!(thd->lex->select_lex.options & OPTION_FOUND_COMMENT)))
    131. 

  131.              {
    132. 

  132. @@ -1530,7 +1525,7 @@
    133. 

  133.            {
    134. 

  134.              Lex_input_stream *lip = YYLIP;
    135. 

  135.  
    136. 

  136. -            if ((YYTHD->client_capabilities & CLIENT_MULTI_QUERIES) &&
    137. 

  137. +            if ((thd->client_capabilities & CLIENT_MULTI_QUERIES) &&
    138. 

  138.                  ! lip->stmt_prepare_mode &&
    139. 

  139.                  ! lip->eof())
    140. 

  140.              {
    141. 

  141. @@ -1626,7 +1621,6 @@
    142. 

  142.  deallocate:
    143. 

  143.            deallocate_or_drop PREPARE_SYM ident
    144. 

  144.            {
    145. 

  145. -            THD *thd= YYTHD;
    146. 

  146.              LEX *lex= thd->lex;
    147. 

  147.              lex->sql_command= SQLCOM_DEALLOCATE_PREPARE;
    148. 

  148.              lex->prepared_stmt_name= $3;
    149. 

  149. @@ -1641,7 +1635,6 @@
    150. 

  150.  prepare:
    151. 

  151.            PREPARE_SYM ident FROM prepare_src
    152. 

  152.            {
    153. 

  153. -            THD *thd= YYTHD;
    154. 

  154.              LEX *lex= thd->lex;
    155. 

  155.              lex->sql_command= SQLCOM_PREPARE;
    156. 

  156.              lex->prepared_stmt_name= $2;
    157. 

  157. @@ -1651,14 +1644,12 @@
    158. 

  158.  prepare_src:
    159. 

  159.            TEXT_STRING_sys
    160. 

  160.            {
    161. 

  161. -            THD *thd= YYTHD;
    162. 

  162.              LEX *lex= thd->lex;
    163. 

  163.              lex->prepared_stmt_code= $1;
    164. 

  164.              lex->prepared_stmt_code_is_varref= FALSE;
    165. 

  165.            }
    166. 

  166.          | '@' ident_or_text
    167. 

  167.            {
    168. 

  168. -            THD *thd= YYTHD;
    169. 

  169.              LEX *lex= thd->lex;
    170. 

  170.              lex->prepared_stmt_code= $2;
    171. 

  171.              lex->prepared_stmt_code_is_varref= TRUE;
    172. 

  172. @@ -1668,7 +1659,6 @@
    173. 

  173.  execute:
    174. 

  174.            EXECUTE_SYM ident
    175. 

  175.            {
    176. 

  176. -            THD *thd= YYTHD;
    177. 

  177.              LEX *lex= thd->lex;
    178. 

  178.              lex->sql_command= SQLCOM_EXECUTE;
    179. 

  179.              lex->prepared_stmt_name= $2;
    180. 

  180. @@ -1826,7 +1816,6 @@
    181. 

  181.  create:
    182. 

  182.            CREATE opt_table_options TABLE_SYM opt_if_not_exists table_ident
    183. 

  183.            {
    184. 

  184. -            THD *thd= YYTHD;
    185. 

  185.              LEX *lex= thd->lex;
    186. 

  186.              lex->sql_command= SQLCOM_CREATE_TABLE;
    187. 

  187.              if (!lex->select_lex.add_table_to_list(thd, $5, NULL,
    188. 

  188. @@ -1844,13 +1833,13 @@
    189. 

  189.            }
    190. 

  190.            create2
    191. 

  191.            {
    192. 

  192. -            LEX *lex= YYTHD->lex;
    193. 

  193. +            LEX *lex= thd->lex;
    194. 

  194.              lex->current_select= &lex->select_lex; 
    195. 

  195.              if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) &&
    196. 

  196.                  !lex->create_info.db_type)
    197. 

  197.              {
    198. 

  198. -              lex->create_info.db_type= ha_default_handlerton(YYTHD);
    199. 

  199. -              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
    200. 

  200. +              lex->create_info.db_type= ha_default_handlerton(thd);
    201. 

  201. +              push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
    202. 

  202.                                    ER_WARN_USING_OTHER_HANDLER,
    203. 

  203.                                    ER(ER_WARN_USING_OTHER_HANDLER),
    204. 

  204.                                    ha_resolve_storage_engine_name(lex->create_info.db_type),
    205. 

  205. @@ -1979,7 +1968,7 @@
    206. 

  206.  event_tail:
    207. 

  207.            remember_name EVENT_SYM opt_if_not_exists sp_name
    208. 

  208.            {
    209. 

  209. -            THD *thd= YYTHD;
    210. 

  210. +            THD *thd= thd;
    211. 

  211.              LEX *lex=Lex;
    212. 

  212.  
    213. 

  213.              lex->stmt_definition_begin= $1;
    214. 

  214. @@ -2046,7 +2035,7 @@
    215. 

  215.  ev_starts:
    216. 

  216.            /* empty */
    217. 

  217.            {
    218. 

  218. -            Item *item= new (YYTHD->mem_root) Item_func_now_local();
    219. 

  219. +            Item *item= new (thd->mem_root) Item_func_now_local();
    220. 

  220.              if (item == NULL)
    221. 

  221.                MYSQL_YYABORT;
    222. 

  222.              Lex->event_parse_data->item_starts= item;
    223. 

  223. @@ -2096,7 +2085,6 @@
    224. 

  224.  
    225. 

  225.  ev_sql_stmt:
    226. 

  226.            {
    227. 

  227. -            THD *thd= YYTHD;
    228. 

  228.              LEX *lex= thd->lex;
    229. 

  229.              Lex_input_stream *lip= YYLIP;
    230. 

  230.  
    231. 

  231. @@ -2139,7 +2127,6 @@
    232. 

  232.            }
    233. 

  233.            ev_sql_stmt_inner
    234. 

  234.            {
    235. 

  235. -            THD *thd= YYTHD;
    236. 

  236.              LEX *lex= thd->lex;
    237. 

  237.  
    238. 

  238.              /* return back to the original memory root ASAP */
    239. 

  239. @@ -2198,11 +2185,10 @@
    240. 

  240.              $$= new sp_name($1, $3, true);
    241. 

  241.              if ($$ == NULL)
    242. 

  242.                MYSQL_YYABORT;
    243. 

  243. -            $$->init_qname(YYTHD);
    244. 

  244. +            $$->init_qname(thd);
    245. 

  245.            }
    246. 

  246.          | ident
    247. 

  247.            {
    248. 

  248. -            THD *thd= YYTHD;
    249. 

  249.              LEX *lex= thd->lex;
    250. 

  250.              LEX_STRING db;
    251. 

  251.              if (check_routine_name(&$1))
    252. 

  252. @@ -2272,7 +2258,7 @@
    253. 

  253.              lex->sql_command= SQLCOM_CALL;
    254. 

  254.              lex->spname= $2;
    255. 

  255.              lex->value_list.empty();
    256. 

  256. -            sp_add_used_routine(lex, YYTHD, $2, TYPE_ENUM_PROCEDURE);
    257. 

  257. +            sp_add_used_routine(lex, thd, $2, TYPE_ENUM_PROCEDURE);
    258. 

  258.            }
    259. 

  259.            opt_sp_cparam_list {}
    260. 

  260.          ;
    261. 

  261. @@ -2345,7 +2331,7 @@
    262. 

  262.                                                       (enum enum_field_types)$3,
    263. 

  263.                                                       sp_param_in);
    264. 

  264.  
    265. 

  265. -            if (lex->sphead->fill_field_definition(YYTHD, lex,
    266. 

  266. +            if (lex->sphead->fill_field_definition(thd, lex,
    267. 

  267.                                                     (enum enum_field_types) $3,
    268. 

  268.                                                     &spvar->field_def))
    269. 

  269.              {
    270. 

  270. @@ -2382,7 +2368,7 @@
    271. 

  271.                                                       (enum enum_field_types)$4,
    272. 

  272.                                                       (sp_param_mode_t)$1);
    273. 

  273.  
    274. 

  274. -            if (lex->sphead->fill_field_definition(YYTHD, lex,
    275. 

  275. +            if (lex->sphead->fill_field_definition(thd, lex,
    276. 

  276.                                                     (enum enum_field_types) $4,
    277. 

  277.                                                     &spvar->field_def))
    278. 

  278.              {
    279. 

  279. @@ -2445,13 +2431,12 @@
    280. 

  280.            {
    281. 

  281.              LEX *lex= Lex;
    282. 

  282.  
    283. 

  283. -            lex->sphead->reset_lex(YYTHD);
    284. 

  284. +            lex->sphead->reset_lex(thd);
    285. 

  285.              lex->spcont->declare_var_boundary($2);
    286. 

  286.            }
    287. 

  287.            type
    288. 

  288.            sp_opt_default
    289. 

  289.            {
    290. 

  290. -            THD *thd= YYTHD;
    291. 

  291.              LEX *lex= Lex;
    292. 

  292.              sp_pcontext *pctx= lex->spcont;
    293. 

  293.              uint num_vars= pctx->context_var_count();
    294. 

  294. @@ -2477,7 +2462,7 @@
    295. 

  295.                spvar->type= var_type;
    296. 

  296.                spvar->dflt= dflt_value_item;
    297. 

  297.              
    298. 

  298. -              if (lex->sphead->fill_field_definition(YYTHD, lex, var_type,
    299. 

  299. +              if (lex->sphead->fill_field_definition(thd, lex, var_type,
    300. 

  300.                                                       &spvar->field_def))
    301. 

  301.                {
    302. 

  302.                  MYSQL_YYABORT;
    303. 

  303. @@ -2501,7 +2486,7 @@
    304. 

  304.              }
    305. 

  305.  
    306. 

  306.              pctx->declare_var_boundary(0);
    307. 

  307. -            if (lex->sphead->restore_lex(YYTHD))
    308. 

  308. +            if (lex->sphead->restore_lex(thd))
    309. 

  309.                MYSQL_YYABORT;
    310. 

  310.              $$.vars= $2;
    311. 

  311.              $$.conds= $$.hndlrs= $$.curs= 0;
    312. 

  312. @@ -2516,7 +2501,7 @@
    313. 

  313.  	      my_error(ER_SP_DUP_COND, MYF(0), $2.str);
    314. 

  314.  	      MYSQL_YYABORT;
    315. 

  315.  	    }
    316. 

  316. -	    if(YYTHD->lex->spcont->push_cond(&$2, $5))
    317. 

  317. +	    if(thd->lex->spcont->push_cond(&$2, $5))
    318. 

  318.                MYSQL_YYABORT;
    319. 

  319.              $$.vars= $$.hndlrs= $$.curs= 0;
    320. 

  320.              $$.conds= 1;
    321. 

  321. @@ -2602,7 +2587,7 @@
    322. 

  322.  
    323. 

  323.  sp_cursor_stmt:
    324. 

  324.            {
    325. 

  325. -            Lex->sphead->reset_lex(YYTHD);
    326. 

  326. +            Lex->sphead->reset_lex(thd);
    327. 

  327.            }
    328. 

  328.            select
    329. 

  329.            {
    330. 

  330. @@ -2618,7 +2603,7 @@
    331. 

  331.              }
    332. 

  332.              lex->sp_lex_in_use= TRUE;
    333. 

  333.              $$= lex;
    334. 

  334. -            if (lex->sphead->restore_lex(YYTHD))
    335. 

  335. +            if (lex->sphead->restore_lex(thd))
    336. 

  336.                MYSQL_YYABORT;
    337. 

  337.            }
    338. 

  338.          ;
    339. 

  339. @@ -2662,7 +2647,7 @@
    340. 

  340.  sp_cond:
    341. 

  341.            ulong_num
    342. 

  342.            { /* mysql errno */
    343. 

  343. -            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
    344. 

  344. +            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
    345. 

  345.              if ($$ == NULL)
    346. 

  346.                MYSQL_YYABORT;
    347. 

  347.              $$->type= sp_cond_type_t::number;
    348. 

  348. @@ -2675,7 +2660,7 @@
    349. 

  349.                my_error(ER_SP_BAD_SQLSTATE, MYF(0), $3.str);
    350. 

  350.                MYSQL_YYABORT;
    351. 

  351.              }
    352. 

  352. -            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
    353. 

  353. +            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
    354. 

  354.              if ($$ == NULL)
    355. 

  355.                MYSQL_YYABORT;
    356. 

  356.              $$->type= sp_cond_type_t::state;
    357. 

  357. @@ -2705,21 +2690,21 @@
    358. 

  358.            }
    359. 

  359.          | SQLWARNING_SYM /* SQLSTATEs 01??? */
    360. 

  360.            {
    361. 

  361. -            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
    362. 

  362. +            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
    363. 

  363.              if ($$ == NULL)
    364. 

  364.                MYSQL_YYABORT;
    365. 

  365.              $$->type= sp_cond_type_t::warning;
    366. 

  366.            }
    367. 

  367.          | not FOUND_SYM /* SQLSTATEs 02??? */
    368. 

  368.            {
    369. 

  369. -            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
    370. 

  370. +            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
    371. 

  371.              if ($$ == NULL)
    372. 

  372.                MYSQL_YYABORT;
    373. 

  373.              $$->type= sp_cond_type_t::notfound;
    374. 

  374.            }
    375. 

  375.          | SQLEXCEPTION_SYM /* All other SQLSTATEs */
    376. 

  376.            {
    377. 

  377. -            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
    378. 

  378. +            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
    379. 

  379.              if ($$ == NULL)
    380. 

  380.                MYSQL_YYABORT;
    381. 

  381.              $$->type= sp_cond_type_t::exception;
    382. 

  382. @@ -2789,7 +2774,6 @@
    383. 

  383.          
    384. 

  384.  sp_proc_stmt_statement:
    385. 

  385.            {
    386. 

  386. -            THD *thd= YYTHD;
    387. 

  387.              LEX *lex= thd->lex;
    388. 

  388.              Lex_input_stream *lip= YYLIP;
    389. 

  389.  
    390. 

  390. @@ -2798,7 +2782,6 @@
    391. 

  391.            }
    392. 

  392.            statement
    393. 

  393.            {
    394. 

  394. -            THD *thd= YYTHD;
    395. 

  395.              LEX *lex= thd->lex;
    396. 

  396.              Lex_input_stream *lip= YYLIP;
    397. 

  397.              sp_head *sp= lex->sphead;
    398. 

  398. @@ -2845,7 +2828,7 @@
    399. 

  399.  
    400. 

  400.  sp_proc_stmt_return:
    401. 

  401.            RETURN_SYM 
    402. 

  402. -          { Lex->sphead->reset_lex(YYTHD); }
    403. 

  403. +          { Lex->sphead->reset_lex(thd); }
    404. 

  404.            expr
    405. 

  405.            {
    406. 

  406.              LEX *lex= Lex;
    407. 

  407. @@ -2867,7 +2850,7 @@
    408. 

  408.                  MYSQL_YYABORT;
    409. 

  409.                sp->m_flags|= sp_head::HAS_RETURN;
    410. 

  410.              }
    411. 

  411. -            if (sp->restore_lex(YYTHD))
    412. 

  412. +            if (sp->restore_lex(thd))
    413. 

  413.                MYSQL_YYABORT;
    414. 

  414.            }
    415. 

  415.          ;
    416. 

  416. @@ -3094,7 +3077,7 @@
    417. 

  417.          ;
    418. 

  418.  
    419. 

  419.  sp_if:
    420. 

  420. -          { Lex->sphead->reset_lex(YYTHD); }
    421. 

  421. +          { Lex->sphead->reset_lex(thd); }
    422. 

  422.            expr THEN_SYM
    423. 

  423.            {
    424. 

  424.              LEX *lex= Lex;
    425. 

  425. @@ -3108,7 +3091,7 @@
    426. 

  426.                  sp->add_cont_backpatch(i) ||
    427. 

  427.                  sp->add_instr(i))
    428. 

  428.                MYSQL_YYABORT;
    429. 

  429. -            if (sp->restore_lex(YYTHD))
    430. 

  430. +            if (sp->restore_lex(thd))
    431. 

  431.                MYSQL_YYABORT;
    432. 

  432.            }
    433. 

  433.            sp_proc_stmts1
    434. 

  434. @@ -3147,7 +3130,7 @@
    435. 

  435.            {
    436. 

  436.              LEX *lex= Lex;
    437. 

  437.              case_stmt_action_case(lex);
    438. 

  438. -            lex->sphead->reset_lex(YYTHD); /* For expr $3 */
    439. 

  439. +            lex->sphead->reset_lex(thd); /* For expr $3 */
    440. 

  440.            }
    441. 

  441.            expr
    442. 

  442.            {
    443. 

  443. @@ -3156,7 +3139,7 @@
    444. 

  444.                MYSQL_YYABORT;
    445. 

  445.  
    446. 

  446.              /* For expr $3 */
    447. 

  447. -            if (lex->sphead->restore_lex(YYTHD))
    448. 

  448. +            if (lex->sphead->restore_lex(thd))
    449. 

  449.                MYSQL_YYABORT;
    450. 

  450.            }
    451. 

  451.            simple_when_clause_list
    452. 

  452. @@ -3198,7 +3181,7 @@
    453. 

  453.  simple_when_clause:
    454. 

  454.            WHEN_SYM
    455. 

  455.            {
    456. 

  456. -            Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
    457. 

  457. +            Lex->sphead->reset_lex(thd); /* For expr $3 */
    458. 

  458.            }
    459. 

  459.            expr
    460. 

  460.            {
    461. 

  461. @@ -3208,7 +3191,7 @@
    462. 

  462.              if (case_stmt_action_when(lex, $3, true))
    463. 

  463.                MYSQL_YYABORT;
    464. 

  464.              /* For expr $3 */
    465. 

  465. -            if (lex->sphead->restore_lex(YYTHD))
    466. 

  466. +            if (lex->sphead->restore_lex(thd))
    467. 

  467.                MYSQL_YYABORT;
    468. 

  468.            }
    469. 

  469.            THEN_SYM
    470. 

  470. @@ -3223,7 +3206,7 @@
    471. 

  471.  searched_when_clause:
    472. 

  472.            WHEN_SYM
    473. 

  473.            {
    474. 

  474. -            Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
    475. 

  475. +            Lex->sphead->reset_lex(thd); /* For expr $3 */
    476. 

  476.            }
    477. 

  477.            expr
    478. 

  478.            {
    479. 

  479. @@ -3231,7 +3214,7 @@
    480. 

  480.              if (case_stmt_action_when(lex, $3, false))
    481. 

  481.                MYSQL_YYABORT;
    482. 

  482.              /* For expr $3 */
    483. 

  483. -            if (lex->sphead->restore_lex(YYTHD))
    484. 

  484. +            if (lex->sphead->restore_lex(thd))
    485. 

  485.                MYSQL_YYABORT;
    486. 

  486.            }
    487. 

  487.            THEN_SYM
    488. 

  488. @@ -3395,7 +3378,7 @@
    489. 

  489.                MYSQL_YYABORT;
    490. 

  490.  	  }
    491. 

  491.          | WHILE_SYM 
    492. 

  492. -          { Lex->sphead->reset_lex(YYTHD); }
    493. 

  493. +          { Lex->sphead->reset_lex(thd); }
    494. 

  494.            expr DO_SYM
    495. 

  495.            {
    496. 

  496.              LEX *lex= Lex;
    497. 

  497. @@ -3409,7 +3392,7 @@
    498. 

  498.                  sp->new_cont_backpatch(i) ||
    499. 

  499.                  sp->add_instr(i))
    500. 

  500.                MYSQL_YYABORT;
    501. 

  501. -            if (sp->restore_lex(YYTHD))
    502. 

  502. +            if (sp->restore_lex(thd))
    503. 

  503.                MYSQL_YYABORT;
    504. 

  504.            }
    505. 

  505.            sp_proc_stmts1 END WHILE_SYM
    506. 

  506. @@ -3424,7 +3407,7 @@
    507. 

  507.              lex->sphead->do_cont_backpatch();
    508. 

  508.            }
    509. 

  509.          | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM 
    510. 

  510. -          { Lex->sphead->reset_lex(YYTHD); }
    511. 

  511. +          { Lex->sphead->reset_lex(thd); }
    512. 

  512.            expr END REPEAT_SYM
    513. 

  513.            {
    514. 

  514.              LEX *lex= Lex;
    515. 

  515. @@ -3436,7 +3419,7 @@
    516. 

  516.              if (i == NULL ||
    517. 

  517.                  lex->sphead->add_instr(i))
    518. 

  518.                MYSQL_YYABORT;
    519. 

  519. -            if (lex->sphead->restore_lex(YYTHD))
    520. 

  520. +            if (lex->sphead->restore_lex(thd))
    521. 

  521.                MYSQL_YYABORT;
    522. 

  522.              /* We can shortcut the cont_backpatch here */
    523. 

  523.              i->m_cont_dest= ip+1;
    524. 

  524. @@ -3859,7 +3842,6 @@
    525. 

  525.            create3 {}
    526. 

  526.          | LIKE table_ident
    527. 

  527.            {
    528. 

  528. -            THD *thd= YYTHD;
    529. 

  529.              TABLE_LIST *src_table;
    530. 

  530.              LEX *lex= thd->lex;
    531. 

  531.  
    532. 

  532. @@ -3873,7 +3855,6 @@
    533. 

  533.            }
    534. 

  534.          | '(' LIKE table_ident ')'
    535. 

  535.            {
    536. 

  536. -            THD *thd= YYTHD;
    537. 

  537.              TABLE_LIST *src_table;
    538. 

  538.              LEX *lex= thd->lex;
    539. 

  539.  
    540. 

  540. @@ -4342,7 +4323,6 @@
    541. 

  541.            bit_expr
    542. 

  542.            {
    543. 

  543.              Item *part_expr= $1;
    544. 

  544. -            THD *thd= YYTHD;
    545. 

  545.              LEX *lex= thd->lex;
    546. 

  546.              Name_resolution_context *context= &lex->current_select->context;
    547. 

  547.              TABLE_LIST *save_list= context->table_list;
    548. 

  548. @@ -4364,7 +4344,7 @@
    549. 

  549.                my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0));
    550. 

  550.                MYSQL_YYABORT;
    551. 

  551.              }
    552. 

  552. -            if (part_expr->fix_fields(YYTHD, (Item**)0) ||
    553. 

  553. +            if (part_expr->fix_fields(thd, (Item**)0) ||
    554. 

  554.                  ((context->table_list= save_list), FALSE) ||
    555. 

  555.                  (!part_expr->const_item()) ||
    556. 

  556.                  (!lex->safe_to_cache_query))
    557. 

  557. @@ -4629,7 +4609,7 @@
    558. 

  558.          | TYPE_SYM opt_equal storage_engines
    559. 

  559.            {
    560. 

  560.              Lex->create_info.db_type= $3;
    561. 

  561. -            WARN_DEPRECATED(yythd, "6.0", "TYPE=storage_engine",
    562. 

  562. +            WARN_DEPRECATED(thd, "6.0", "TYPE=storage_engine",
    563. 

  563.                              "'ENGINE=storage_engine'");
    564. 

  564.              Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
    565. 

  565.            }
    566. 

  566. @@ -4791,19 +4771,19 @@
    567. 

  567.  storage_engines:
    568. 

  568.            ident_or_text
    569. 

  569.            {
    570. 

  570. -            plugin_ref plugin= ha_resolve_by_name(YYTHD, &$1);
    571. 

  571. +            plugin_ref plugin= ha_resolve_by_name(thd, &$1);
    572. 

  572.  
    573. 

  573.              if (plugin)
    574. 

  574.                $$= plugin_data(plugin, handlerton*);
    575. 

  575.              else
    576. 

  576.              {
    577. 

  577. -              if (YYTHD->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION)
    578. 

  578. +              if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION)
    579. 

  579.                {
    580. 

  580.                  my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str);
    581. 

  581.                  MYSQL_YYABORT;
    582. 

  582.                }
    583. 

  583.                $$= 0;
    584. 

  584. -              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
    585. 

  585. +              push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
    586. 

  586.                                    ER_UNKNOWN_STORAGE_ENGINE,
    587. 

  587.                                    ER(ER_UNKNOWN_STORAGE_ENGINE),
    588. 

  588.                                    $1.str);
    589. 

  589. @@ -4815,7 +4795,7 @@
    590. 

  590.            ident_or_text
    591. 

  591.            {
    592. 

  592.              plugin_ref plugin;
    593. 

  593. -            if ((plugin= ha_resolve_by_name(YYTHD, &$1)))
    594. 

  594. +            if ((plugin= ha_resolve_by_name(thd, &$1)))
    595. 

  595.                $$= plugin_data(plugin, handlerton*);
    596. 

  596.              else
    597. 

  597.              {
    598. 

  598. @@ -5043,7 +5023,7 @@
    599. 

  599.                {
    600. 

  600.                  char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1];
    601. 

  601.                  my_snprintf(buff, sizeof(buff), "YEAR(%lu)", length);
    602. 

  602. -                push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_NOTE,
    603. 

  603. +                push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
    604. 

  604.                                      ER_WARN_DEPRECATED_SYNTAX,
    605. 

  605.                                      ER(ER_WARN_DEPRECATED_SYNTAX),
    606. 

  606.                                      buff, "YEAR(4)");
    607. 

  607. @@ -5057,7 +5037,7 @@
    608. 

  608.            { $$=MYSQL_TYPE_TIME; }
    609. 

  609.          | TIMESTAMP opt_field_length
    610. 

  610.            {
    611. 

  611. -            if (YYTHD->variables.sql_mode & MODE_MAXDB)
    612. 

  612. +            if (thd->variables.sql_mode & MODE_MAXDB)
    613. 

  613.                $$=MYSQL_TYPE_DATETIME;
    614. 

  614.              else
    615. 

  615.              {
    616. 

  616. @@ -5189,7 +5169,7 @@
    617. 

  617.  real_type:
    618. 

  618.            REAL
    619. 

  619.            {
    620. 

  620. -            $$= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ?
    621. 

  621. +            $$= thd->variables.sql_mode & MODE_REAL_AS_FLOAT ?
    622. 

  622.                MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE;
    623. 

  623.            }
    624. 

  624.          | DOUBLE_SYM
    625. 

  625. @@ -5263,7 +5243,7 @@
    626. 

  626.          | DEFAULT now_or_signed_literal { Lex->default_value=$2; }
    627. 

  627.          | ON UPDATE_SYM NOW_SYM optional_braces
    628. 

  628.            {
    629. 

  629. -            Item *item= new (YYTHD->mem_root) Item_func_now_local();
    630. 

  630. +            Item *item= new (thd->mem_root) Item_func_now_local();
    631. 

  631.              if (item == NULL)
    632. 

  632.                MYSQL_YYABORT;
    633. 

  633.              Lex->on_update_value= item;
    634. 

  634. @@ -5312,7 +5292,7 @@
    635. 

  635.  now_or_signed_literal:
    636. 

  636.            NOW_SYM optional_braces
    637. 

  637.            {
    638. 

  638. -            $$= new (YYTHD->mem_root) Item_func_now_local();
    639. 

  639. +            $$= new (thd->mem_root) Item_func_now_local();
    640. 

  640.              if ($$ == NULL)
    641. 

  641.                MYSQL_YYABORT;
    642. 

  642.            }
    643. 

  643. @@ -5673,7 +5653,6 @@
    644. 

  644.  alter:
    645. 

  645.            ALTER opt_ignore TABLE_SYM table_ident
    646. 

  646.            {
    647. 

  647. -            THD *thd= YYTHD;
    648. 

  648.              LEX *lex= thd->lex;
    649. 

  649.              lex->name.str= 0;
    650. 

  650.              lex->name.length= 0;
    651. 

  651. @@ -5799,7 +5778,7 @@
    652. 

  652.                Event_parse_data.
    653. 

  653.              */
    654. 

  654.  
    655. 

  655. -            if (!(Lex->event_parse_data= Event_parse_data::new_instance(YYTHD)))
    656. 

  656. +            if (!(Lex->event_parse_data= Event_parse_data::new_instance(thd)))
    657. 

  657.                MYSQL_YYABORT;
    658. 

  658.              Lex->event_parse_data->identifier= $4;
    659. 

  659.  
    660. 

  660. @@ -6192,7 +6171,6 @@
    661. 

  661.            {
    662. 

  662.              if (!$4)
    663. 

  663.              {
    664. 

  664. -              THD *thd= YYTHD;
    665. 

  665.                $4= thd->variables.collation_database;
    666. 

  666.              }
    667. 

  667.              $5= $5 ? $5 : $4;
    668. 

  668. @@ -6556,7 +6534,7 @@
    669. 

  669.  assign_to_keycache:
    670. 

  670.            table_ident cache_keys_spec
    671. 

  671.            {
    672. 

  672. -            if (!Select->add_table_to_list(YYTHD, $1, NULL, 0, TL_READ, 
    673. 

  673. +            if (!Select->add_table_to_list(thd, $1, NULL, 0, TL_READ, 
    674. 

  674.                                             Select->pop_index_hints()))
    675. 

  675.                MYSQL_YYABORT;
    676. 

  676.            }
    677. 

  677. @@ -6585,7 +6563,7 @@
    678. 

  678.  preload_keys:
    679. 

  679.            table_ident cache_keys_spec opt_ignore_leaves
    680. 

  680.            {
    681. 

  681. -            if (!Select->add_table_to_list(YYTHD, $1, NULL, $3, TL_READ,
    682. 

  682. +            if (!Select->add_table_to_list(thd, $1, NULL, $3, TL_READ,
    683. 

  683.                                             Select->pop_index_hints()))
    684. 

  684.                MYSQL_YYABORT;
    685. 

  685.            }
    686. 

  686. @@ -6593,7 +6571,7 @@
    687. 

  687.  
    688. 

  688.  cache_keys_spec:
    689. 

  689.            {
    690. 

  690. -            Lex->select_lex.alloc_index_hints(YYTHD);
    691. 

  691. +            Lex->select_lex.alloc_index_hints(thd);
    692. 

  692.              Select->set_index_hint_type(INDEX_HINT_USE, 
    693. 

  693.                                          global_system_variables.old_mode ? 
    694. 

  694.                                          INDEX_HINT_MASK_JOIN : 
    695. 

  695. @@ -6813,7 +6791,6 @@
    696. 

  696.          | select_item
    697. 

  697.          | '*'
    698. 

  698.            {
    699. 

  699. -            THD *thd= YYTHD;
    700. 

  700.              Item *item= new (thd->mem_root)
    701. 

  701.                            Item_field(&thd->lex->current_select->context,
    702. 

  702.                                       NULL, NULL, "*");
    703. 

  703. @@ -6828,7 +6805,6 @@
    704. 

  704.  select_item:
    705. 

  705.            remember_name select_item2 remember_end select_alias
    706. 

  706.            {
    707. 

  707. -            THD *thd= YYTHD;
    708. 

  708.              DBUG_ASSERT($1 < $3);
    709. 

  709.  
    710. 

  710.              if (add_item_to_list(thd, $2))
    711. 

  711. @@ -6929,7 +6905,7 @@
    712. 

  712.              else
    713. 

  713.              {
    714. 

  714.                /* X OR Y */
    715. 

  715. -              $$ = new (YYTHD->mem_root) Item_cond_or($1, $3);
    716. 

  716. +              $$ = new (thd->mem_root) Item_cond_or($1, $3);
    717. 

  717.                if ($$ == NULL)
    718. 

  718.                  MYSQL_YYABORT;
    719. 

  719.              }
    720. 

  720. @@ -6937,7 +6913,7 @@
    721. 

  721.          | expr XOR expr %prec XOR
    722. 

  722.            {
    723. 

  723.              /* XOR is a proprietary extension */
    724. 

  724. -            $$ = new (YYTHD->mem_root) Item_cond_xor($1, $3);
    725. 

  725. +            $$ = new (thd->mem_root) Item_cond_xor($1, $3);
    726. 

  726.              if ($$ == NULL)
    727. 

  727.                MYSQL_YYABORT;
    728. 

  728.            }
    729. 

  729. @@ -6979,50 +6955,50 @@
    730. 

  730.              else
    731. 

  731.              {
    732. 

  732.                /* X AND Y */
    733. 

  733. -              $$ = new (YYTHD->mem_root) Item_cond_and($1, $3);
    734. 

  734. +              $$ = new (thd->mem_root) Item_cond_and($1, $3);
    735. 

  735.                if ($$ == NULL)
    736. 

  736.                  MYSQL_YYABORT;
    737. 

  737.              }
    738. 

  738.            }
    739. 

  739.          | NOT_SYM expr %prec NOT_SYM
    740. 

  740.            {
    741. 

  741. -            $$= negate_expression(YYTHD, $2);
    742. 

  742. +            $$= negate_expression(thd, $2);
    743. 

  743.              if ($$ == NULL)
    744. 

  744.                MYSQL_YYABORT;
    745. 

  745.            }
    746. 

  746.          | bool_pri IS TRUE_SYM %prec IS
    747. 

  747.            {
    748. 

  748. -            $$= new (YYTHD->mem_root) Item_func_istrue($1);
    749. 

  749. +            $$= new (thd->mem_root) Item_func_istrue($1);
    750. 

  750.              if ($$ == NULL)
    751. 

  751.                MYSQL_YYABORT;
    752. 

  752.            }
    753. 

  753.          | bool_pri IS not TRUE_SYM %prec IS
    754. 

  754.            {
    755. 

  755. -            $$= new (YYTHD->mem_root) Item_func_isnottrue($1);
    756. 

  756. +            $$= new (thd->mem_root) Item_func_isnottrue($1);
    757. 

  757.              if ($$ == NULL)
    758. 

  758.                MYSQL_YYABORT;
    759. 

  759.            }
    760. 

  760.          | bool_pri IS FALSE_SYM %prec IS
    761. 

  761.            {
    762. 

  762. -            $$= new (YYTHD->mem_root) Item_func_isfalse($1);
    763. 

  763. +            $$= new (thd->mem_root) Item_func_isfalse($1);
    764. 

  764.              if ($$ == NULL)
    765. 

  765.                MYSQL_YYABORT;
    766. 

  766.            }
    767. 

  767.          | bool_pri IS not FALSE_SYM %prec IS
    768. 

  768.            {
    769. 

  769. -            $$= new (YYTHD->mem_root) Item_func_isnotfalse($1);
    770. 

  770. +            $$= new (thd->mem_root) Item_func_isnotfalse($1);
    771. 

  771.              if ($$ == NULL)
    772. 

  772.                MYSQL_YYABORT;
    773. 

  773.            }
    774. 

  774.          | bool_pri IS UNKNOWN_SYM %prec IS
    775. 

  775.            {
    776. 

  776. -            $$= new (YYTHD->mem_root) Item_func_isnull($1);
    777. 

  777. +            $$= new (thd->mem_root) Item_func_isnull($1);
    778. 

  778.              if ($$ == NULL)
    779. 

  779.                MYSQL_YYABORT;
    780. 

  780.            }
    781. 

  781.          | bool_pri IS not UNKNOWN_SYM %prec IS
    782. 

  782.            {
    783. 

  783. -            $$= new (YYTHD->mem_root) Item_func_isnotnull($1);
    784. 

  784. +            $$= new (thd->mem_root) Item_func_isnotnull($1);
    785. 

  785.              if ($$ == NULL)
    786. 

  786.                MYSQL_YYABORT;
    787. 

  787.            }
    788. 

  788. @@ -7032,19 +7008,19 @@
    789. 

  789.  bool_pri:
    790. 

  790.            bool_pri IS NULL_SYM %prec IS
    791. 

  791.            {
    792. 

  792. -            $$= new (YYTHD->mem_root) Item_func_isnull($1);
    793. 

  793. +            $$= new (thd->mem_root) Item_func_isnull($1);
    794. 

  794.              if ($$ == NULL)
    795. 

  795.                MYSQL_YYABORT;
    796. 

  796.            }
    797. 

  797.          | bool_pri IS not NULL_SYM %prec IS
    798. 

  798.            {
    799. 

  799. -            $$= new (YYTHD->mem_root) Item_func_isnotnull($1);
    800. 

  800. +            $$= new (thd->mem_root) Item_func_isnotnull($1);
    801. 

  801.              if ($$ == NULL)
    802. 

  802.                MYSQL_YYABORT;
    803. 

  803.            }
    804. 

  804.          | bool_pri EQUAL_SYM predicate %prec EQUAL_SYM
    805. 

  805.            {
    806. 

  806. -            $$= new (YYTHD->mem_root) Item_func_equal($1,$3);
    807. 

  807. +            $$= new (thd->mem_root) Item_func_equal($1,$3);
    808. 

  808.              if ($$ == NULL)
    809. 

  809.                MYSQL_YYABORT;
    810. 

  810.            }
    811. 

  811. @@ -7066,13 +7042,12 @@
    812. 

  812.  predicate:
    813. 

  813.            bit_expr IN_SYM '(' subselect ')'
    814. 

  814.            {
    815. 

  815. -            $$= new (YYTHD->mem_root) Item_in_subselect($1, $4);
    816. 

  816. +            $$= new (thd->mem_root) Item_in_subselect($1, $4);
    817. 

  817.              if ($$ == NULL)
    818. 

  818.                MYSQL_YYABORT;
    819. 

  819.            }
    820. 

  820.          | bit_expr not IN_SYM '(' subselect ')'
    821. 

  821.            {
    822. 

  822. -            THD *thd= YYTHD;
    823. 

  823.              Item *item= new (thd->mem_root) Item_in_subselect($1, $5);
    824. 

  824.              if (item == NULL)
    825. 

  825.                MYSQL_YYABORT;
    826. 

  826. @@ -7082,7 +7057,7 @@
    827. 

  827.            }
    828. 

  828.          | bit_expr IN_SYM '(' expr ')'
    829. 

  829.            {
    830. 

  830. -            $$= handle_sql2003_note184_exception(YYTHD, $1, true, $4);
    831. 

  831. +            $$= handle_sql2003_note184_exception(thd, $1, true, $4);
    832. 

  832.              if ($$ == NULL)
    833. 

  833.                MYSQL_YYABORT;
    834. 

  834.            }
    835. 

  835. @@ -7090,13 +7065,13 @@
    836. 

  836.            { 
    837. 

  837.              $6->push_front($4);
    838. 

  838.              $6->push_front($1);
    839. 

  839. -            $$= new (YYTHD->mem_root) Item_func_in(*$6);
    840. 

  840. +            $$= new (thd->mem_root) Item_func_in(*$6);
    841. 

  841.              if ($$ == NULL)
    842. 

  842.                MYSQL_YYABORT;
    843. 

  843.            }
    844. 

  844.          | bit_expr not IN_SYM '(' expr ')'
    845. 

  845.            {
    846. 

  846. -            $$= handle_sql2003_note184_exception(YYTHD, $1, false, $5);
    847. 

  847. +            $$= handle_sql2003_note184_exception(thd, $1, false, $5);
    848. 

  848.              if ($$ == NULL)
    849. 

  849.                MYSQL_YYABORT;
    850. 

  850.            }
    851. 

  851. @@ -7104,7 +7079,7 @@
    852. 

  852.            {
    853. 

  853.              $7->push_front($5);
    854. 

  854.              $7->push_front($1);
    855. 

  855. -            Item_func_in *item = new (YYTHD->mem_root) Item_func_in(*$7);
    856. 

  856. +            Item_func_in *item = new (thd->mem_root) Item_func_in(*$7);
    857. 

  857.              if (item == NULL)
    858. 

  858.                MYSQL_YYABORT;
    859. 

  859.              item->negate();
    860. 

  860. @@ -7112,14 +7087,14 @@
    861. 

  861.            }
    862. 

  862.          | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate
    863. 

  863.            {
    864. 

  864. -            $$= new (YYTHD->mem_root) Item_func_between($1,$3,$5);
    865. 

  865. +            $$= new (thd->mem_root) Item_func_between($1,$3,$5);
    866. 

  866.              if ($$ == NULL)
    867. 

  867.                MYSQL_YYABORT;
    868. 

  868.            }
    869. 

  869.          | bit_expr not BETWEEN_SYM bit_expr AND_SYM predicate
    870. 

  870.            {
    871. 

  871.              Item_func_between *item;
    872. 

  872. -            item= new (YYTHD->mem_root) Item_func_between($1,$4,$6);
    873. 

  873. +            item= new (thd->mem_root) Item_func_between($1,$4,$6);
    874. 

  874.              if (item == NULL)
    875. 

  875.                MYSQL_YYABORT;
    876. 

  876.              item->negate();
    877. 

  877. @@ -7127,42 +7102,42 @@
    878. 

  878.            }
    879. 

  879.          | bit_expr SOUNDS_SYM LIKE bit_expr
    880. 

  880.            {
    881. 

  881. -            Item *item1= new (YYTHD->mem_root) Item_func_soundex($1);
    882. 

  882. -            Item *item4= new (YYTHD->mem_root) Item_func_soundex($4);
    883. 

  883. +            Item *item1= new (thd->mem_root) Item_func_soundex($1);
    884. 

  884. +            Item *item4= new (thd->mem_root) Item_func_soundex($4);
    885. 

  885.              if ((item1 == NULL) || (item4 == NULL))
    886. 

  886.                MYSQL_YYABORT;
    887. 

  887. -            $$= new (YYTHD->mem_root) Item_func_eq(item1, item4);
    888. 

  888. +            $$= new (thd->mem_root) Item_func_eq(item1, item4);
    889. 

  889.              if ($$ == NULL)
    890. 

  890.                MYSQL_YYABORT;
    891. 

  891.            }
    892. 

  892.          | bit_expr LIKE simple_expr opt_escape
    893. 

  893.            {
    894. 

  894. -            $$= new (YYTHD->mem_root) Item_func_like($1,$3,$4,Lex->escape_used);
    895. 

  895. +            $$= new (thd->mem_root) Item_func_like($1,$3,$4,Lex->escape_used);
    896. 

  896.              if ($$ == NULL)
    897. 

  897.                MYSQL_YYABORT;
    898. 

  898.            }
    899. 

  899.          | bit_expr not LIKE simple_expr opt_escape
    900. 

  900.            {
    901. 

  901. -            Item *item= new (YYTHD->mem_root) Item_func_like($1,$4,$5,
    902. 

  902. +            Item *item= new (thd->mem_root) Item_func_like($1,$4,$5,
    903. 

  903.                                                               Lex->escape_used);
    904. 

  904.              if (item == NULL)
    905. 

  905.                MYSQL_YYABORT;
    906. 

  906. -            $$= new (YYTHD->mem_root) Item_func_not(item);
    907. 

  907. +            $$= new (thd->mem_root) Item_func_not(item);
    908. 

  908.              if ($$ == NULL)
    909. 

  909.                MYSQL_YYABORT;
    910. 

  910.            }
    911. 

  911.          | bit_expr REGEXP bit_expr
    912. 

  912.            {
    913. 

  913. -            $$= new (YYTHD->mem_root) Item_func_regex($1,$3);
    914. 

  914. +            $$= new (thd->mem_root) Item_func_regex($1,$3);
    915. 

  915.              if ($$ == NULL)
    916. 

  916.                MYSQL_YYABORT;
    917. 

  917.            }
    918. 

  918.          | bit_expr not REGEXP bit_expr
    919. 

  919.            {
    920. 

  920. -            Item *item= new (YYTHD->mem_root) Item_func_regex($1,$4);
    921. 

  921. +            Item *item= new (thd->mem_root) Item_func_regex($1,$4);
    922. 

  922.              if (item == NULL)
    923. 

  923.                MYSQL_YYABORT;
    924. 

  924. -            $$= negate_expression(YYTHD, item);
    925. 

  925. +            $$= negate_expression(thd, item);
    926. 

  926.              if ($$ == NULL)
    927. 

  927.                MYSQL_YYABORT;
    928. 

  928.            }
    929. 

  929. @@ -7172,85 +7147,85 @@
    930. 

  930.  bit_expr:
    931. 

  931.            bit_expr '|' bit_expr %prec '|'
    932. 

  932.            {
    933. 

  933. -            $$= new (YYTHD->mem_root) Item_func_bit_or($1,$3);
    934. 

  934. +            $$= new (thd->mem_root) Item_func_bit_or($1,$3);
    935. 

  935.              if ($$ == NULL)
    936. 

  936.                MYSQL_YYABORT;
    937. 

  937.            }
    938. 

  938.          | bit_expr '&' bit_expr %prec '&'
    939. 

  939.            {
    940. 

  940. -            $$= new (YYTHD->mem_root) Item_func_bit_and($1,$3);
    941. 

  941. +            $$= new (thd->mem_root) Item_func_bit_and($1,$3);
    942. 

  942.              if ($$ == NULL)
    943. 

  943.                MYSQL_YYABORT;
    944. 

  944.            }
    945. 

  945.          | bit_expr SHIFT_LEFT bit_expr %prec SHIFT_LEFT
    946. 

  946.            {
    947. 

  947. -            $$= new (YYTHD->mem_root) Item_func_shift_left($1,$3);
    948. 

  948. +            $$= new (thd->mem_root) Item_func_shift_left($1,$3);
    949. 

  949.              if ($$ == NULL)
    950. 

  950.                MYSQL_YYABORT;
    951. 

  951.            }
    952. 

  952.          | bit_expr SHIFT_RIGHT bit_expr %prec SHIFT_RIGHT
    953. 

  953.            {
    954. 

  954. -            $$= new (YYTHD->mem_root) Item_func_shift_right($1,$3);
    955. 

  955. +            $$= new (thd->mem_root) Item_func_shift_right($1,$3);
    956. 

  956.              if ($$ == NULL)
    957. 

  957.                MYSQL_YYABORT;
    958. 

  958.            }
    959. 

  959.          | bit_expr '+' bit_expr %prec '+'
    960. 

  960.            {
    961. 

  961. -            $$= new (YYTHD->mem_root) Item_func_plus($1,$3);
    962. 

  962. +            $$= new (thd->mem_root) Item_func_plus($1,$3);
    963. 

  963.              if ($$ == NULL)
    964. 

  964.                MYSQL_YYABORT;
    965. 

  965.            }
    966. 

  966.          | bit_expr '-' bit_expr %prec '-'
    967. 

  967.            {
    968. 

  968. -            $$= new (YYTHD->mem_root) Item_func_minus($1,$3);
    969. 

  969. +            $$= new (thd->mem_root) Item_func_minus($1,$3);
    970. 

  970.              if ($$ == NULL)
    971. 

  971.                MYSQL_YYABORT;
    972. 

  972.            }
    973. 

  973.          | bit_expr '+' INTERVAL_SYM expr interval %prec '+'
    974. 

  974.            {
    975. 

  975. -            $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,0);
    976. 

  976. +            $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,0);
    977. 

  977.              if ($$ == NULL)
    978. 

  978.                MYSQL_YYABORT;
    979. 

  979.            }
    980. 

  980.          | bit_expr '-' INTERVAL_SYM expr interval %prec '-'
    981. 

  981.            {
    982. 

  982. -            $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,1);
    983. 

  983. +            $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,1);
    984. 

  984.              if ($$ == NULL)
    985. 

  985.                MYSQL_YYABORT;
    986. 

  986.            }
    987. 

  987.          | bit_expr '*' bit_expr %prec '*'
    988. 

  988.            {
    989. 

  989. -            $$= new (YYTHD->mem_root) Item_func_mul($1,$3);
    990. 

  990. +            $$= new (thd->mem_root) Item_func_mul($1,$3);
    991. 

  991.              if ($$ == NULL)
    992. 

  992.                MYSQL_YYABORT;
    993. 

  993.            }
    994. 

  994.          | bit_expr '/' bit_expr %prec '/'
    995. 

  995.            {
    996. 

  996. -            $$= new (YYTHD->mem_root) Item_func_div($1,$3);
    997. 

  997. +            $$= new (thd->mem_root) Item_func_div($1,$3);
    998. 

  998.              if ($$ == NULL)
    999. 

  999.                MYSQL_YYABORT;
    1000. 

  1000.            }
    1001. 

  1001.          | bit_expr '%' bit_expr %prec '%'
    1002. 

  1002.            {
    1003. 

  1003. -            $$= new (YYTHD->mem_root) Item_func_mod($1,$3);
    1004. 

  1004. +            $$= new (thd->mem_root) Item_func_mod($1,$3);
    1005. 

  1005.              if ($$ == NULL)
    1006. 

  1006.                MYSQL_YYABORT;
    1007. 

  1007.            }
    1008. 

  1008.          | bit_expr DIV_SYM bit_expr %prec DIV_SYM
    1009. 

  1009.            {
    1010. 

  1010. -            $$= new (YYTHD->mem_root) Item_func_int_div($1,$3);
    1011. 

  1011. +            $$= new (thd->mem_root) Item_func_int_div($1,$3);
    1012. 

  1012.              if ($$ == NULL)
    1013. 

  1013.                MYSQL_YYABORT;
    1014. 

  1014.            }
    1015. 

  1015.          | bit_expr MOD_SYM bit_expr %prec MOD_SYM
    1016. 

  1016.            {
    1017. 

  1017. -            $$= new (YYTHD->mem_root) Item_func_mod($1,$3);
    1018. 

  1018. +            $$= new (thd->mem_root) Item_func_mod($1,$3);
    1019. 

  1019.              if ($$ == NULL)
    1020. 

  1020.                MYSQL_YYABORT;
    1021. 

  1021.            }
    1022. 

  1022.          | bit_expr '^' bit_expr
    1023. 

  1023.            {
    1024. 

  1024. -            $$= new (YYTHD->mem_root) Item_func_bit_xor($1,$3);
    1025. 

  1025. +            $$= new (thd->mem_root) Item_func_bit_xor($1,$3);
    1026. 

  1026.              if ($$ == NULL)
    1027. 

  1027.                MYSQL_YYABORT;
    1028. 

  1028.            }
    1029. 

  1029. @@ -7299,7 +7274,6 @@
    1030. 

  1030.          | function_call_conflict
    1031. 

  1031.          | simple_expr COLLATE_SYM ident_or_text %prec NEG
    1032. 

  1032.            {
    1033. 

  1033. -            THD *thd= YYTHD;
    1034. 

  1034.              Item *i1= new (thd->mem_root) Item_string($3.str,
    1035. 

  1035.                                                        $3.length,
    1036. 

  1036.                                                        thd->charset());
    1037. 

  1037. @@ -7315,7 +7289,7 @@
    1038. 

  1038.          | sum_expr
    1039. 

  1039.          | simple_expr OR_OR_SYM simple_expr
    1040. 

  1040.            {
    1041. 

  1041. -            $$= new (YYTHD->mem_root) Item_func_concat($1, $3);
    1042. 

  1042. +            $$= new (thd->mem_root) Item_func_concat($1, $3);
    1043. 

  1043.              if ($$ == NULL)
    1044. 

  1044.                MYSQL_YYABORT;
    1045. 

  1045.            }
    1046. 

  1046. @@ -7325,25 +7299,25 @@
    1047. 

  1047.            }
    1048. 

  1048.          | '-' simple_expr %prec NEG
    1049. 

  1049.            {
    1050. 

  1050. -            $$= new (YYTHD->mem_root) Item_func_neg($2);
    1051. 

  1051. +            $$= new (thd->mem_root) Item_func_neg($2);
    1052. 

  1052.              if ($$ == NULL)
    1053. 

  1053.                MYSQL_YYABORT;
    1054. 

  1054.            }
    1055. 

  1055.          | '~' simple_expr %prec NEG
    1056. 

  1056.            {
    1057. 

  1057. -            $$= new (YYTHD->mem_root) Item_func_bit_neg($2);
    1058. 

  1058. +            $$= new (thd->mem_root) Item_func_bit_neg($2);
    1059. 

  1059.              if ($$ == NULL)
    1060. 

  1060.                MYSQL_YYABORT;
    1061. 

  1061.            }
    1062. 

  1062.          | not2 simple_expr %prec NEG
    1063. 

  1063.            {
    1064. 

  1064. -            $$= negate_expression(YYTHD, $2);
    1065. 

  1065. +            $$= negate_expression(thd, $2);
    1066. 

  1066.              if ($$ == NULL)
    1067. 

  1067.                MYSQL_YYABORT;
    1068. 

  1068.            }
    1069. 

  1069.          | '(' subselect ')'
    1070. 

  1070.            { 
    1071. 

  1071. -            $$= new (YYTHD->mem_root) Item_singlerow_subselect($2);
    1072. 

  1072. +            $$= new (thd->mem_root) Item_singlerow_subselect($2);
    1073. 

  1073.              if ($$ == NULL)
    1074. 

  1074.                MYSQL_YYABORT;
    1075. 

  1075.            }
    1076. 

  1076. @@ -7352,20 +7326,20 @@
    1077. 

  1077.          | '(' expr ',' expr_list ')'
    1078. 

  1078.            {
    1079. 

  1079.              $4->push_front($2);
    1080. 

  1080. -            $$= new (YYTHD->mem_root) Item_row(*$4);
    1081. 

  1081. +            $$= new (thd->mem_root) Item_row(*$4);
    1082. 

  1082.              if ($$ == NULL)
    1083. 

  1083.                MYSQL_YYABORT;
    1084. 

  1084.            }
    1085. 

  1085.          | ROW_SYM '(' expr ',' expr_list ')'
    1086. 

  1086.            {
    1087. 

  1087.              $5->push_front($3);
    1088. 

  1088. -            $$= new (YYTHD->mem_root) Item_row(*$5);
    1089. 

  1089. +            $$= new (thd->mem_root) Item_row(*$5);
    1090. 

  1090.              if ($$ == NULL)
    1091. 

  1091.                MYSQL_YYABORT;
    1092. 

  1092.            }
    1093. 

  1093.          | EXISTS '(' subselect ')'
    1094. 

  1094.            {
    1095. 

  1095. -            $$= new (YYTHD->mem_root) Item_exists_subselect($3);
    1096. 

  1096. +            $$= new (thd->mem_root) Item_exists_subselect($3);
    1097. 

  1097.              if ($$ == NULL)
    1098. 

  1098.                MYSQL_YYABORT;
    1099. 

  1099.            }
    1100. 

  1100. @@ -7374,7 +7348,7 @@
    1101. 

  1101.          | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')'
    1102. 

  1102.            {
    1103. 

  1103.              $2->push_front($5);
    1104. 

  1104. -            Item_func_match *i1= new (YYTHD->mem_root) Item_func_match(*$2, $6);
    1105. 

  1105. +            Item_func_match *i1= new (thd->mem_root) Item_func_match(*$2, $6);
    1106. 

  1106.              if (i1 == NULL)
    1107. 

  1107.                MYSQL_YYABORT;
    1108. 

  1108.              Select->add_ftfunc_to_list(i1);
    1109. 

  1109. @@ -7382,7 +7356,7 @@
    1110. 

  1110.            }
    1111. 

  1111.          | BINARY simple_expr %prec NEG
    1112. 

  1112.            {
    1113. 

  1113. -            $$= create_func_cast(YYTHD, $2, ITEM_CAST_CHAR, NULL, NULL,
    1114. 

  1114. +            $$= create_func_cast(thd, $2, ITEM_CAST_CHAR, NULL, NULL,
    1115. 

  1115.                                   &my_charset_bin);
    1116. 

  1116.              if ($$ == NULL)
    1117. 

  1117.                MYSQL_YYABORT;
    1118. 

  1118. @@ -7390,27 +7364,27 @@
    1119. 

  1119.          | CAST_SYM '(' expr AS cast_type ')'
    1120. 

  1120.            {
    1121. 

  1121.              LEX *lex= Lex;
    1122. 

  1122. -            $$= create_func_cast(YYTHD, $3, $5, lex->length, lex->dec,
    1123. 

  1123. +            $$= create_func_cast(thd, $3, $5, lex->length, lex->dec,
    1124. 

  1124.                                   lex->charset);
    1125. 

  1125.              if ($$ == NULL)
    1126. 

  1126.                MYSQL_YYABORT;
    1127. 

  1127.            }
    1128. 

  1128.          | CASE_SYM opt_expr when_list opt_else END
    1129. 

  1129.            {
    1130. 

  1130. -            $$= new (YYTHD->mem_root) Item_func_case(* $3, $2, $4 );
    1131. 

  1131. +            $$= new (thd->mem_root) Item_func_case(* $3, $2, $4 );
    1132. 

  1132.              if ($$ == NULL)
    1133. 

  1133.                MYSQL_YYABORT;
    1134. 

  1134.            }
    1135. 

  1135.          | CONVERT_SYM '(' expr ',' cast_type ')'
    1136. 

  1136.            {
    1137. 

  1137. -            $$= create_func_cast(YYTHD, $3, $5, Lex->length, Lex->dec,
    1138. 

  1138. +            $$= create_func_cast(thd, $3, $5, Lex->length, Lex->dec,
    1139. 

  1139.                                   Lex->charset);
    1140. 

  1140.              if ($$ == NULL)
    1141. 

  1141.                MYSQL_YYABORT;
    1142. 

  1142.            }
    1143. 

  1143.          | CONVERT_SYM '(' expr USING charset_name ')'
    1144. 

  1144.            {
    1145. 

  1145. -            $$= new (YYTHD->mem_root) Item_func_conv_charset($3,$5);
    1146. 

  1146. +            $$= new (thd->mem_root) Item_func_conv_charset($3,$5);
    1147. 

  1147.              if ($$ == NULL)
    1148. 

  1148.                MYSQL_YYABORT;
    1149. 

  1149.            }
    1150. 

  1150. @@ -7423,14 +7397,14 @@
    1151. 

  1151.                my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->my_name()->str);
    1152. 

  1152.                MYSQL_YYABORT;
    1153. 

  1153.              }
    1154. 

  1154. -            $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context(),
    1155. 

  1155. +            $$= new (thd->mem_root) Item_default_value(Lex->current_context(),
    1156. 

  1156.                                                           $3);
    1157. 

  1157.              if ($$ == NULL)
    1158. 

  1158.                MYSQL_YYABORT;
    1159. 

  1159.            }
    1160. 

  1160.          | VALUES '(' simple_ident_nospvar ')'
    1161. 

  1161.            {
    1162. 

  1162. -            $$= new (YYTHD->mem_root) Item_insert_value(Lex->current_context(),
    1163. 

  1163. +            $$= new (thd->mem_root) Item_insert_value(Lex->current_context(),
    1164. 

  1164.                                                          $3);
    1165. 

  1165.              if ($$ == NULL)
    1166. 

  1166.                MYSQL_YYABORT;
    1167. 

  1167. @@ -7438,7 +7412,7 @@
    1168. 

  1168.          | INTERVAL_SYM expr interval '+' expr %prec INTERVAL_SYM
    1169. 

  1169.            /* we cannot put interval before - */
    1170. 

  1170.            {
    1171. 

  1171. -            $$= new (YYTHD->mem_root) Item_date_add_interval($5,$2,$3,0);
    1172. 

  1172. +            $$= new (thd->mem_root) Item_date_add_interval($5,$2,$3,0);
    1173. 

  1173.              if ($$ == NULL)
    1174. 

  1174.                MYSQL_YYABORT;
    1175. 

  1175.            }
    1176. 

  1176. @@ -7453,19 +7427,19 @@
    1177. 

  1177.  function_call_keyword:
    1178. 

  1178.            CHAR_SYM '(' expr_list ')'
    1179. 

  1179.            {
    1180. 

  1180. -            $$= new (YYTHD->mem_root) Item_func_char(*$3);
    1181. 

  1181. +            $$= new (thd->mem_root) Item_func_char(*$3);
    1182. 

  1182.              if ($$ == NULL)
    1183. 

  1183.                MYSQL_YYABORT;
    1184. 

  1184.            }
    1185. 

  1185.          | CHAR_SYM '(' expr_list USING charset_name ')'
    1186. 

  1186.            {
    1187. 

  1187. -            $$= new (YYTHD->mem_root) Item_func_char(*$3, $5);
    1188. 

  1188. +            $$= new (thd->mem_root) Item_func_char(*$3, $5);
    1189. 

  1189.              if ($$ == NULL)
    1190. 

  1190.                MYSQL_YYABORT;
    1191. 

  1191.            }
    1192. 

  1192.          | CURRENT_USER optional_braces
    1193. 

  1193.            {
    1194. 

  1194. -            $$= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context());
    1195. 

  1195. +            $$= new (thd->mem_root) Item_func_current_user(Lex->current_context());
    1196. 

  1196.              if ($$ == NULL)
    1197. 

  1197.                MYSQL_YYABORT;
    1198. 

  1198.              Lex->set_stmt_unsafe();
    1199. 

  1199. @@ -7473,31 +7447,30 @@
    1200. 

  1200.            }
    1201. 

  1201.          | DATE_SYM '(' expr ')'
    1202. 

  1202.            {
    1203. 

  1203. -            $$= new (YYTHD->mem_root) Item_date_typecast($3);
    1204. 

  1204. +            $$= new (thd->mem_root) Item_date_typecast($3);
    1205. 

  1205.              if ($$ == NULL)
    1206. 

  1206.                MYSQL_YYABORT;
    1207. 

  1207.            }
    1208. 

  1208.          | DAY_SYM '(' expr ')'
    1209. 

  1209.            {
    1210. 

  1210. -            $$= new (YYTHD->mem_root) Item_func_dayofmonth($3);
    1211. 

  1211. +            $$= new (thd->mem_root) Item_func_dayofmonth($3);
    1212. 

  1212.              if ($$ == NULL)
    1213. 

  1213.                MYSQL_YYABORT;
    1214. 

  1214.            }
    1215. 

  1215.          | HOUR_SYM '(' expr ')'
    1216. 

  1216.            {
    1217. 

  1217. -            $$= new (YYTHD->mem_root) Item_func_hour($3);
    1218. 

  1218. +            $$= new (thd->mem_root) Item_func_hour($3);
    1219. 

  1219.              if ($$ == NULL)
    1220. 

  1220.                MYSQL_YYABORT;
    1221. 

  1221.            }
    1222. 

  1222.          | INSERT '(' expr ',' expr ',' expr ',' expr ')'
    1223. 

  1223.            {
    1224. 

  1224. -            $$= new (YYTHD->mem_root) Item_func_insert($3,$5,$7,$9);
    1225. 

  1225. +            $$= new (thd->mem_root) Item_func_insert($3,$5,$7,$9);
    1226. 

  1226.              if ($$ == NULL)
    1227. 

  1227.                MYSQL_YYABORT;
    1228. 

  1228.            }
    1229. 

  1229.          | INTERVAL_SYM '(' expr ',' expr ')' %prec INTERVAL_SYM
    1230. 

  1230.            {
    1231. 

  1231. -            THD *thd= YYTHD;
    1232. 

  1232.              List<Item> *list= new (thd->mem_root) List<Item>;
    1233. 

  1233.              if (list == NULL)
    1234. 

  1234.                MYSQL_YYABORT;
    1235. 

  1235. @@ -7512,7 +7485,6 @@
    1236. 

  1236.            }
    1237. 

  1237.          | INTERVAL_SYM '(' expr ',' expr ',' expr_list ')' %prec INTERVAL_SYM
    1238. 

  1238.            {
    1239. 

  1239. -            THD *thd= YYTHD;
    1240. 

  1240.              $7->push_front($5);
    1241. 

  1241.              $7->push_front($3);
    1242. 

  1242.              Item_row *item= new (thd->mem_root) Item_row(*$7);
    1243. 

  1243. @@ -7524,103 +7496,103 @@
    1244. 

  1244.            }
    1245. 

  1245.          | LEFT '(' expr ',' expr ')'
    1246. 

  1246.            {
    1247. 

  1247. -            $$= new (YYTHD->mem_root) Item_func_left($3,$5);
    1248. 

  1248. +            $$= new (thd->mem_root) Item_func_left($3,$5);
    1249. 

  1249.              if ($$ == NULL)
    1250. 

  1250.                MYSQL_YYABORT;
    1251. 

  1251.            }
    1252. 

  1252.          | MINUTE_SYM '(' expr ')'
    1253. 

  1253.            {
    1254. 

  1254. -            $$= new (YYTHD->mem_root) Item_func_minute($3);
    1255. 

  1255. +            $$= new (thd->mem_root) Item_func_minute($3);
    1256. 

  1256.              if ($$ == NULL)
    1257. 

  1257.                MYSQL_YYABORT;
    1258. 

  1258.            }
    1259. 

  1259.          | MONTH_SYM '(' expr ')'
    1260. 

  1260.            {
    1261. 

  1261. -            $$= new (YYTHD->mem_root) Item_func_month($3);
    1262. 

  1262. +            $$= new (thd->mem_root) Item_func_month($3);
    1263. 

  1263.              if ($$ == NULL)
    1264. 

  1264.                MYSQL_YYABORT;
    1265. 

  1265.            }
    1266. 

  1266.          | RIGHT '(' expr ',' expr ')'
    1267. 

  1267.            {
    1268. 

  1268. -            $$= new (YYTHD->mem_root) Item_func_right($3,$5);
    1269. 

  1269. +            $$= new (thd->mem_root) Item_func_right($3,$5);
    1270. 

  1270.              if ($$ == NULL)
    1271. 

  1271.                MYSQL_YYABORT;
    1272. 

  1272.            }
    1273. 

  1273.          | SECOND_SYM '(' expr ')'
    1274. 

  1274.            {
    1275. 

  1275. -            $$= new (YYTHD->mem_root) Item_func_second($3);
    1276. 

  1276. +            $$= new (thd->mem_root) Item_func_second($3);
    1277. 

  1277.              if ($$ == NULL)
    1278. 

  1278.                MYSQL_YYABORT;
    1279. 

  1279.            }
    1280. 

  1280.          | TIME_SYM '(' expr ')'
    1281. 

  1281.            {
    1282. 

  1282. -            $$= new (YYTHD->mem_root) Item_time_typecast($3);
    1283. 

  1283. +            $$= new (thd->mem_root) Item_time_typecast($3);
    1284. 

  1284.              if ($$ == NULL)
    1285. 

  1285.                MYSQL_YYABORT;
    1286. 

  1286.            }
    1287. 

  1287.          | TIMESTAMP '(' expr ')'
    1288. 

  1288.            {
    1289. 

  1289. -            $$= new (YYTHD->mem_root) Item_datetime_typecast($3);
    1290. 

  1290. +            $$= new (thd->mem_root) Item_datetime_typecast($3);
    1291. 

  1291.              if ($$ == NULL)
    1292. 

  1292.                MYSQL_YYABORT;
    1293. 

  1293.            }
    1294. 

  1294.          | TIMESTAMP '(' expr ',' expr ')'
    1295. 

  1295.            {
    1296. 

  1296. -            $$= new (YYTHD->mem_root) Item_func_add_time($3, $5, 1, 0);
    1297. 

  1297. +            $$= new (thd->mem_root) Item_func_add_time($3, $5, 1, 0);
    1298. 

  1298.              if ($$ == NULL)
    1299. 

  1299.                MYSQL_YYABORT;
    1300. 

  1300.            }
    1301. 

  1301.          | TRIM '(' expr ')'
    1302. 

  1302.            {
    1303. 

  1303. -            $$= new (YYTHD->mem_root) Item_func_trim($3);
    1304. 

  1304. +            $$= new (thd->mem_root) Item_func_trim($3);
    1305. 

  1305.              if ($$ == NULL)
    1306. 

  1306.                MYSQL_YYABORT;
    1307. 

  1307.            }
    1308. 

  1308.          | TRIM '(' LEADING expr FROM expr ')'
    1309. 

  1309.            {
    1310. 

  1310. -            $$= new (YYTHD->mem_root) Item_func_ltrim($6,$4);
    1311. 

  1311. +            $$= new (thd->mem_root) Item_func_ltrim($6,$4);
    1312. 

  1312.              if ($$ == NULL)
    1313. 

  1313.                MYSQL_YYABORT;
    1314. 

  1314.            }
    1315. 

  1315.          | TRIM '(' TRAILING expr FROM expr ')'
    1316. 

  1316.            {
    1317. 

  1317. -            $$= new (YYTHD->mem_root) Item_func_rtrim($6,$4);
    1318. 

  1318. +            $$= new (thd->mem_root) Item_func_rtrim($6,$4);
    1319. 

  1319.              if ($$ == NULL)
    1320. 

  1320.                MYSQL_YYABORT;
    1321. 

  1321.            }
    1322. 

  1322.          | TRIM '(' BOTH expr FROM expr ')'
    1323. 

  1323.            {
    1324. 

  1324. -            $$= new (YYTHD->mem_root) Item_func_trim($6,$4);
    1325. 

  1325. +            $$= new (thd->mem_root) Item_func_trim($6,$4);
    1326. 

  1326.              if ($$ == NULL)
    1327. 

  1327.                MYSQL_YYABORT;
    1328. 

  1328.            }
    1329. 

  1329.          | TRIM '(' LEADING FROM expr ')'
    1330. 

  1330.            {
    1331. 

  1331. -            $$= new (YYTHD->mem_root) Item_func_ltrim($5);
    1332. 

  1332. +            $$= new (thd->mem_root) Item_func_ltrim($5);
    1333. 

  1333.              if ($$ == NULL)
    1334. 

  1334.                MYSQL_YYABORT;
    1335. 

  1335.            }
    1336. 

  1336.          | TRIM '(' TRAILING FROM expr ')'
    1337. 

  1337.            {
    1338. 

  1338. -            $$= new (YYTHD->mem_root) Item_func_rtrim($5);
    1339. 

  1339. +            $$= new (thd->mem_root) Item_func_rtrim($5);
    1340. 

  1340.              if ($$ == NULL)
    1341. 

  1341.                MYSQL_YYABORT;
    1342. 

  1342.            }
    1343. 

  1343.          | TRIM '(' BOTH FROM expr ')'
    1344. 

  1344.            {
    1345. 

  1345. -            $$= new (YYTHD->mem_root) Item_func_trim($5);
    1346. 

  1346. +            $$= new (thd->mem_root) Item_func_trim($5);
    1347. 

  1347.              if ($$ == NULL)
    1348. 

  1348.                MYSQL_YYABORT;
    1349. 

  1349.            }
    1350. 

  1350.          | TRIM '(' expr FROM expr ')'
    1351. 

  1351.            {
    1352. 

  1352. -            $$= new (YYTHD->mem_root) Item_func_trim($5,$3);
    1353. 

  1353. +            $$= new (thd->mem_root) Item_func_trim($5,$3);
    1354. 

  1354.              if ($$ == NULL)
    1355. 

  1355.                MYSQL_YYABORT;
    1356. 

  1356.            }
    1357. 

  1357.          | USER '(' ')'
    1358. 

  1358.            {
    1359. 

  1359. -            $$= new (YYTHD->mem_root) Item_func_user();
    1360. 

  1360. +            $$= new (thd->mem_root) Item_func_user();
    1361. 

  1361.              if ($$ == NULL)
    1362. 

  1362.                MYSQL_YYABORT;
    1363. 

  1363.              Lex->set_stmt_unsafe();
    1364. 

  1364. @@ -7628,7 +7600,7 @@
    1365. 

  1365.            }
    1366. 

  1366.          | YEAR_SYM '(' expr ')'
    1367. 

  1367.            {
    1368. 

  1368. -            $$= new (YYTHD->mem_root) Item_func_year($3);
    1369. 

  1369. +            $$= new (thd->mem_root) Item_func_year($3);
    1370. 

  1370.              if ($$ == NULL)
    1371. 

  1371.                MYSQL_YYABORT;
    1372. 

  1372.            }
    1373. 

  1373. @@ -7649,34 +7621,34 @@
    1374. 

  1374.  function_call_nonkeyword:
    1375. 

  1375.            ADDDATE_SYM '(' expr ',' expr ')'
    1376. 

  1376.            {
    1377. 

  1377. -            $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5,
    1378. 

  1378. +            $$= new (thd->mem_root) Item_date_add_interval($3, $5,
    1379. 

  1379.                                                               INTERVAL_DAY, 0);
    1380. 

  1380.              if ($$ == NULL)
    1381. 

  1381.                MYSQL_YYABORT;
    1382. 

  1382.            }
    1383. 

  1383.          | ADDDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')'
    1384. 

  1384.            {
    1385. 

  1385. -            $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 0);
    1386. 

  1386. +            $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 0);
    1387. 

  1387.              if ($$ == NULL)
    1388. 

  1388.                MYSQL_YYABORT;
    1389. 

  1389.            }
    1390. 

  1390.          | CURDATE optional_braces
    1391. 

  1391.            {
    1392. 

  1392. -            $$= new (YYTHD->mem_root) Item_func_curdate_local();
    1393. 

  1393. +            $$= new (thd->mem_root) Item_func_curdate_local();
    1394. 

  1394.              if ($$ == NULL)
    1395. 

  1395.                MYSQL_YYABORT;
    1396. 

  1396.              Lex->safe_to_cache_query=0;
    1397. 

  1397.            }
    1398. 

  1398.          | CURTIME optional_braces
    1399. 

  1399.            {
    1400. 

  1400. -            $$= new (YYTHD->mem_root) Item_func_curtime_local();
    1401. 

  1401. +            $$= new (thd->mem_root) Item_func_curtime_local();
    1402. 

  1402.              if ($$ == NULL)
    1403. 

  1403.                MYSQL_YYABORT;
    1404. 

  1404.              Lex->safe_to_cache_query=0;
    1405. 

  1405.            }
    1406. 

  1406.          | CURTIME '(' expr ')'
    1407. 

  1407.            {
    1408. 

  1408. -            $$= new (YYTHD->mem_root) Item_func_curtime_local($3);
    1409. 

  1409. +            $$= new (thd->mem_root) Item_func_curtime_local($3);
    1410. 

  1410.              if ($$ == NULL)
    1411. 

  1411.                MYSQL_YYABORT;
    1412. 

  1412.              Lex->safe_to_cache_query=0;
    1413. 

  1413. @@ -7684,83 +7656,83 @@
    1414. 

  1414.          | DATE_ADD_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')'
    1415. 

  1415.            %prec INTERVAL_SYM
    1416. 

  1416.            {
    1417. 

  1417. -            $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,0);
    1418. 

  1418. +            $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,0);
    1419. 

  1419.              if ($$ == NULL)
    1420. 

  1420.                MYSQL_YYABORT;
    1421. 

  1421.            
    1422.