~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/param.cc

Committer: Lee
Date: 2008-12-24 19:44:24 UTC
mfrom: (750 testable)
mto: (754.1.1 devel) (758.1.3 devel)
mto: This revision was merged to the branch mainline in revision 755.
Revision ID: lbieber@lbieber-desktop-20081224194424-72rm7mjyfw1sl0bu

enable remaining subselect tests, merge with latest from the trunk

files removed:
tests/include/have_debug.inc

tests/r/variables_debug.result

tests/t/variables_debug.test

files renamed:
tests/suite/broken/r/subselect_no_opts.result => tests/r/subselect_no_opts.result

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

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

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

files modified:
drizzled/drizzled.cc

drizzled/function/time/date_format.cc

drizzled/item.cc

drizzled/item/create.cc

drizzled/item/param.cc

drizzled/log_event.cc

drizzled/protocol.cc

drizzled/session.cc

drizzled/session.h

drizzled/set_var.cc

drizzled/set_var.h

drizzled/sql_base.cc

drizzled/sql_connect.cc

drizzled/sql_lex.cc

drizzled/sql_parse.cc

drizzled/sql_yacc.yy

libdrizzle/drizzle.c

tests/include/mix2.inc

tests/r/mix2_myisam.result

tests/r/mysql.result

tests/r/variables.result

tests/t/variables.test

Show diffs side-by-side

added added

removed removed

drizzled/item/param.cc

251

case STRING_RESULT:

252

{

253

const CHARSET_INFO * const fromcs= entry->collation.collation;

254

const CHARSET_INFO * const tocs= session->variables.collation_connection;

254

const CHARSET_INFO * const tocs= session->variables.getCollation();

255

uint32_t dummy_offset;

256

257

value.cs_info.character_set_of_placeholder=

Older »