ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						883ff0cc81 
					 
					
						
						
							
							merging  
						
						 
						
						
						
						
					 
					
						2005-02-28 18:11:18 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3839e443a4 
					 
					
						
						
							
							merge with 4.1  
						
						 
						
						
						
						
					 
					
						2005-02-28 12:18:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						253bfcf783 
					 
					
						
						
							
							Fixed wrong memory references found by purify  
						
						 
						
						... 
						
						
						
						(No really critical errors found, but a few possible wrong results) 
						
						
					 
					
						2005-02-28 11:59:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						b9aa67bc76 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-02-26 16:15:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7e5f74f8f2 
					 
					
						
						
							
							Merge with global tree  
						
						 
						
						
						
						
					 
					
						2005-02-25 17:12:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0a6b7aedb2 
					 
					
						
						
							
							Remove compiler warnings and remove not used variables  
						
						 
						
						... 
						
						
						
						(Found during build process) 
						
						
					 
					
						2005-02-25 16:53:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						4e6a4dfa13 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-24 14:48:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						29e513d2a7 
					 
					
						
						
							
							sql_select.cc:  
						
						 
						
						... 
						
						
						
						Redundant "Item::" was removed. 
						
						
					 
					
						2005-02-24 12:05:08 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						2952f73c16 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-02-24 06:24:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						07cdc9e334 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-02-23 20:08:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@52.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						25e87cd6f7 
					 
					
						
						
							
							Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0 
						
						
					 
					
						2005-02-23 19:22:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						fcc37a0787 
					 
					
						
						
							
							Fixes for condition pushdown to storage engine based on comments from code review  
						
						 
						
						
						
						
					 
					
						2005-02-23 15:51:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3e9bf3af34 
					 
					
						
						
							
							Fix for bug  #7217 : information_schema: columns are varbinary() instead of timestamp &  
						
						 
						
						... 
						
						
						
						bug #7215 : information_schema: columns are longtext instead of varchar 
						
						
					 
					
						2005-02-23 15:15:36 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						b3d3f73753 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-21 16:13:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@51.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						a11369b999 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-20 18:49:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						218e00ac68 
					 
					
						
						
							
							Fixed BUILD script to use --with-berkeley-db instead of --with-bdb  
						
						 
						
						... 
						
						
						
						Lots of small fixes to multi-precision-math path
Give Note for '123.4e'
Added helper functions type 'val_string_from_real()
Don't give warnings for end space for string2decimal()
Changed storage of values for SP so that we can detect length of argument without strlen()
Changed interface for str2dec() so that we must supple the pointer to the last character in the buffer 
						
						
					 
					
						2005-02-19 18:58:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						fdbcad3eaf 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-02-15 12:06:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						c30f7feba1 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-4.1-bug8218 
						
						
					 
					
						2005-02-14 23:49:01 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						919f2f2364 
					 
					
						
						
							
							Merge mysql.com:/home/psergey/mysql-4.1-bug8218  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-bug8218 
						
						
					 
					
						2005-02-14 23:47:31 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						c0c50efdef 
					 
					
						
						
							
							Fix for BUG#8218:  
						
						 
						
						... 
						
						
						
						Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
pointing to the wrong List. 
						
						
					 
					
						2005-02-12 22:58:54 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						66343612d1 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-11 22:30:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						828a785610 
					 
					
						
						
							
							Condition pushdown v.2  
						
						 
						
						
						
						
					 
					
						2005-02-11 22:05:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						5040e7cdb4 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0 
						
						
					 
					
						2005-02-10 20:08:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9b1bf2da5a 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-02-10 18:01:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a1a39fab84 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2005-02-10 02:27:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ab5aed6047 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2005-02-09 19:22:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						b94a482ee9 
					 
					
						
						
							
							Precision Math implementation  
						
						 
						
						
						
						
					 
					
						2005-02-09 02:50:45 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						dcc65b77a6 
					 
					
						
						
							
							Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table  
						
						 
						
						
						
						
					 
					
						2005-02-08 23:44:51 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						79ec81071a 
					 
					
						
						
							
							Better bugfix for "HAVING when refering to RAND()" (Bug  #8216 )  
						
						 
						
						... 
						
						
						
						Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
This will ensure that any reference to these has a valid value.
Generalized the code for split_sum_func() 
						
						
					 
					
						2005-02-08 14:41:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						bc1fdfa402 
					 
					
						
						
							
							Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only (2nd patch after Monty's comments).  
						
						 
						
						
						
						
					 
					
						2005-02-05 18:16:29 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						422c2eb868 
					 
					
						
						
							
							4.1 -> 5.0 merge  
						
						 
						
						
						
						
					 
					
						2005-02-03 13:18:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0751cb8ff1 
					 
					
						
						
							
							Remove #if 0 as this only confuses the code withing adding anything  
						
						 
						
						
						
						
					 
					
						2005-02-01 15:36:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						48da18cd45 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 
						
						
					 
					
						2005-02-01 11:05:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						f21a737197 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-02-01 10:05:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						471c8e6777 
					 
					
						
						
							
							fixed problem with groupping by view (BUG#7116)  
						
						 
						
						
						
						
					 
					
						2005-01-31 16:24:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						be5dade853 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/mydev/mysql-5.0-5000 
						
						
					 
					
						2005-01-26 15:31:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						d4c7c4ff5b 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-01-26 11:34:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						5ea224b824 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/mydev/mysql-4.1-4100 
						
						
					 
					
						2005-01-26 09:09:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						76f3d6f002 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2005-01-25 21:11:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						37168015cd 
					 
					
						
						
							
							Cleanups during review  
						
						 
						
						
						
						
					 
					
						2005-01-25 21:27:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						704d84a12c 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/mydev/mysql-5.0-5000 
						
						
					 
					
						2005-01-25 19:37:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						6c3a4aee18 
					 
					
						
						
							
							Fix two typos in comments.  
						
						 
						
						
						
						
					 
					
						2005-01-25 17:25:46 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						c4a0eb142b 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/mydev/mysql-5.0-5000 
						
						
					 
					
						2005-01-24 10:48:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						47c4009149 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/mydev/mysql-4.1-4100 
						
						
					 
					
						2005-01-24 10:47:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						5f23207d95 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-4.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/mydev/mysql-4.0-4000 
						
						
					 
					
						2005-01-24 10:08:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						5e36e83164 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 
						
						
					 
					
						2005-01-23 21:58:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						14eceb4b98 
					 
					
						
						
							
							Manual merge  
						
						 
						
						
						
						
					 
					
						2005-01-22 03:12:44 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						0b61a16fd2 
					 
					
						
						
							
							Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0  
						
						 
						
						... 
						
						
						
						into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
						
						
					 
					
						2005-01-22 02:42:54 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						8527f256c0 
					 
					
						
						
							
							select_found.result, select_found.test:  
						
						 
						
						... 
						
						
						
						Added a test case for bug #7945 .
sql_select.cc:
  Fixed bug #7945 . If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS. 
						
						
					 
					
						2005-01-22 02:40:27 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						7c07a2e725 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-01-21 08:43:41 +01:00