jpipes@shakedown.(none) 
							
						 
					 
					
						
						
							
						
						eb4878d992 
					 
					
						
						
							
							Merge shakedown.(none):/home/jpipes/dev/bug21970/my50-bug21970  
						
						 
						
						... 
						
						
						
						into  shakedown.(none):/home/jpipes/dev/bug21970/my51-bug21970 
						
						
					 
					
						2006-12-14 19:13:07 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jpipes@shakedown.(none) 
							
						 
					 
					
						
						
							
						
						3044ede13c 
					 
					
						
						
							
							Fix for Bug#21970.  
						
						 
						
						... 
						
						
						
						Added a space between $MASTER_MYPORT and "+ 1" to ensure that the script correctly output 9307 instead of the string "9306+1" 
						
						
					 
					
						2006-12-14 18:21:41 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jpipes@shakedown.(none) 
							
						 
					 
					
						
						
							
						
						bad9af4f58 
					 
					
						
						
							
							Fix for Bug#21970.  
						
						 
						
						... 
						
						
						
						The mysql-test-run-shell.sh script was improperly evaluating an expression for setting up multiple masters.
This fix adds the `expr $MASTER_MYPORT + 1` construct to the offending line in order for the expression to evaluate properly and produce 9307 instead of the string "9306+1" 
						
						
					 
					
						2006-12-14 14:54:59 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						04d5a42bbf 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2006-11-28 20:59:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@nosik.monty.fi 
							
						 
					 
					
						
						
							
						
						becf45cd8e 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.1 
						
						
					 
					
						2006-11-27 01:51:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						86f0d1bb03 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1  
						
						 
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
						
						
					 
					
						2006-11-24 12:12:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						c76adf6021 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release  
						
						 
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2006-11-23 11:57:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@nosik.monty.fi 
							
						 
					 
					
						
						
							
						
						89570bf966 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.1 
						
						
					 
					
						2006-11-22 14:11:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@nosik.monty.fi 
							
						 
					 
					
						
						
							
						
						38a92caeb7 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.1  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.1 
						
						
					 
					
						2006-11-21 23:12:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com/nosik.monty.fi 
							
						 
					 
					
						
						
							
						
						f6682e2743 
					 
					
						
						
							
							Added --debug-info to most clients to detect memory leaks in mysql-test-run  
						
						 
						
						... 
						
						
						
						Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1 
						
						
					 
					
						2006-11-21 22:32:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						0b60b7d59a 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2006-11-13 19:19:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						29d1e3230b 
					 
					
						
						
							
							Use mysql-test-run.pl  
						
						 
						
						
						
						
					 
					
						2006-11-13 19:12:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@trift2. 
							
						 
					 
					
						
						
							
						
						ca06382435 
					 
					
						
						
							
							Merge trift2.:/MySQL/M50/push-5.0  
						
						 
						
						... 
						
						
						
						into  trift2.:/MySQL/M51/push-5.1 
						
						
					 
					
						2006-11-10 20:02:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						040f95494d 
					 
					
						
						
							
							Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic  
						
						 
						
						... 
						
						
						
						into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic 
						
						
					 
					
						2006-11-10 02:36:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@shellback.(none) 
							
						 
					 
					
						
						
							
						
						dd76996955 
					 
					
						
						
							
							Move mysql-test-run.sh to new name mysql-test-run-shell.sh  
						
						 
						
						... 
						
						
						
						Symlink mysql-test-run to mysql-test-run.pl 
						
						
					 
					
						2006-09-18 11:22:51 +02:00