serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6d6d11787f 
					 
					
						
						
							
							after merge  
						
						
						
						
					 
					
						2006-03-06 23:43:47 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d190e08e4e 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2006-03-06 20:53:14 +01:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						6916a4bfe6 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						... 
						
						
						
						into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0 
						
						
					 
					
						2006-02-07 22:10:44 +02: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 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						303ad65fb2 
					 
					
						
						
							
							Post-merge fixes.  
						
						
						
						
					 
					
						2006-02-03 00:07:36 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						98091b152a 
					 
					
						
						
							
							Merge mysql.com:/opt/local/work/mysql-4.1-root  
						
						... 
						
						
						
						into  mysql.com:/opt/local/work/mysql-5.0-root 
						
						
					 
					
						2006-02-02 18:17:18 +03: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 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						6e22e29de6 
					 
					
						
						
							
							Review fixes of new pushed code  
						
						... 
						
						
						
						- Fixed tests
- Optimized new code
- Fixed some unlikely core dumps
- Better bug fixes for:
  - #14397  - OPTIMIZE TABLE with an open HANDLER causes a crash
  - #14850  (ERROR 1062 when a quering a view using a Group By on a column that can be null 
						
						
					 
					
						2006-01-06 00:47:49 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						7743016908 
					 
					
						
						
							
							Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp  
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-5.0 
						
						
					 
					
						2005-10-13 12:38:38 +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 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						305dc01078 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316 
						
						
					 
					
						2005-09-01 17:15:37 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						4b47ebcfc9 
					 
					
						
						
							
							mysqltest improvements, updates after merge + test for 5.0  
						
						
						
						
					 
					
						2005-09-01 17:01:23 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3eaa953529 
					 
					
						
						
							
							Cleanups and optimization during review of new code  
						
						
						
						
					 
					
						2005-08-18 03:12:42 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						15d48525af 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-07-28 17:09:54 +03: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 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a7c6348192 
					 
					
						
						
							
							Fixed errors found during review  
						
						
						
						
					 
					
						2005-04-06 19:43:35 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						bb215f648b 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-04-04 23:03:56 -07: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 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						146994ed4c 
					 
					
						
						
							
							Fix 'kill' test to actually test that the connection has  
						
						... 
						
						
						
						been killed. 
						
						
					 
					
						2005-03-18 16:17:10 -08:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						91d1cf4931 
					 
					
						
						
							
							Fix for BUG#8783 kill.test must always sleep 2 seconds, even if  
						
						... 
						
						
						
						mysql-test-run runs with --sleep=10; otherwise GET_LOCK() times out
before being killed so we get 0 instead of NULL. Verified that it
works on our powermacg5 where the test was failing. 
						
						
					 
					
						2005-02-24 19:13:55 +01:00 
						 
				 
			
				
					
						
							
							
								bell@51.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						3cb61419bd 
					 
					
						
						
							
							get time for thread switching  
						
						
						
						
					 
					
						2005-02-24 03:25:53 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						e9ad508542 
					 
					
						
						
							
							Fixed problem of sending ERROR to client after OK or EOF (BUG#6804)  
						
						
						
						
					 
					
						2005-01-20 10:41:37 +02: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