~drizzle-trunk/drizzle/development

Merge bug fix from Medina

added added

removed removed

410

--disable_query_log

411

select VARIABLE_VALUE from information_schema.GLOBAL_VARIABLES where VARIABLE_NAME like "VERSION_COMPILE_MACHINE" into @arch;

412

--enable_query_log

413

if(`select strcmp(@arch,"i386")`)

413

if(!`select strcmp(@arch,"i386")`)

414

{

415

--disable_warnings

416

}

420

select @@max_heap_table_size > 0;

421

set @@max_heap_table_size= 4294967296;

422

select @@max_heap_table_size > 0;

423

--enable_warnings

423

424

425

# Bug #11775 Variable character_set_system does not exist (sometimes)

425

426