database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed a test.

Browse Source 
mysql-test/r/change_user.result:
  Replaced value in result file, it was dependend on architecture.
mysql-test/t/change_user.test:
  Replaced an architecture dependend value in test
sql/mysqld.cc:
  Can be made shorter and without ifdefs.
This commit is contained in:
unknown
2008-02-20 16:59:03 +02:00
parent 0baa5b64c3
commit 27498bbaba
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/change_user.result
View File

@ -4,14 +4,14 @@ SELECT @@session.sql_big_selects;
1 1
SELECT @@global.max_join_size; SELECT @@global.max_join_size;
@@global.max_join_size @@global.max_join_size
18446744073709551615 MAX_JOIN_SIZE
change_user change_user
SELECT @@session.sql_big_selects; SELECT @@session.sql_big_selects;
@@session.sql_big_selects @@session.sql_big_selects
1 1
SELECT @@global.max_join_size; SELECT @@global.max_join_size;
@@global.max_join_size @@global.max_join_size
18446744073709551615 MAX_JOIN_SIZE
SET @@global.max_join_size = 10000; SET @@global.max_join_size = 10000;
SET @@session.max_join_size = default; SET @@session.max_join_size = default;
change_user change_user

5
mysql-test/t/change_user.test
View File

@ -4,17 +4,22 @@
--echo Bug#20023 --echo Bug#20023
SELECT @@session.sql_big_selects; SELECT @@session.sql_big_selects;
--replace_result 18446744073709551615 MAX_JOIN_SIZE 4294967295 MAX_JOIN_SIZE
SELECT @@global.max_join_size; SELECT @@global.max_join_size;
--echo change_user --echo change_user
--change_user --change_user
SELECT @@session.sql_big_selects; SELECT @@session.sql_big_selects;
--replace_result 18446744073709551615 MAX_JOIN_SIZE 4294967295 MAX_JOIN_SIZE
SELECT @@global.max_join_size; SELECT @@global.max_join_size;
SET @@global.max_join_size = 10000; SET @@global.max_join_size = 10000;
SET @@session.max_join_size = default; SET @@session.max_join_size = default;
--echo change_user --echo change_user
--change_user --change_user
SELECT @@session.sql_big_selects; SELECT @@session.sql_big_selects;
# On some machines the following will result into a warning
--disable_warnings
SET @@global.max_join_size = -1; SET @@global.max_join_size = -1;
--enable_warnings
SET @@session.max_join_size = default; SET @@session.max_join_size = default;
--echo change_user --echo change_user
--change_user --change_user

6
sql/mysqld.cc
View File

@ -308,11 +308,7 @@ TYPELIB thread_handling_typelib=
const char *first_keyword= "first", *binary_keyword= "BINARY"; const char *first_keyword= "first", *binary_keyword= "BINARY";
const char *my_localhost= "localhost", *delayed_user= "DELAYED"; const char *my_localhost= "localhost", *delayed_user= "DELAYED";
#if SIZEOF_OFF_T > 4 && defined(BIG_TABLES) #define GET_HA_ROWS (~ (ha_rows) 0)
#define GET_HA_ROWS GET_ULL
#else
#define GET_HA_ROWS GET_ULONG
#endif
bool opt_large_files= sizeof(my_off_t) > 4; bool opt_large_files= sizeof(my_off_t) > 4;