Drizzle

Merge lp:~diego-fmpwizard/drizzle/bug-variables-test-461380 into lp:~drizzle-trunk/drizzle/development

  1. bug-variables-test-461380
  2. Merge into development
Proposed by fmpwizard
Status: Merged
Merged at revision: not available
Proposed branch: lp:~diego-fmpwizard/drizzle/bug-variables-test-461380
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 27 lines
1 file modified
tests/t/variables.test (+1/-16)
To merge this branch: bzr merge lp:~diego-fmpwizard/drizzle/bug-variables-test-461380
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+14004@code.launchpad.net
To post a comment you must log in.
Revision history for this message
fmpwizard (diego-fmpwizard) wrote :

Fixed bug#461380 (variables test fails on Stewart's 64 bit SPARC machine)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/t/variables.test'
--- tests/t/variables.test 2009-10-07 08:14:19 +0000
+++ tests/t/variables.test 2009-10-27 02:35:19 +0000
@@ -399,22 +399,7 @@
399#399#
400# Bug #10351: Setting ulong variable to > MAX_ULONG fails on 32-bit platform400# Bug #10351: Setting ulong variable to > MAX_ULONG fails on 32-bit platform
401#401#
402--disable_query_log402 --disable_warnings
403select VARIABLE_VALUE from information_schema.GLOBAL_VARIABLES where VARIABLE_NAME like "VERSION_COMPILE_MACHINE" into @arch;
404--enable_query_log
405#Macos 32-bit uses i386, some(all?) linux use i686 and there may be some i586
406if(!`select strcmp(@arch,"i386")`)
407{
408 --disable_warnings
409}
410if(!`select strcmp(@arch,"i586")`)
411{
412 --disable_warnings
413}
414if(!`select strcmp(@arch,"i686")`)
415{
416 --disable_warnings
417}
418403
419set @@max_heap_table_size= 4294967296;404set @@max_heap_table_size= 4294967296;
420select @@max_heap_table_size > 0;405select @@max_heap_table_size > 0;