diff options
| author | unknown <monty@mysql.com> | 2004-05-07 01:43:17 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-07 01:43:17 +0300 |
| commit | f3544f3c5dd137e125a980c151e53ab71b23aba5 (patch) | |
| tree | f2717f686b72c32ff82659eaf22da3a53b8deb1a /mysql-test/r/key_cache.result | |
| parent | ffdf46a58ac73ce0862f1cf632e4254170ed6116 (diff) | |
| download | mariadb-git-f3544f3c5dd137e125a980c151e53ab71b23aba5.tar.gz | |
Portability fixes
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
configure.in:
Fixed problem on IRIX64 (One can't have AC_MSG_RESULT on same row as AC_DEFINE
extra/my_print_defaults.c:
Fixed wrong definition for 'verbose'
include/my_global.h:
Portability fix (IRIX64)
libmysql/client_settings.h:
Remove compiler warnings
libmysql/libmysql.c:
Remove compiler warnings
mysql-test/r/func_str.result:
Updated results
mysql-test/r/key_cache.result:
Updated results to not depend on key_blocks_unused
mysql-test/t/func_str.test:
More test of long overflow
mysql-test/t/key_cache.test:
Updated results to not depend on key_blocks_unused
sql/item.cc:
Portability fix (don't use strtoll())
sql/item.h:
Portability fix (don't use strtoll())
sql/item_sum.h:
Portability fix (don't use strtoll())
sql/item_timefunc.cc:
Fixed compiler warning
strings/ctype-simple.c:
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
strings/ctype-ucs2.c:
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
Diffstat (limited to 'mysql-test/r/key_cache.result')
| -rw-r--r-- | mysql-test/r/key_cache.result | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result index eeb838dc72c..1580f51975e 100644 --- a/mysql-test/r/key_cache.result +++ b/mysql-test/r/key_cache.result @@ -88,11 +88,9 @@ create table t2 (p int primary key, i int, a char(10), key k1(i), key k2(a)); show status like 'key_blocks_used'; Variable_name Value Key_blocks_used 0 -show status like 'The below may fail on 64-bit systems (ingo)'; -Variable_name Value show status like 'key_blocks_unused'; Variable_name Value -Key_blocks_unused 1812 +Key_blocks_unused KEY_BLOCKS_UNUSED insert into t1 values (1, 'qqqq'), (11, 'yyyy'); insert into t2 values (1, 1, 'qqqq'), (2, 1, 'pppp'), (3, 1, 'yyyy'), (4, 3, 'zzzz'); @@ -111,11 +109,9 @@ update t2 set i=2 where i=1; show status like 'key_blocks_used'; Variable_name Value Key_blocks_used 4 -show status like 'The below may fail on 64-bit systems (ingo)'; -Variable_name Value show status like 'key_blocks_unused'; Variable_name Value -Key_blocks_unused 1808 +Key_blocks_unused KEY_BLOCKS_UNUSED cache index t1 key (`primary`) in keycache1; Table Op Msg_type Msg_text test.t1 assign_to_keycache status OK @@ -275,11 +271,9 @@ drop table t1,t2,t3; show status like 'key_blocks_used'; Variable_name Value Key_blocks_used 4 -show status like 'The below may fail on 64-bit systems (ingo)'; -Variable_name Value show status like 'key_blocks_unused'; Variable_name Value -Key_blocks_unused 1812 +Key_blocks_unused KEY_BLOCKS_UNUSED set global keycache2.key_buffer_size=0; set global keycache3.key_buffer_size=100; set global keycache3.key_buffer_size=0; |