summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorjani@ua141d10.elisa.omakaista.fi <>2005-06-30 16:13:22 +0300
committerjani@ua141d10.elisa.omakaista.fi <>2005-06-30 16:13:22 +0300
commitb60175f9c44ebbb6a9dd26847ce1bd6b0b3bc296 (patch)
tree3f010939347799a6ec1afda8dd2533a16f7d9392 /mysql-test
parentff764e2b5aa687deb50285303e12e49be0ee3d9c (diff)
downloadmariadb-git-b60175f9c44ebbb6a9dd26847ce1bd6b0b3bc296.tar.gz
Fixed Bug#11226 and reverted fix for Bug#6993.
Using 8 bytes for data pointer does not work at least on all computers. The result may become 0 or negative number. (mysqld, myisamchk)
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/variables.result4
-rw-r--r--mysql-test/t/variables.test6
2 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 602750d5033..e370202cc9f 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -482,10 +482,10 @@ t1 CREATE TABLE `t1` (
`c3` longtext
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
-SET GLOBAL MYISAM_DATA_POINTER_SIZE= 8;
+SET GLOBAL MYISAM_DATA_POINTER_SIZE= 7;
SHOW VARIABLES LIKE 'MYISAM_DATA_POINTER_SIZE';
Variable_name Value
-myisam_data_pointer_size 8
+myisam_data_pointer_size 7
SET GLOBAL table_cache=-1;
SHOW VARIABLES LIKE 'table_cache';
Variable_name Value
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index e45218a9ed7..b8a12323cf9 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -363,9 +363,13 @@ drop table t1;
#
# Bug #6993: myisam_data_pointer_size
+# Wrong bug report, data pointer size must be restricted to 7,
+# setting to 8 will not work on all computers, myisamchk and
+# the server may see a wrong value, such as 0 or negative number
+# if 8 bytes is set.
#
-SET GLOBAL MYISAM_DATA_POINTER_SIZE= 8;
+SET GLOBAL MYISAM_DATA_POINTER_SIZE= 7;
SHOW VARIABLES LIKE 'MYISAM_DATA_POINTER_SIZE';
#