Drizzle

Merge lp://staging/~diego-fmpwizard/drizzle/bug-variables-test-461380 into lp://staging/~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://staging/~diego-fmpwizard/drizzle/bug-variables-test-461380
Merge into: lp://staging/~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://staging/~diego-fmpwizard/drizzle/bug-variables-test-461380
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+14004@code.staging.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
1=== modified file 'tests/t/variables.test'
2--- tests/t/variables.test 2009-10-07 08:14:19 +0000
3+++ tests/t/variables.test 2009-10-27 02:35:19 +0000
4@@ -399,22 +399,7 @@
5 #
6 # Bug #10351: Setting ulong variable to > MAX_ULONG fails on 32-bit platform
7 #
8---disable_query_log
9-select VARIABLE_VALUE from information_schema.GLOBAL_VARIABLES where VARIABLE_NAME like "VERSION_COMPILE_MACHINE" into @arch;
10---enable_query_log
11-#Macos 32-bit uses i386, some(all?) linux use i686 and there may be some i586
12-if(!`select strcmp(@arch,"i386")`)
13-{
14- --disable_warnings
15-}
16-if(!`select strcmp(@arch,"i586")`)
17-{
18- --disable_warnings
19-}
20-if(!`select strcmp(@arch,"i686")`)
21-{
22- --disable_warnings
23-}
24+ --disable_warnings
25
26 set @@max_heap_table_size= 4294967296;
27 select @@max_heap_table_size > 0;