Commit 8144eb5a authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  chilla.local:/home/mydev/mysql-5.1-merge


include/my_sys.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents ddee02ec 53630245

include/my_sys.h

+14 −8
Original line number Diff line number Diff line
@@ -341,12 +341,18 @@ typedef int (*IO_CACHE_CALLBACK)(struct st_io_cache*); 
#ifdef THREAD

typedef struct st_io_cache_share

{

  /* to sync on reads into buffer */

  pthread_mutex_t mutex;

  pthread_cond_t  cond;

  int             count, total;

  /* actual IO_CACHE that filled the buffer */

  struct st_io_cache *active;

  pthread_mutex_t       mutex;           /* To sync on reads into buffer. */

  pthread_cond_t        cond;            /* To wait for signals. */

  pthread_cond_t        cond_writer;     /* For a synchronized writer. */

  /* Offset in file corresponding to the first byte of buffer. */

  my_off_t              pos_in_file;

  /* If a synchronized write cache is the source of the data. */

  struct st_io_cache    *source_cache;

  byte                  *buffer;         /* The read buffer. */

  byte                  *read_end;       /* Behind last valid byte of buffer. */

  int                   running_threads; /* threads not in lock. */

  int                   total_threads;   /* threads sharing the cache. */

  int                   error;           /* Last error. */

#ifdef NOT_YET_IMPLEMENTED

  /* whether the structure should be free'd */

  my_bool alloced;
@@ -720,8 +726,8 @@ extern void setup_io_cache(IO_CACHE* info); 
extern int _my_b_read(IO_CACHE *info,byte *Buffer,uint Count);

#ifdef THREAD

extern int _my_b_read_r(IO_CACHE *info,byte *Buffer,uint Count);

extern void init_io_cache_share(IO_CACHE *info,

				IO_CACHE_SHARE *s, uint num_threads);

extern void init_io_cache_share(IO_CACHE *read_cache, IO_CACHE_SHARE *cshare,

                                IO_CACHE *write_cache, uint num_threads);

extern void remove_io_thread(IO_CACHE *info);

#endif

extern int _my_b_seq_read(IO_CACHE *info,byte *Buffer,uint Count);

include/myisam.h

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ typedef struct st_mi_check_param 
  uint testflag, key_cache_block_size;

  uint8 language;

  my_bool using_global_keycache, opt_lock_memory, opt_follow_links;

  my_bool retry_repair, force_sort, calc_checksum;

  my_bool retry_repair, force_sort;

  char temp_filename[FN_REFLEN],*isam_file_name;

  MY_TMPDIR *tmpdir;

  int tmpfile_createflag;

mysql-test/r/myisam.result

+126 −0
Original line number Diff line number Diff line
@@ -796,6 +796,132 @@ a b 
xxxxxxxxx	bbbbbb

xxxxxxxxx	bbbbbb

DROP TABLE t1;

SET @@myisam_repair_threads=2;

SHOW VARIABLES LIKE 'myisam_repair%';

Variable_name	Value

myisam_repair_threads	2

CREATE TABLE t1 (

`_id` int(11) NOT NULL default '0',

`url` text,

`email` text,

`description` text,

`loverlap` int(11) default NULL,

`roverlap` int(11) default NULL,

`lneighbor_id` int(11) default NULL,

`rneighbor_id` int(11) default NULL,

`length_` int(11) default NULL,

`sequence` mediumtext,

`name` text,

`_obj_class` text NOT NULL,

PRIMARY KEY  (`_id`),

UNIQUE KEY `sequence_name_index` (`name`(50)),

KEY (`length_`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

INSERT INTO t1 VALUES

(1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample1',''),

(2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample2',''),

(3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample3',''),

(4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample4',''),

(5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample5',''),

(6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample6',''),

(7,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample7',''),

(8,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample8',''),

(9,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample9','');

SELECT _id FROM t1;

_id

1

2

3

4

5

6

7

8

9

DELETE FROM t1 WHERE _id < 8;

SHOW TABLE STATUS LIKE 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	10	Dynamic	2	#	#	#	#	140	#	#	#	#	#	#		

CHECK TABLE t1 EXTENDED;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

OPTIMIZE TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	optimize	status	OK

CHECK TABLE t1 EXTENDED;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

SHOW TABLE STATUS LIKE 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	10	Dynamic	2	#	#	#	#	0	#	#	#	#	#	#		

SELECT _id FROM t1;

_id

8

9

DROP TABLE t1;

CREATE TABLE t1 (

`_id` int(11) NOT NULL default '0',

`url` text,

`email` text,

`description` text,

`loverlap` int(11) default NULL,

`roverlap` int(11) default NULL,

`lneighbor_id` int(11) default NULL,

`rneighbor_id` int(11) default NULL,

`length_` int(11) default NULL,

`sequence` mediumtext,

`name` text,

`_obj_class` text NOT NULL,

PRIMARY KEY  (`_id`),

UNIQUE KEY `sequence_name_index` (`name`(50)),

KEY (`length_`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

INSERT INTO t1 VALUES

(1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample1',''),

(2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample2',''),

(3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample3',''),

(4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample4',''),

(5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample5',''),

(6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample6',''),

(7,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample7',''),

(8,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample8',''),

(9,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample9','');

SELECT _id FROM t1;

_id

1

2

3

4

5

6

7

8

9

DELETE FROM t1 WHERE _id < 8;

SHOW TABLE STATUS LIKE 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	10	Dynamic	2	#	#	#	#	140	#	#	#	#	#	#		

CHECK TABLE t1 EXTENDED;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

REPAIR TABLE t1 QUICK;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

CHECK TABLE t1 EXTENDED;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

SHOW TABLE STATUS LIKE 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	10	Dynamic	2	#	#	#	#	140	#	#	#	#	#	#		

SELECT _id FROM t1;

_id

8

9

DROP TABLE t1;

SET @@myisam_repair_threads=1;

SHOW VARIABLES LIKE 'myisam_repair%';

Variable_name	Value

myisam_repair_threads	1

set storage_engine=MyISAM;

drop table if exists t1,t2,t3;

--- Testing varchar ---

mysql-test/t/myisam.test

+91 −0
Original line number Diff line number Diff line
@@ -755,6 +755,97 @@ SELECT * FROM t1; 
DROP TABLE t1;



#

# Bug#8283 - OPTIMIZE TABLE causes data loss

#

SET @@myisam_repair_threads=2;

SHOW VARIABLES LIKE 'myisam_repair%';

#

# Test OPTIMIZE. This creates a new data file.

CREATE TABLE t1 (

  `_id` int(11) NOT NULL default '0',

  `url` text,

  `email` text,

  `description` text,

  `loverlap` int(11) default NULL,

  `roverlap` int(11) default NULL,

  `lneighbor_id` int(11) default NULL,

  `rneighbor_id` int(11) default NULL,

  `length_` int(11) default NULL,

  `sequence` mediumtext,

  `name` text,

  `_obj_class` text NOT NULL,

  PRIMARY KEY  (`_id`),

  UNIQUE KEY `sequence_name_index` (`name`(50)),

  KEY (`length_`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

#

INSERT INTO t1 VALUES

  (1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample1',''),

  (2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample2',''),

  (3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample3',''),

  (4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample4',''),

  (5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample5',''),

  (6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample6',''),

  (7,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample7',''),

  (8,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample8',''),

  (9,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample9','');

#

SELECT _id FROM t1;

DELETE FROM t1 WHERE _id < 8;

--replace_column 6 # 7 # 8 # 9 # 11 # 12 # 13 # 14 # 15 # 16 #

SHOW TABLE STATUS LIKE 't1';

CHECK TABLE t1 EXTENDED;

OPTIMIZE TABLE t1;

CHECK TABLE t1 EXTENDED;

--replace_column 6 # 7 # 8 # 9 # 11 # 12 # 13 # 14 # 15 # 16 #

SHOW TABLE STATUS LIKE 't1';

SELECT _id FROM t1;

DROP TABLE t1;

#

# Test REPAIR QUICK. This retains the old data file.

CREATE TABLE t1 (

  `_id` int(11) NOT NULL default '0',

  `url` text,

  `email` text,

  `description` text,

  `loverlap` int(11) default NULL,

  `roverlap` int(11) default NULL,

  `lneighbor_id` int(11) default NULL,

  `rneighbor_id` int(11) default NULL,

  `length_` int(11) default NULL,

  `sequence` mediumtext,

  `name` text,

  `_obj_class` text NOT NULL,

  PRIMARY KEY  (`_id`),

  UNIQUE KEY `sequence_name_index` (`name`(50)),

  KEY (`length_`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

#

INSERT INTO t1 VALUES

  (1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample1',''),

  (2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample2',''),

  (3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample3',''),

  (4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample4',''),

  (5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample5',''),

  (6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample6',''),

  (7,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample7',''),

  (8,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample8',''),

  (9,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample9','');

#

SELECT _id FROM t1;

DELETE FROM t1 WHERE _id < 8;

--replace_column 6 # 7 # 8 # 9 # 11 # 12 # 13 # 14 # 15 # 16 #

SHOW TABLE STATUS LIKE 't1';

CHECK TABLE t1 EXTENDED;

REPAIR TABLE t1 QUICK;

CHECK TABLE t1 EXTENDED;

--replace_column 6 # 7 # 8 # 9 # 11 # 12 # 13 # 14 # 15 # 16 #

SHOW TABLE STATUS LIKE 't1';

SELECT _id FROM t1;

DROP TABLE t1;

#

SET @@myisam_repair_threads=1;

SHOW VARIABLES LIKE 'myisam_repair%';

# Test varchar

#

mysys/mf_iocache.c

+500 −82

File changed.

Preview size limit exceeded, changes collapsed.