serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e7504b3468 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2006-03-06 18:34:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						0b2f4ac3be 
					 
					
						
						
							
							kill (subquery) - three years old bugfix that never worked  
						
						 
						
						
						
						
					 
					
						2006-03-06 18:26:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						5923d50533 
					 
					
						
						
							
							kill.test fixed for kill on Mac OS X (which do not send OK)  
						
						 
						
						
						
						
					 
					
						2006-02-07 13:45:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4e931d3c45 
					 
					
						
						
							
							Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851).  
						
						 
						
						
						
						
					 
					
						2006-01-18 13:48:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						a778669efd 
					 
					
						
						
							
							Tweak kill test to avoid spurious test failure on SCO OpenServer. (Bug  #12136 )  
						
						 
						
						
						
						
					 
					
						2005-09-20 09:36:35 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3c12d0ae54 
					 
					
						
						
							
							Added end marker for tests to make future merges easier  
						
						 
						
						
						
						
					 
					
						2005-07-28 03:22:47 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						98601055b6 
					 
					
						
						
							
							backport kill.test fix from 5.0  
						
						 
						
						
						
						
					 
					
						2005-04-11 22:36:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						9c86b35194 
					 
					
						
						
							
							Fix reconnect when using prepared statements, and add  
						
						 
						
						... 
						
						
						
						--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866 ) 
						
						
					 
					
						2005-03-28 09:59:41 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						1f6ecc0cd3 
					 
					
						
						
							
							Changed mysql-test to print warnings for not existing table to DROP TABLE  
						
						 
						
						... 
						
						
						
						Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print() 
						
						
					 
					
						2003-01-06 01:48:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						88aff4bf85 
					 
					
						
						
							
							Updated manual about embedded version.  
						
						 
						
						... 
						
						
						
						Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version.  All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86 
						
						
					 
					
						2001-10-08 04:58:07 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@donna.mysql.fi 
							
						 
					 
					
						
						
							
						
						5487d7a8c0 
					 
					
						
						
							
							Fixed bug in send in mysqltest  
						
						 
						
						... 
						
						
						
						Removed usage of @r/result as this made life hard when testing different
table handlers.
Allow concurrent inserts if no update/binary log.
Don't remove key_cache at flush tables.
Fixed bug in SELECT DISTINCT SUM()... 
						
						
					 
					
						2001-03-25 01:02:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@donna.mysql.fi 
							
						 
					 
					
						
						
							
						
						d0722d73b0 
					 
					
						
						
							
							Added fix for using variables with distinct  
						
						 
						
						
						
						
					 
					
						2001-03-15 03:55:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sasha@mysql.sashanet.com 
							
						 
					 
					
						
						
							
						
						0dd0d88e8f 
					 
					
						
						
							
							changed signal by fd close to signal by vio_close  
						
						 
						
						... 
						
						
						
						added support for kill expr
fixed coredump in set @a := foo;
added testcase for user_var
added testcase for kill 
						
						
					 
					
						2001-03-13 23:07:12 -07:00