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

[fmpwizard]

[fmpwizard (diego-fmpwizard)]

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

=== 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 @@
 #
 # Bug #10351: Setting ulong variable to > MAX_ULONG fails on 32-bit platform
 #
---disable_query_log
-select VARIABLE_VALUE from information_schema.GLOBAL_VARIABLES where VARIABLE_NAME like "VERSION_COMPILE_MACHINE" into @arch;
---enable_query_log
-#Macos 32-bit uses i386, some(all?) linux use i686 and there may be some i586
-if(!`select strcmp(@arch,"i386")`)
-{
-  --disable_warnings
-}
-if(!`select strcmp(@arch,"i586")`)
-{
-  --disable_warnings
-}
-if(!`select strcmp(@arch,"i686")`)
-{
-  --disable_warnings
-}
+  --disable_warnings
 
 set @@max_heap_table_size= 4294967296;
 select @@max_heap_table_size > 0;