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 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						aa6ab3b49c 
					 
					
						
						
							
							Move handler dependent tests to the specific handler (myisam, bdb, innodb)  
						
						... 
						
						
						
						Enabled VARCHAR testing for innodb
NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP 
						
						
					 
					
						2005-03-17 01:22:12 +02:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						306bd2fc69 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-03-02 10:56:13 +01:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						d3d7c46b1c 
					 
					
						
						
							
							Bug#8306 - TRUNCATE leads to index corruption  
						
						... 
						
						
						
						Added a check, if the table, which we are going to create, is open.
This can happen if a MERGE mapped table is TRUNCATEd. 
						
						
					 
					
						2005-03-02 10:35:00 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cd78e701a5 
					 
					
						
						
							
							Show all generated warnings in SHOW ERROR  
						
						... 
						
						
						
						Previously we only stored the first given error (the error sent to the client) 
						
						
					 
					
						2005-02-24 23:33:42 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f55e200248 
					 
					
						
						
							
							Fixed compiler warnings  
						
						... 
						
						
						
						Fixed failing myisam.test and rpl_rotate_logs.test on some configurations 
						
						
					 
					
						2005-02-22 14:15:50 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f5acf0be01 
					 
					
						
						
							
							Generate warning in ha_delete_table() if files is missing in handler  
						
						
						
						
					 
					
						2005-02-21 20:41:48 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						77207d19f2 
					 
					
						
						
							
							Merge with new VARCHAR code  
						
						
						
						
					 
					
						2004-12-06 19:18:35 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						67ce247965 
					 
					
						
						
							
							Add support for up to VARCHAR (size up to 65535)  
						
						... 
						
						
						
						Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short 
						
						
					 
					
						2004-12-06 02:00:37 +02:00 
						 
				 
			
				
					
						
							
							
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						30f0c495b7 
					 
					
						
						
							
							Backport of fix making myisam test results repeatable  
						
						
						
						
					 
					
						2004-11-22 14:17:04 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						05bf95dc15 
					 
					
						
						
							
							make the test results repeatable  
						
						
						
						
					 
					
						2004-11-21 15:37:52 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						994d648dda 
					 
					
						
						
							
							space-stripping in _mi_prefix_search: BUG#5284  
						
						
						
						
					 
					
						2004-08-30 16:12:53 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e1237cbc53 
					 
					
						
						
							
							manually merged  
						
						
						
						
					 
					
						2004-08-18 19:57:55 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						f4244cd00e 
					 
					
						
						
							
							bug#4816. index search for NULL in blob  
						
						
						
						
					 
					
						2004-08-01 13:26:01 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6fc74e13e7 
					 
					
						
						
							
							post-review fixes  
						
						... 
						
						
						
						HA_EXTRA_WRITE_CACHE now part of start_bulk_insert()
test cleanups 
						
						
					 
					
						2004-04-07 16:04:28 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e8eda8129f 
					 
					
						
						
							
							::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()  
						
						... 
						
						
						
						Field::val_str simplification, comment 
						
						
					 
					
						2004-04-06 21:35:26 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						dc2f606fb8 
					 
					
						
						
							
							Merge with 4.0 to get lastest bug fixes  
						
						
						
						
					 
					
						2004-03-29 19:21:53 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						48680ee3a0 
					 
					
						
						
							
							Allow keys with 0 segements in MyISAM  
						
						... 
						
						
						
						This fixed a bug in SELECT DISTINCT when all selected parts where constants. (Bug #3203 ) 
						
						
					 
					
						2004-03-26 14:44:52 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						7ff24eb01f 
					 
					
						
						
							
							longer myisam keys  
						
						
						
						
					 
					
						2004-02-20 20:38:34 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f43093ec0e 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t) 
						
						
					 
					
						2004-02-16 10:03:25 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ce14578909 
					 
					
						
						
							
							Merge with 4.0.18  
						
						
						
						
					 
					
						2004-02-11 00:06:46 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						151b558e21 
					 
					
						
						
							
							Mark that strings may change on index only reads (for BDB tables).  
						
						... 
						
						
						
						This fixed problem with index reads on character fields with BDB tables. (Bug #2509 ) 
						
						
					 
					
						2004-01-29 15:16:48 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						faa8252b10 
					 
					
						
						
							
							test moved to an appropriate file  
						
						
						
						
					 
					
						2004-01-21 23:39:35 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						0371c68e3e 
					 
					
						
						
							
							two more bugfixes for "space stripping in MyISAM indexes"  
						
						
						
						
					 
					
						2004-01-21 23:29:17 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e7a37d41b0 
					 
					
						
						
							
							test case for MyISAM sort-repair bug  
						
						
						
						
					 
					
						2004-01-21 21:43:41 +01:00 
						 
				 
			
				
					
						
							
							
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						fcf96dbb18 
					 
					
						
						
							
							WorkLog#1323  
						
						... 
						
						
						
						Deprecate the use of TYPE=... Preferred syntax is ENGINE= 
						
						
					 
					
						2003-12-10 04:31:42 +00:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						12009f5d04 
					 
					
						
						
							
							Merge with 3.23 to get 4.0 tree in sync (no relevant changes to 4.0 tree)  
						
						
						
						
					 
					
						2003-10-23 13:25:16 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c60a75e9ba 
					 
					
						
						
							
							Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)  
						
						
						
						
					 
					
						2003-10-11 23:26:39 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.mysql.fi 
							
						 
					 
					
						
						
							
						
						498e1c6d95 
					 
					
						
						
							
							Fixed memory leak in send_file  
						
						
						
						
					 
					
						2003-10-08 21:02:53 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						73f66f68fd 
					 
					
						
						
							
							merge with 4.0.15  
						
						
						
						
					 
					
						2003-09-11 20:24:14 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						45aa92c574 
					 
					
						
						
							
							After merge fixes.  
						
						... 
						
						
						
						Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code) 
						
						
					 
					
						2003-09-11 19:06:23 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						75b2c4a62f 
					 
					
						
						
							
							Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header was not updated directly after an UPDATE of split dynamic rows.  
						
						
						
						
					 
					
						2003-09-05 06:42:55 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4b3b4b9250 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-09-03 19:53:08 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						755455e15c 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2003-09-03 12:07:18 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2fcab1c2ee 
					 
					
						
						
							
							CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]  
						
						
						
						
					 
					
						2003-09-03 11:34:32 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						77a70a0a24 
					 
					
						
						
							
							merge with 4.0.15  
						
						
						
						
					 
					
						2003-08-29 13:44:35 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						8a77f97079 
					 
					
						
						
							
							Add detection of in_addr_t  
						
						... 
						
						
						
						Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.
(This will probably solve bug #563 )
Fix test for available file descriptors in mysqltest
Fixed core dump bug in replication tests when running without transactional table support 
						
						
					 
					
						2003-08-28 06:08:17 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						4f7512160b 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings 
						
						
					 
					
						2003-08-19 00:08:08 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a7708c7904 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2003-04-03 21:19:12 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						618857b6eb 
					 
					
						
						
							
							Merge with 3.23 to get fixes for:  
						
						... 
						
						
						
						mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix. 
						
						
					 
					
						2003-04-03 12:33:13 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						a496daf777 
					 
					
						
						
							
							A fix for a bug in MyISAM with large number of NULL columns and at  
						
						... 
						
						
						
						least one BLOB column. 
						
						
					 
					
						2003-03-25 14:49:43 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						e6a724fd83 
					 
					
						
						
							
							A fix for a bug when INSERT is attempted into a table with a BLOB and  
						
						... 
						
						
						
						many NULL columns.
It could be ported back to 3.23 too .... 
						
						
					 
					
						2003-03-20 19:04:30 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						e327393e9d 
					 
					
						
						
							
							Fixed a lot of wrong memory references as reported by valgrind  
						
						... 
						
						
						
						Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now. 
						
						
					 
					
						2003-02-12 21:55:37 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						bf683af4ce 
					 
					
						
						
							
							Post merge fix  
						
						... 
						
						
						
						Allow empty key list in USE|IGNORE|FORCE INDEX() 
						
						
					 
					
						2003-01-09 22:42:31 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f8e660d88c 
					 
					
						
						
							
							merge with 4.0.9  
						
						... 
						
						
						
						To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys 
						
						
					 
					
						2003-01-09 03:55:26 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						3c08da957e 
					 
					
						
						
							
							Don't count NULL values in cardinalty for MyISAM tables.  
						
						... 
						
						
						
						Free row buffer cache after each query for MyISAM tables.
Added table join option FORCE INDEX
Fixed core dump bug when connecting with hostname that could not be resolved. 
						
						
					 
					
						2003-01-09 02:19:14 +02:00