~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

Committer: Lee
Date: 2008-12-24 02:21:17 UTC
mfrom: (745 testable)
mto: (754.1.1 devel) (758.1.3 devel)
mto: This revision was merged to the branch mainline in revision 749.
Revision ID: lbieber@lbieber-desktop-20081224022117-t3xpgbr62jonvl3n

enable subselect_not, subselect_no_mat and variables tests, some other misc clean up on other tests

files renamed:
tests/suite/broken/r/have_debug.require => tests/r/have_debug.require

tests/suite/broken/r/subselect_mat.result => tests/r/subselect_mat.result

tests/suite/broken/r/subselect_no_mat.result => tests/r/subselect_no_mat.result

tests/suite/broken/r/variables.result => tests/r/variables.result

tests/suite/broken/r/variables_debug.result => tests/r/variables_debug.result

tests/suite/broken/t/subselect_mat.test => tests/t/subselect_mat.test

tests/suite/broken/t/subselect_no_mat.test => tests/t/subselect_no_mat.test

tests/suite/broken/t/variables-master.opt => tests/t/variables-master.opt

tests/suite/broken/t/variables.test => tests/t/variables.test

tests/suite/broken/t/variables_debug.test => tests/t/variables_debug.test

files modified:
drizzled/definitions.h

drizzled/lex.h

drizzled/set_var.cc

drizzled/set_var.h

drizzled/sql_table.cc

drizzled/sql_yacc.yy

tests/include/have_debug.inc

tests/r/symlink.result

tests/r/type_enum.result

tests/t/symlink.test

tests/t/type_enum.test

Show diffs side-by-side

added added

removed removed

drizzled/sql_yacc.yy

412

413

%pure_parser /* We have threads */

414

415

Currently there are 93 shift/reduce conflicts.

415

Currently there are 92 shift/reduce conflicts.

416

We should not introduce new conflicts any more.

417

418

%expect 93

418

%expect 92

419

420

421

Comments for TOKENS.

6463

LEX *lex=Lex;

6464

lex->var_list.push_back(new set_var($3, $4.var, &$4.base_name, $6));

6465

}

6466

| NAMES_SYM COLLATE_SYM collation_name_or_default

6467

{

6468

LEX *lex= Lex;

6469

$3= $3 ? $3 : global_system_variables.character_set_client;

6470

lex->var_list.push_back(new set_var_collation_client($3,$3,$3));

6471

}

6472

6466

;

6473

6467

6474

6468

internal_variable_name:

Older »