← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/parser.cc

  • Committer: Brian Aker
  • Date: 2011-02-17 18:06:59 UTC
  • mfrom: (2178.1.3 drizzle-staging)
  • Revision ID: brian@tangent.org-20110217180659-3so1k4syn5m436cj
Merge in all bison updates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/parser.cc
248
248
  push an error into the error stack and DRIZZLE_YYABORT
249
249
  to abort from the parser.
250
250
*/
251
 
void errorOn(const char *s)
 
251
void errorOn(drizzled::Session *session, const char *s)
252
252
{
253
 
  Session *session= current_session;
254
 
 
255
253
  /* "parse error" changed into "syntax error" between bison 1.75 and 1.875 */
256
254
  if (strcmp(s,"parse error") == 0 || strcmp(s,"syntax error") == 0)
257
255
  {