igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						f12cbd4bb8 
					 
					
						
						
							
							Manual merge after improving concurrency for key cache reassignment  
						
						
						
						
					 
					
						2003-10-01 20:20:17 -07: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 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						be96cc0984 
					 
					
						
						
							
							bug  #1172  - crash on force index() and SEL_ARG::MAYBE_KEY  
						
						
						
						
					 
					
						2003-09-03 22:27:04 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						77a70a0a24 
					 
					
						
						
							
							merge with 4.0.15  
						
						
						
						
					 
					
						2003-08-29 13:44:35 +03:00 
						 
				 
			
				
					
						
							
							
								jcole@mugatu.spaceapes.com 
							
						 
					 
					
						
						
							
						
						7a50118793 
					 
					
						
						
							
							opt_range.cc: Fixes for out of memory conditions.  
						
						
						
						
					 
					
						2003-08-28 16:06:13 -04: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 
							
						 
					 
					
						
						
							
						
						a9146ace70 
					 
					
						
						
							
							Cleanups to recent patches  
						
						... 
						
						
						
						Fix packet error when using wrong GRANT command 
						
						
					 
					
						2003-08-15 09:54:19 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2263e3e51f 
					 
					
						
						
							
							Merge with 4.0.14  
						
						
						
						
					 
					
						2003-08-11 22:44:43 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						df8b7799cb 
					 
					
						
						
							
							between range optimization bug (between with const on one end only)  
						
						
						
						
					 
					
						2003-08-08 19:13:27 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						a60acfcfe0 
					 
					
						
						
							
							Old style charset() and set_charset() were removed.  
						
						
						
						
					 
					
						2003-08-05 12:52:37 +05:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						a35fff5bc3 
					 
					
						
						
							
							Item_func_null doesn't have a separate Item for the first argument anymore.  
						
						... 
						
						
						
						args[0] is used instead. This allowed to resuse a lot of code. 
						
						
					 
					
						2003-07-16 11:29:16 +05:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						4aac5d9938 
					 
					
						
						
							
							enabling HA_READ_PREFIX_LAST_OR_PREV  
						
						
						
						
					 
					
						2003-07-04 12:07:06 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						9fb7e863ad 
					 
					
						
						
							
							Optimized old patches  
						
						... 
						
						
						
						Don't set field to DEFAULT value when set to NULL 
						
						
					 
					
						2003-07-01 14:38:38 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8075aac74f 
					 
					
						
						
							
							bug with ranges and not_null_col=can_be_null_expr fixed  
						
						
						
						
					 
					
						2003-06-26 21:30:53 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						bdb66d24dd 
					 
					
						
						
							
							ORDER BY optimization  
						
						... 
						
						
						
						Fixed new bug when reading field types 
						
						
					 
					
						2003-05-27 18:40:37 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00 
						 
				 
			
				
					
						
							
							
								igor@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						80615fade2 
					 
					
						
						
							
							Many files:  
						
						... 
						
						
						
						Added the MAX_LENGTH_FOR_SORT_DATA option
filesort.cc:
  Added the MAX_LENGTH_FOR_SORT_DATA option 
						
						
					 
					
						2003-04-24 14:33:33 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f6a43bd567 
					 
					
						
						
							
							Fixes for valgrind  
						
						... 
						
						
						
						Added optimzation for clustered index
Fixed bug in UPDATE ... ORDER BY
Fixed handling of UPDATE ... LIMIT 
						
						
					 
					
						2003-04-23 21:52:16 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a434bca704 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2003-03-16 19:17:54 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f1635f64f9 
					 
					
						
						
							
							Merge with 3.23 to get fixes for --user and BACKUP TABLE  
						
						
						
						
					 
					
						2003-03-10 12:48:43 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						937241aded 
					 
					
						
						
							
							Fixed an unlikely optimizer bug that casued a core dump in pt_range.cc::sel_cmp()  
						
						
						
						
					 
					
						2003-03-07 14:40:37 +02:00 
						 
				 
			
				
					
						
							
							
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4f5de08278 
					 
					
						
						
							
							Bug fix: rtree should handle nulls itself  
						
						
						
						
					 
					
						2003-02-19 13:21:21 +04:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						d0f198ff5d 
					 
					
						
						
							
							sql_table.cc, field.cc:  
						
						... 
						
						
						
						Bug fix
opt_range.cc:
  Buf fix 
						
						
					 
					
						2003-02-17 16:47:48 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						aee7346ec1 
					 
					
						
						
							
							Merge mashka.mysql.fi:/home/my/mysql-4.0  
						
						... 
						
						
						
						into mashka.mysql.fi:/home/my/mysql-4.1 
						
						
					 
					
						2003-02-10 01:21:39 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c0b655aa38 
					 
					
						
						
							
							Fixed memory reference error when doing key_column <=> NULL on column that is defined as NOT NULL  
						
						
						
						
					 
					
						2003-02-10 01:21:09 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7388c5f161 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-02-08 01:12:58 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						1b9b042654 
					 
					
						
						
							
							Fix problem in MIN/MAX optimisation (from last patch)  
						
						... 
						
						
						
						Don't make OLD_PASSWORD() a reserved word 
						
						
					 
					
						2003-02-07 17:57:07 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						b14b246d38 
					 
					
						
						
							
							Merge with 4.0 to get fix for MIN/MAX  
						
						
						
						
					 
					
						2003-02-07 16:38:37 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						cf9668fd37 
					 
					
						
						
							
							Added START TRANSACTION syntax  
						
						... 
						
						
						
						Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement) 
						
						
					 
					
						2003-02-06 16:55:59 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						735399a850 
					 
					
						
						
							
							Move latin1 into a separarte file  
						
						
						
						
					 
					
						2003-01-29 17:31:20 +04: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 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7e9b27eaf5 
					 
					
						
						
							
							Updates for multi-byte character sets  
						
						... 
						
						
						
						(Note: test 'union' fails, but Sanja promised to fix this) 
						
						
					 
					
						2003-01-14 14:28:36 +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 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						fe9e139056 
					 
					
						
						
							
							postreview fix (SCRUM)  
						
						... 
						
						
						
						fixed layout 
						
						
					 
					
						2002-12-28 01:01:05 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						6bcc515739 
					 
					
						
						
							
							less default_charset_info  
						
						
						
						
					 
					
						2002-12-20 17:14:46 +04:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e5103ce714 
					 
					
						
						
							
							Less "default_charset_info"  
						
						
						
						
					 
					
						2002-12-19 15:27:46 +04: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 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						f89d91c53c 
					 
					
						
						
							
							Fixed bug in <=> NULL handling  
						
						
						
						
					 
					
						2002-12-02 10:47:15 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						3d1af24f0f 
					 
					
						
						
							
							Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1  
						
						
						
						
					 
					
						2002-11-25 17:34:51 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						5dbea1b7a2 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2002-11-25 12:19:28 +02:00 
						 
				 
			
				
					
						
							
							
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						6828b06cf4 
					 
					
						
						
							
							Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.r18.ru:/usr/home/ram/mysql-4.1.monty1 
						
						
					 
					
						2002-11-25 12:15:34 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						a976101661 
					 
					
						
						
							
							merge with 3.23 to get bugfixes for <=> NULL and --bind-address  
						
						
						
						
					 
					
						2002-11-24 16:37:41 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						e1af5fb24d 
					 
					
						
						
							
							Fixed bug with indexed NULL column <=> NULL  
						
						... 
						
						
						
						Fix for Mac OS X shutdown 
						
						
					 
					
						2002-11-22 13:35:43 +02:00 
						 
				 
			
				
					
						
							
							
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8894946a40 
					 
					
						
						
							
							fix for wrong index number bug  
						
						
						
						
					 
					
						2002-11-21 22:21:14 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dac6498f9b 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2002-11-21 15:56:48 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						41554da7ff 
					 
					
						
						
							
							move like_range into CHARSET_INFO structure  
						
						
						
						
					 
					
						2002-11-15 11:44:23 +04:00