bk commit into 5.1 tree (jani:1.2558)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jani.  When jani does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-20 16:59:03+02:00, jani@stripped +3 -0
  Fixed a test.

  mysql-test/r/change_user.result@stripped, 2008-02-20 16:59:01+02:00, jani@stripped +2
-2
    Replaced value in result file, it was dependend on architecture.

  mysql-test/t/change_user.test@stripped, 2008-02-20 16:59:01+02:00, jani@stripped +5 -0
    Replaced an architecture dependend value in test

  sql/mysqld.cc@stripped, 2008-02-20 16:59:01+02:00, jani@stripped +1 -5
    Can be made shorter and without ifdefs.

diff -Nrup a/mysql-test/r/change_user.result b/mysql-test/r/change_user.result
--- a/mysql-test/r/change_user.result	2007-12-10 09:12:40 +02:00
+++ b/mysql-test/r/change_user.result	2008-02-20 16:59:01 +02:00
@@ -4,14 +4,14 @@ SELECT @@session.sql_big_selects;
 1
 SELECT @@global.max_join_size;
 @@global.max_join_size
-18446744073709551615
+MAX_JOIN_SIZE
 change_user
 SELECT @@session.sql_big_selects;
 @@session.sql_big_selects
 1
 SELECT @@global.max_join_size;
 @@global.max_join_size
-18446744073709551615
+MAX_JOIN_SIZE
 SET @@global.max_join_size = 10000;
 SET @@session.max_join_size = default;
 change_user
diff -Nrup a/mysql-test/t/change_user.test b/mysql-test/t/change_user.test
--- a/mysql-test/t/change_user.test	2007-10-17 22:43:26 +03:00
+++ b/mysql-test/t/change_user.test	2008-02-20 16:59:01 +02:00
@@ -4,17 +4,22 @@
 
 --echo Bug#20023
 SELECT @@session.sql_big_selects;
+--replace_result 18446744073709551615 MAX_JOIN_SIZE 4294967295 MAX_JOIN_SIZE
 SELECT @@global.max_join_size;
 --echo change_user
 --change_user
 SELECT @@session.sql_big_selects;
+--replace_result 18446744073709551615 MAX_JOIN_SIZE 4294967295 MAX_JOIN_SIZE
 SELECT @@global.max_join_size;
 SET @@global.max_join_size = 10000;
 SET @@session.max_join_size = default;
 --echo change_user
 --change_user
 SELECT @@session.sql_big_selects;
+# On some machines the following will result into a warning
+--disable_warnings
 SET @@global.max_join_size = -1;
+--enable_warnings
 SET @@session.max_join_size = default;
 --echo change_user
 --change_user
diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2008-02-15 17:53:38 +02:00
+++ b/sql/mysqld.cc	2008-02-20 16:59:01 +02:00
@@ -308,11 +308,7 @@ TYPELIB thread_handling_typelib=
 
 const char *first_keyword= "first", *binary_keyword= "BINARY";
 const char *my_localhost= "localhost", *delayed_user= "DELAYED";
-#if SIZEOF_OFF_T > 4 && defined(BIG_TABLES)
-#define GET_HA_ROWS GET_ULL
-#else
-#define GET_HA_ROWS GET_ULONG
-#endif
+#define GET_HA_ROWS (~ (ha_rows) 0)
 
 bool opt_large_files= sizeof(my_off_t) > 4;