Commit 51e8c4ad authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6993
parents c68dfe29 154e64ac

mysql-test/r/variables.result

+4 −0
Original line number Diff line number Diff line
@@ -478,3 +478,7 @@ t1 CREATE TABLE `t1` ( 
  `c3` longtext

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

SET GLOBAL MYISAM_DATA_POINTER_SIZE= 8;

SHOW VARIABLES LIKE 'MYISAM_DATA_POINTER_SIZE';

Variable_name	Value

myisam_data_pointer_size	8

mysql-test/t/variables.test

+7 −0
Original line number Diff line number Diff line
@@ -355,3 +355,10 @@ create table t1 as select @arg00 as c1, @arg01 as c2, @arg02 as c3; 
show create table t1;

drop table t1;





#

# Bug #6993: myisam_data_pointer_size

#



SET GLOBAL MYISAM_DATA_POINTER_SIZE= 8;

SHOW VARIABLES LIKE 'MYISAM_DATA_POINTER_SIZE';

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -5004,7 +5004,7 @@ The minimum value for this variable is 4096.", 
   "Default pointer size to be used for MyISAM tables.",

   (gptr*) &myisam_data_pointer_size,

   (gptr*) &myisam_data_pointer_size, 0, GET_ULONG, REQUIRED_ARG,

   4, 2, 7, 0, 1, 0},

   4, 2, 8, 0, 1, 0},

  {"myisam_max_extra_sort_file_size", OPT_MYISAM_MAX_EXTRA_SORT_FILE_SIZE,

   "Used to help MySQL to decide when to use the slow but safe key cache index create method.",

   (gptr*) &global_system_variables.myisam_max_extra_sort_file_size,