monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a4b0ec1ede 
					 
					
						
						
							
							Merge with 4.0, mainly to get changes to windows project files  
						
						 
						
						
						
						
					 
					
						2004-05-20 00:54:52 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						8becc50685 
					 
					
						
						
							
							Fix for BUG33649: Post-review fixes  
						
						 
						
						
						
						
					 
					
						2004-05-19 02:18:54 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						482058befa 
					 
					
						
						
							
							Fix and test case for BUG#3649.  
						
						 
						
						
						
						
					 
					
						2004-05-18 22:59:43 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						53c810cda4 
					 
					
						
						
							
							merge fixes (use old code)  
						
						 
						
						
						
						
					 
					
						2004-03-18 00:16:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						350b433569 
					 
					
						
						
							
							merge with 4.0  
						
						 
						
						
						
						
					 
					
						2004-03-16 22:41:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						4ee44751d9 
					 
					
						
						
							
							Fixed memory leak in DROP DATABASE when using RAID tables (Bug  #2882 )  
						
						 
						
						
						
						
					 
					
						2004-03-10 13:46:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						14b9fa3588 
					 
					
						
						
							
							revision of fix_fields() calls (BUG2838)  
						
						 
						
						
						
						
					 
					
						2004-02-18 01:08:52 +02: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						74a9ca1991 
					 
					
						
						
							
							ufter revview fix (BUG#2120)  
						
						 
						
						
						
						
					 
					
						2004-02-09 14:44:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						90c6ecca93 
					 
					
						
						
							
							BUG#2304 - HANDLER and tables in non-current db  
						
						 
						
						
						
						
					 
					
						2004-01-13 12:31:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b01fcb4e14 
					 
					
						
						
							
							Merge with 4.0 to get:  
						
						 
						
						... 
						
						
						
						Fix for storing negative values in decimal fields
Fix for FLUSH TABLE with HANDLER 
						
						
					 
					
						2003-11-20 22:30:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7c6113a39f 
					 
					
						
						
							
							Merge key cache structures to one  
						
						 
						
						... 
						
						
						
						Fixed compiler warnings (IRIX C compiler and VC++) 
						
						
					 
					
						2003-11-20 22:06:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						11f70bdfc4 
					 
					
						
						
							
							Bug#1826, HANDLER+ALTER TABLE=crash (unfortunately, it cannot be tested in mysql-test suite)  
						
						 
						
						... 
						
						
						
						more user variable tests 
						
						
					 
					
						2003-11-18 22:06:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						a47d56088f 
					 
					
						
						
							
							Merge with 4.0 tree  
						
						 
						
						
						
						
					 
					
						2003-11-18 18:54:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						0b7ccfa882 
					 
					
						
						
							
							make error message more detailed  
						
						 
						
						
						
						
					 
					
						2003-11-12 22:33:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						e87c9f5ff8 
					 
					
						
						
							
							merge with 4.0  
						
						 
						
						
						
						
					 
					
						2003-10-16 03:08:40 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6ef4dc29c3 
					 
					
						
						
							
							fixed: thread lock-up on a FLASH TABLE when another thread has an open handler  
						
						 
						
						... 
						
						
						
						Bug#1204 
						
						
					 
					
						2003-09-09 19:23:01 +02: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@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2263e3e51f 
					 
					
						
						
							
							Merge with 4.0.14  
						
						 
						
						
						
						
					 
					
						2003-08-11 22:44:43 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a3fe7c0959 
					 
					
						
						
							
							Remove compiler warnings  
						
						 
						
						... 
						
						
						
						Simple cleanup of previous pull 
						
						
					 
					
						2003-07-04 23:06:19 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						15346c8a66 
					 
					
						
						
							
							fix and test case for the bug  #787 : HANDLER without INDEX doesn't work with deleted rows  
						
						 
						
						
						
						
					 
					
						2003-07-04 17:15:16 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						40b6d07439 
					 
					
						
						
							
							handler should be used with constant expressions only (or rand)  
						
						 
						
						
						
						
					 
					
						2003-07-04 12:55:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						2927f2a293 
					 
					
						
						
							
							fix and test case for the bug  #787 : HANDLER without INDEX doesn't work with deleted rows  
						
						 
						
						
						
						
					 
					
						2003-07-04 14:41:01 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						dbb95326b0 
					 
					
						
						
							
							Proposed fix for  #751  
						
						 
						
						... 
						
						
						
						Fields in key_expr (mysql_ha_read) wasn't linked to tables.
Hmm. How did it work at all? 
						
						
					 
					
						2003-07-03 20:57:51 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						9a46698e1e 
					 
					
						
						
							
							Merge with 4.0.11  
						
						 
						
						
						
						
					 
					
						2003-02-26 01:03:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						e7715445f3 
					 
					
						
						
							
							ALTER TABLE closes all open HANDLER's for the table in question  
						
						 
						
						... 
						
						
						
						fixed error handling in HANDLER ... READ FIRST 
						
						
					 
					
						2003-02-22 18:00:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						90bf074438 
					 
					
						
						
							
							Merge with 4.0.11 tree to get latest bug fixes  
						
						 
						
						
						
						
					 
					
						2003-02-17 05:43:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6051b2f998 
					 
					
						
						
							
							Fixed multi-table-delete for InnoDB tables  
						
						 
						
						... 
						
						
						
						Novell patches 
						
						
					 
					
						2003-02-17 02:14:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						25de9c19b2 
					 
					
						
						
							
							After merge fixes & remove compiler warnings  
						
						 
						
						... 
						
						
						
						Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files 
						
						
					 
					
						2003-02-07 15:47:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						023d6dd39b 
					 
					
						
						
							
							Merge with 4.0.11  
						
						 
						
						
						
						
					 
					
						2003-02-04 21:52:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						4fb3244014 
					 
					
						
						
							
							fixed "DROP table_open_in_handler" hang  
						
						 
						
						
						
						
					 
					
						2003-01-28 14:36:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7436e9ec97 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-01-21 21:28:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						25c393a12e 
					 
					
						
						
							
							Portability fixes (for windows)  
						
						 
						
						... 
						
						
						
						Some changes to the prepared statement protocol to make it easier to use and faster. 
						
						
					 
					
						2003-01-21 21:07:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						372e2130e4 
					 
					
						
						
							
							fixed test of cardinality  
						
						 
						
						
						
						
					 
					
						2003-01-21 13:55:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						1b656d45fb 
					 
					
						
						
							
							sql_handler.cc:  
						
						 
						
						... 
						
						
						
						Backport the InnoDB HANDLER bug fix from 4.1 
						
						
					 
					
						2003-01-13 23:00:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						4bf33c022a 
					 
					
						
						
							
							sql_handler.cc:  
						
						 
						
						... 
						
						
						
						Fix InnoDB HANDLER: InnoDB must know in each call that the handle is used by HANDLER; the previous implementation worked only by pure luck 
						
						
					 
					
						2003-01-13 18:20:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d3eb993a27 
					 
					
						
						
							
							rename of net_pkg.cc to protocol.cc  
						
						 
						
						... 
						
						
						
						Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements. 
						
						
					 
					
						2002-12-11 09:17:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						859b688476 
					 
					
						
						
							
							Merge with 4.0.6  
						
						 
						
						
						
						
					 
					
						2002-12-05 19:38:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						8830eb4aa9 
					 
					
						
						
							
							Change of internal key_field=NULL handling to avoid error messages.  
						
						 
						
						... 
						
						
						
						Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable 
						
						
					 
					
						2002-12-03 13:08:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						39ddd2dcb4 
					 
					
						
						
							
							checking columns of top items  
						
						 
						
						
						
						
					 
					
						2002-11-29 12:30:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						d552ba7d8a 
					 
					
						
						
							
							support for HA_READ_PREFIX_LAST_OR_PREV in headres  
						
						 
						
						... 
						
						
						
						full support for HA_READ_PREFIX_LAST_OR_PREV in MyISAM
protected by #if NOT_IMPLEMENTED_YET in opt_range.cc as not all table handlers support it 
						
						
					 
					
						2002-10-25 14:09:47 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						0f39457613 
					 
					
						
						
							
							Merge with 4.0.4  
						
						 
						
						
						
						
					 
					
						2002-10-02 17:55:12 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d69250a969 
					 
					
						
						
							
							Fixes and code cleanups after merge with 4.0.3  
						
						 
						
						... 
						
						
						
						Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22 
						
						
					 
					
						2002-10-02 13:33:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						cb8580a2cd 
					 
					
						
						
							
							Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.  
						
						 
						
						... 
						
						
						
						This should fix some issues where --lower-case-table-names doesn't work properly under windows. 
						
						
					 
					
						2002-09-20 14:05:18 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						7134ffec21 
					 
					
						
						
							
							Merge with 4.0.3  
						
						 
						
						... 
						
						
						
						Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed) 
						
						
					 
					
						2002-08-30 12:40:40 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						22bcce253e 
					 
					
						
						
							
							Adding a necessary functionality to ::store and ::save_in_field  
						
						 
						
						... 
						
						
						
						that will take place properly after pull from 4.0, in order to 
handle conversions from quoted constants to bigint's. 
						
						
					 
					
						2002-08-24 14:49:04 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						99a954f405 
					 
					
						
						
							
							InnoDB support for HANDLER  
						
						 
						
						
						
						
					 
					
						2002-08-21 20:55:34 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						2cf620004e 
					 
					
						
						
							
							subselect in having clause  
						
						 
						
						... 
						
						
						
						fixed bug in sum function in subselect 
						
						
					 
					
						2002-07-01 14:14:51 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						2426972c5b 
					 
					
						
						
							
							semaphores replaced by rwlock  
						
						 
						
						
						
						
					 
					
						2002-06-30 12:08:58 +03:00