istruewing@chilla.local 
							
						 
					 
					
						
						
							
						
						38886ffa2b 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines  
						
						... 
						
						
						
						into  chilla.local:/home/mydev/mysql-4.1-bug14400 
						
						
					 
					
						2006-09-12 11:40:24 +02:00 
						 
				 
			
				
					
						
							
							
								istruewing@chilla.local 
							
						 
					 
					
						
						
							
						
						aeae764e64 
					 
					
						
						
							
							Merge chilla.local:/home/mydev/mysql-5.0-bug14400  
						
						... 
						
						
						
						into  chilla.local:/home/mydev/mysql-5.1-bug14400 
						
						
					 
					
						2006-09-07 22:07:52 +02:00 
						 
				 
			
				
					
						
							
							
								istruewing@chilla.local 
							
						 
					 
					
						
						
							
						
						50192889a4 
					 
					
						
						
							
							Merge chilla.local:/home/mydev/mysql-4.1-bug14400  
						
						... 
						
						
						
						into  chilla.local:/home/mydev/mysql-5.0-bug14400 
						
						
					 
					
						2006-09-07 18:46:37 +02:00 
						 
				 
			
				
					
						
							
							
								istruewing@chilla.local 
							
						 
					 
					
						
						
							
						
						45ceab9ec5 
					 
					
						
						
							
							Merge chilla.local:/home/mydev/mysql-4.0-bug14400  
						
						... 
						
						
						
						into  chilla.local:/home/mydev/mysql-4.1-bug14400 
						
						
					 
					
						2006-09-07 16:46:20 +02:00 
						 
				 
			
				
					
						
							
							
								istruewing@chilla.local 
							
						 
					 
					
						
						
							
						
						39c0f0a484 
					 
					
						
						
							
							Bug#14400 - Query joins wrong rows from table which is subject of  
						
						... 
						
						
						
						"concurrent insert"
Additional fix for full keys and test case. 
						
						
					 
					
						2006-09-07 15:39:31 +02:00 
						 
				 
			
				
					
						
							
							
								istruewing@chilla.local 
							
						 
					 
					
						
						
							
						
						7439a52434 
					 
					
						
						
							
							Merge chilla.local:/home/mydev/mysql-4.0-bug14400  
						
						... 
						
						
						
						into  chilla.local:/home/mydev/mysql-4.1-bug14400 
						
						
					 
					
						2006-08-29 21:08:40 +02:00 
						 
				 
			
				
					
						
							
							
								istruewing@chilla.local 
							
						 
					 
					
						
						
							
						
						0b2a9d01ed 
					 
					
						
						
							
							Bug#14400 - Query joins wrong rows from table which is  
						
						... 
						
						
						
						subject of "concurrent insert"
Better fix by Monty: "The previous bug fix didn't work
when using partial keys." 
						
						
					 
					
						2006-08-29 20:45:04 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						31aa966718 
					 
					
						
						
							
							Fix running tests suite with non standard tmp dir.  
						
						... 
						
						
						
						Default is "var/tmp" 
						
						
					 
					
						2006-08-25 10:46:14 +02:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.local 
							
						 
					 
					
						
						
							
						
						73189969f3 
					 
					
						
						
							
							Merge bodhi.local:/opt/local/work/tmp_merge  
						
						... 
						
						
						
						into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge 
						
						
					 
					
						2006-07-26 23:33:25 +04:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.local 
							
						 
					 
					
						
						
							
						
						d7f5d73fc2 
					 
					
						
						
							
							Fix test results to be vardir-independent.  
						
						
						
						
					 
					
						2006-07-10 16:22:42 +04:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.local 
							
						 
					 
					
						
						
							
						
						f183c08476 
					 
					
						
						
							
							A post-merge fix (Bug#8706 "temporary table with data directory option  
						
						... 
						
						
						
						fails" 
						
						
					 
					
						2006-07-10 14:53:49 +04:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.local 
							
						 
					 
					
						
						
							
						
						a2c0cdd75b 
					 
					
						
						
							
							Merge bodhi.local:/opt/local/work/tmp_merge  
						
						... 
						
						
						
						into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41 
						
						
					 
					
						2006-07-08 02:30:07 +04:00 
						 
				 
			
				
					
						
							
							
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						86132d5d8f 
					 
					
						
						
							
							Bug#8706  
						
						... 
						
						
						
						"temporary table with data directory option fails"
  myisam should not use user-specified table name when creating
  temporary tables and use generated connection specific real name.
  Test included. 
						
						
					 
					
						2006-07-05 17:18:59 -07:00 
						 
				 
			
				
					
						
							
							
								elliot@mysql.com 
							
						 
					 
					
						
						
							
						
						bc2b96fee3 
					 
					
						
						
							
							Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge  
						
						... 
						
						
						
						into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1 
						
						
					 
					
						2006-06-25 09:59:34 -04:00 
						 
				 
			
				
					
						
							
							
								svoj@may.pils.ru 
							
						 
					 
					
						
						
							
						
						ffd8ea244d 
					 
					
						
						
							
							Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1  
						
						... 
						
						
						
						into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-5.0 
						
						
					 
					
						2006-06-21 19:41:09 +05:00 
						 
				 
			
				
					
						
							
							
								svoj@may.pils.ru 
							
						 
					 
					
						
						
							
						
						e560564cfa 
					 
					
						
						
							
							Merge april:devel/BitKeeper/mysql-4.1  
						
						... 
						
						
						
						into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1 
						
						
					 
					
						2006-06-21 17:51:16 +05:00 
						 
				 
			
				
					
						
							
							
								svoj@may.pils.ru 
							
						 
					 
					
						
						
							
						
						8b98be2844 
					 
					
						
						
							
							BUG#20357 - Got error 124 from storage engine using MIN and MAX  
						
						... 
						
						
						
						functions in queries
Using MAX()/MIN() on table with disabled indexes (by ALTER TABLE)
results in error 124 (wrong index) from storage engine.
The problem was that optimizer use disabled index to optimize
MAX()/MIN(). Normally it must skip disabled index and perform
table scan.
This patch skips disabled indexes for min/max optimization. 
						
						
					 
					
						2006-06-21 17:30:59 +05:00 
						 
				 
			
				
					
						
							
							
								svoj@may.pils.ru 
							
						 
					 
					
						
						
							
						
						1c42c9730d 
					 
					
						
						
							
							Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0  
						
						... 
						
						
						
						into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1 
						
						
					 
					
						2006-06-20 16:45:51 +05:00 
						 
				 
			
				
					
						
							
							
								svoj@may.pils.ru 
							
						 
					 
					
						
						
							
						
						6a90aede13 
					 
					
						
						
							
							Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1  
						
						... 
						
						
						
						into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 
						
						
					 
					
						2006-06-19 16:06:29 +05:00 
						 
				 
			
				
					
						
							
							
								svoj@may.pils.ru 
							
						 
					 
					
						
						
							
						
						37cdb0fbf3 
					 
					
						
						
							
							BUG#18036 - update of table joined to self reports table as crashed  
						
						... 
						
						
						
						Certain updates of table joined to self results in unexpected
behavior.
The problem was that record cache was mistakenly enabled for
self-joined table updates. Normally record cache must be disabled
for such updates.
Fixed wrong condition in code that determines whether to use
record cache for self-joined table updates.
Only MyISAM tables were affected. 
						
						
					 
					
						2006-06-19 14:05:14 +05:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						976f1da21f 
					 
					
						
						
							
							don't introduce a deprecated syntax  
						
						
						
						
					 
					
						2006-05-08 16:06:16 -04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						343644dd5d 
					 
					
						
						
							
							Added support for key_block_size for key and table level (WL#602)  
						
						... 
						
						
						
						Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl 
						
						
					 
					
						2006-05-03 15:59:17 +03:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						1173185891 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-4.1-bug14980  
						
						... 
						
						
						
						into  mysql.com:/home/mydev/mysql-5.0-bug14980 
						
						
					 
					
						2006-03-10 15:06:04 +01:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						d0c6eb885d 
					 
					
						
						
							
							Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX  
						
						... 
						
						
						
						For "count(*) while index_column = value" an index read
is done. It consists of an index scan and retrieval of
each key.
For efficiency reasons the index scan stores the key in
the special buffer 'lastkey2' once only. At the first 
iteration it notes this fact with the flag 
HA_STATE_RNEXT_SAME in 'info->update'.
For efficiency reasons, the key retrieval for blobs
does not allocate a new buffer, but uses 'lastkey2'...
Now I clear the HA_STATE_RNEXT_SAME flag whenever the 
buffer has been polluted. In this case, the index scan
copies the key value again (and sets the flag again). 
						
						
					 
					
						2006-03-10 15:03:04 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						09ec2919a1 
					 
					
						
						
							
							Make it possible to run mysql-test-run.pl with default test suite in different vardir.  
						
						
						
						
					 
					
						2006-01-24 08:30:54 +01:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						3df2007147 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-4.1-4100  
						
						... 
						
						
						
						into  mysql.com:/home/mydev/mysql-5.0-5000 
						
						
					 
					
						2005-11-16 10:23:42 +01:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						8996fd40cf 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-4.0-bug14616  
						
						... 
						
						
						
						into  mysql.com:/home/mydev/mysql-4.1-4100 
						
						
					 
					
						2005-11-15 16:07:05 +01:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						c5276ebcb0 
					 
					
						
						
							
							Merge, will need post-merge fixes.  
						
						
						
						
					 
					
						2005-11-08 11:22:51 +03:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						1f3df2e669 
					 
					
						
						
							
							Bug#14616 - Freshly imported table returns error 124 when using LIMIT  
						
						... 
						
						
						
						Initialized usable_keys from table->keys_in_use instead of ~0
in test_if_skip_sort_order(). It was possible that a disabled
index was used for sorting. 
						
						
					 
					
						2005-11-07 12:16:49 +01:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						8b9bab2763 
					 
					
						
						
							
							Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment,  
						
						... 
						
						
						
						do advance the source pointer over 2 bytes that specify value length. 
						
						
					 
					
						2005-10-28 23:31:32 +04:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						be6f7a3f82 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-10-28 11:00:54 +02:00 
						 
				 
			
				
					
						
							
							
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						cbe21a8eb6 
					 
					
						
						
							
							Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1  
						
						... 
						
						
						
						into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp 
						
						
					 
					
						2005-10-27 23:43:20 +03:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						15a78334c3 
					 
					
						
						
							
							BUG#9622, stage 2, work together with fix for BUG#12232:  
						
						... 
						
						
						
						added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622). 
						
						
					 
					
						2005-10-21 06:29:17 +04:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						7d29c2a4a1 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test 
						
						
					 
					
						2005-10-12 13:59:00 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						0ac28d3187 
					 
					
						
						
							
							Always test ssl and compress  
						
						... 
						
						
						
						- Updated after review 
						
						
					 
					
						2005-10-12 13:56:07 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						a083ff160e 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2005-09-21 13:53:22 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						f9475d1d15 
					 
					
						
						
							
							BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index  
						
						... 
						
						
						
						statistics (like 4.0 did) (patch #3 , with review #1  & #2  feedback addressed) 
						
						
					 
					
						2005-09-21 02:18:29 +04:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						5d41d5e0f4 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-4.1-4100  
						
						... 
						
						
						
						into  mysql.com:/home/mydev/mysql-5.0-5000 
						
						
					 
					
						2005-08-29 18:18:30 +02:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						5845a6e553 
					 
					
						
						
							
							Bug#10056 - PACK_KEYS option take values greater than 1 while creating table  
						
						... 
						
						
						
						Added a switch to reject illegal values for PACK_KEYS. 
						
						
					 
					
						2005-08-29 17:24:07 +02:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						330eb04536 
					 
					
						
						
							
							Bug#12296 - CHECKSUM TABLE reports 0 for the table  
						
						... 
						
						
						
						Skipping deleted records instead of breaking the loop
during checksum calculation. 
						
						
					 
					
						2005-08-29 17:08:41 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						293cfafd37 
					 
					
						
						
							
							Merge deer.(none):/home/hf/work/mysql-4.1.clean  
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-5.0.clean 
						
						
					 
					
						2005-08-04 16:36:14 +05:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						b16812e6ca 
					 
					
						
						
							
							Merge deer.(none):/home/hf/work/mysql-4.1.clean  
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-4.1.11083 
						
						
					 
					
						2005-08-04 16:30:36 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						15d48525af 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-07-28 17:09:54 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3c12d0ae54 
					 
					
						
						
							
							Added end marker for tests to make future merges easier  
						
						
						
						
					 
					
						2005-07-28 03:22:47 +03:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						67e5b2c83c 
					 
					
						
						
							
							Fix for bug  #11083  (myisam test fails witout-geometry)  
						
						
						
						
					 
					
						2005-07-27 21:54:02 +05:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						3f6aad900c 
					 
					
						
						
							
							Resolve merge from 4.1  
						
						
						
						
					 
					
						2005-05-18 11:06:34 -07:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						480957e7e6 
					 
					
						
						
							
							Fix for BUG#9622: Make index statistics collection in MyISAM behave the same  
						
						... 
						
						
						
						way in ALTER TABLE ... ENABLE KEYS, ANALYZE TABLE and after bulk insert:
now statistics collection always assumes NULLs are inequal. 
						
						
					 
					
						2005-05-14 00:21:53 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						2d25da2a4b 
					 
					
						
						
							
							concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file  
						
						... 
						
						
						
						myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors 
						
						
					 
					
						2005-05-13 12:08:08 +03:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						ab0acbe14d 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-04-16 17:58:11 +02:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						3add511de7 
					 
					
						
						
							
							Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)  
						
						... 
						
						
						
						Since 4.1 keys are compared with trailing spaces. 
Thus, a "x " key can be inserted between a couple of "x" keys.
The existing code did not take this into account. Though the
comments in the code claimed it did. 
						
						
					 
					
						2005-04-08 14:13:02 +02:00