ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e49c7ae45f 
					 
					
						
						
							
							Fix for the bug  #2231 : string column, INDEX+LIKE, don't take the ESCAPE character.  
						
						 
						
						... 
						
						
						
						(acctually i don't like the fix, any suggestions?) 
						
						
					 
					
						2003-12-30 19:23:38 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						c236568ac9 
					 
					
						
						
							
							Auto Merge  
						
						 
						
						
						
						
					 
					
						2003-12-23 02:24:12 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lenz@kallisto.local 
							
						 
					 
					
						
						
							
						
						f9e2c6cd27 
					 
					
						
						
							
							- portability fix for IBM AIX and QNX  
						
						 
						
						
						
						
					 
					
						2003-12-22 14:42:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						23b25675f2 
					 
					
						
						
							
							Merge mysql.com:/home/psergey/mysql-5.0-latest-pull  
						
						 
						
						... 
						
						
						
						into mysql.com:/dbdata/psergey/mysql-5.0-imerge-unique 
						
						
					 
					
						2003-12-20 00:54:38 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						a8456e6801 
					 
					
						
						
							
							Numerous small fixes to index_merge read time estimates code  
						
						 
						
						
						
						
					 
					
						2003-12-20 00:53:14 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						99e0ae85c7 
					 
					
						
						
							
							Merge 4.1 to 5.0.  
						
						 
						
						
						
						
					 
					
						2003-12-19 18:03:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d4c32db181 
					 
					
						
						
							
							merge with 4.0.18  
						
						 
						
						
						
						
					 
					
						2003-12-19 16:42:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						50f29b0e9e 
					 
					
						
						
							
							Post-merge fixes and code cleanup  
						
						 
						
						
						
						
					 
					
						2003-12-18 21:07:19 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								psergey@psergey-rh8.(none) 
							
						 
					 
					
						
						
							
						
						b1f07034da 
					 
					
						
						
							
							Merge psergey-rh8.(none):/home/psergey/mysql-5.0-latest-pull  
						
						 
						
						... 
						
						
						
						into psergey-rh8.(none):/home/psergey/mysql-5.0-imerge-unique 
						
						
					 
					
						2003-12-18 17:01:35 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b9d8f108c1 
					 
					
						
						
							
							Simple cleanups  
						
						 
						
						
						
						
					 
					
						2003-12-18 14:40:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						67c6d5113c 
					 
					
						
						
							
							Precise read time estimates for index_merge/Unique  
						
						 
						
						
						
						
					 
					
						2003-12-18 06:08:00 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@linux.local 
							
						 
					 
					
						
						
							
						
						ecf54df991 
					 
					
						
						
							
							Fixed some minor issues, revealed by compiler warnings when using  
						
						 
						
						... 
						
						
						
						BUILD/compile-pentium-debug-max 
						
						
					 
					
						2003-12-17 19:18:01 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e0cc6799ec 
					 
					
						
						
							
							Merge with 4.0.17  
						
						 
						
						
						
						
					 
					
						2003-12-17 17:35:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						427ce41c3c 
					 
					
						
						
							
							Fixed bug in last push found by valgrind  
						
						 
						
						
						
						
					 
					
						2003-12-14 08:12:07 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f995a5f4aa 
					 
					
						
						
							
							Fix autoincrement for signed columns (Bug  #1366 )  
						
						 
						
						... 
						
						
						
						Fixed problem with char > 128 in QUOTE() function. (Bug #1868 )
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651 )
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711 )
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998 )
Fixed timestamp.test 
						
						
					 
					
						2003-12-12 22:26:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						124c4ca346 
					 
					
						
						
							
							cleanup: if there is return from if-part, we don't need else statement  
						
						 
						
						
						
						
					 
					
						2003-12-10 22:26:31 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						0dea4148c8 
					 
					
						
						
							
							followup  
						
						 
						
						
						
						
					 
					
						2003-12-09 21:56:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						60563049e9 
					 
					
						
						
							
							Merge mysql.com:/home/psergey/mysql-5.0-latest-pull  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-imerge-unique 
						
						
					 
					
						2003-12-09 23:41:25 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						24c180941f 
					 
					
						
						
							
							Two-sweeps read index_merge plus several small index_merge fixes and improvements  
						
						 
						
						
						
						
					 
					
						2003-12-09 23:40:02 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						eaa0c4494f 
					 
					
						
						
							
							code cleanup after some reasoning  
						
						 
						
						
						
						
					 
					
						2003-12-09 20:49:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						e235d796c9 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-12-01 18:47:19 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						6e717133c5 
					 
					
						
						
							
							Merge 4.1 to 5.0  
						
						 
						
						
						
						
					 
					
						2003-12-01 16:14:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						2cd53b7ac6 
					 
					
						
						
							
							Merge rurik.mysql.com:/home/igor/mysql-5.0  
						
						 
						
						... 
						
						
						
						into rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
						
						
					 
					
						2003-11-28 15:28:21 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						5914033478 
					 
					
						
						
							
							merge with 4.0 to get fix for range bug  
						
						 
						
						
						
						
					 
					
						2003-11-28 15:55:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						4f42a47408 
					 
					
						
						
							
							Fixed range optimzier bug (Bug  #1828 )  
						
						 
						
						
						
						
					 
					
						2003-11-28 15:45:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						ae15947360 
					 
					
						
						
							
							Fix for bug 1974  
						
						 
						
						
						
						
					 
					
						2003-11-28 00:31:15 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						be27811faa 
					 
					
						
						
							
							Post-merge after itroducing Item_equal  
						
						 
						
						
						
						
					 
					
						2003-11-26 17:54:20 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						3938ac5436 
					 
					
						
						
							
							This ChangeSet Introdices Item_equal.  
						
						 
						
						... 
						
						
						
						The objects of this class represent multiple conjunctive equalities
in where conditions: =(f1,f2,...fn) <=> f1=f2 and f2= ... and =fn.
The objects are used to generate new possibale paths to access
the tables when executing a query.
They are also used to optimize the execution plan 
chosen by the optimizer for the query. 
						
						
					 
					
						2003-11-26 17:23:52 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						3d32afd736 
					 
					
						
						
							
							Post-merge fixes for index_merge/Unique/5.0  
						
						 
						
						
						
						
					 
					
						2003-11-24 20:54:57 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						5f9718adfb 
					 
					
						
						
							
							Merging index_merge/Unique into 5.0  
						
						 
						
						
						
						
					 
					
						2003-11-23 15:17:46 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						4f721196f3 
					 
					
						
						
							
							Post-merge fixes  
						
						 
						
						
						
						
					 
					
						2003-11-22 00:20:48 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						30b3c3bf1b 
					 
					
						
						
							
							Merged, most likely needs post-merge fix  
						
						 
						
						
						
						
					 
					
						2003-11-21 00:27:54 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						4016048d81 
					 
					
						
						
							
							logging_ok:  
						
						 
						
						... 
						
						
						
						Logging to logging@openlogging.org  accepted
sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h:
  Post-merge fixes
Many files:
  new file 
						
						
					 
					
						2003-11-20 23:27:11 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						1c61a92ba7 
					 
					
						
						
							
							index_merge implementation using Unique class, to be merged into 5.0  
						
						 
						
						
						
						
					 
					
						2003-11-19 00:37:17 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								psergey@psergey.(none) 
							
						 
					 
					
						
						
							
						
						4894565432 
					 
					
						
						
							
							merging in index_merge (in progress, not yet working)  
						
						 
						
						
						
						
					 
					
						2003-11-13 22:14:37 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								psergey@psergey.(none) 
							
						 
					 
					
						
						
							
						
						ca6c4cc30b 
					 
					
						
						
							
							Added index_merge access method  
						
						 
						
						
						
						
					 
					
						2003-11-13 17:52:02 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						74551a72ec 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-4.1/  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-4.1 
						
						
					 
					
						2003-10-31 10:34:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						f29ed57531 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-10-30 10:45:28 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						9c4049ad12 
					 
					
						
						
							
							Bitmap post-review fixes  
						
						 
						
						
						
						
					 
					
						2003-10-30 19:17:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6e17f4f20d 
					 
					
						
						
							
							fixes to Bitmap class  
						
						 
						
						
						
						
					 
					
						2003-10-24 22:44:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						f944fd4a65 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-10-21 11:58:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						50d9b95b77 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-10-15 12:25:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						461d1627b3 
					 
					
						
						
							
							merge with 4.0 for more memory allocation variables.  
						
						 
						
						
						
						
					 
					
						2003-10-13 15:50:30 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c95d142f8f 
					 
					
						
						
							
							Add new user variables for tuning memory usage:  
						
						 
						
						... 
						
						
						
						query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization 
						
						
					 
					
						2003-10-11 22:00:24 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8cc3951c8f 
					 
					
						
						
							
							key_map with more that 64 bits width  
						
						 
						
						
						
						
					 
					
						2003-10-11 13:06:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						d37a5c4dd7 
					 
					
						
						
							
							Indentation cleanups  
						
						 
						
						... 
						
						
						
						Remove wait_if_global_read_lock on commit as this can cause deadlocks 
						
						
					 
					
						2003-10-08 21:50:05 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						f17ff0bc39 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						Fix after manual merge 
						
						
					 
					
						2003-10-01 23:37:05 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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