petr@mysql.com 
							
						 
					 
					
						
						
							
						
						8197710349 
					 
					
						
						
							
							Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/cps/mysql/trees/mysql-5.0 
						
						
					 
					
						2005-04-05 06:12:41 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						7730319738 
					 
					
						
						
							
							Enable IM in the binary distribution and fix Bug  #9513  (mysql.server script from the binary distibution  
						
						 
						
						... 
						
						
						
						doesn't work out of the box) 
						
						
					 
					
						2005-04-04 03:49:10 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5865330a9e 
					 
					
						
						
							
							Merge embedded server testing changes from 4.1.  
						
						 
						
						
						
						
					 
					
						2005-04-01 19:17:15 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						16efc3e333 
					 
					
						
						
							
							Merge embedded-server testing changes.  
						
						 
						
						
						
						
					 
					
						2005-04-01 16:43:35 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						aa4f352230 
					 
					
						
						
							
							Remove result.es files and support for them, which requires splitting  
						
						 
						
						... 
						
						
						
						up a couple of tests and adjusting the output of others. Exposes two
bugs (9472 and 9508). 
						
						
					 
					
						2005-03-30 17:32:44 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						690183d1a0 
					 
					
						
						
							
							Eliminate most of the remaining hardcoded list of tests to skip  
						
						 
						
						... 
						
						
						
						by adding check for embedded server within tests and splitting some
tests into multiple test files. 
						
						
					 
					
						2005-03-29 17:17:46 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						bfa7520356 
					 
					
						
						
							
							Clean up InnoDB testing with embedded server.  
						
						 
						
						
						
						
					 
					
						2005-03-29 16:10:43 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						46eda5b998 
					 
					
						
						
							
							Shift skipping of some tests with embedded server from within  
						
						 
						
						... 
						
						
						
						mysql-test-run to the tests themselves. 
						
						
					 
					
						2005-03-29 15:50:16 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						c91034fea8 
					 
					
						
						
							
							Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started  
						
						 
						
						
						
						
					 
					
						2005-03-29 15:15:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						252bbe9eb9 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.0-5036  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-03-22 16:09:51 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						2a53e9d9a6 
					 
					
						
						
							
							Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build  
						
						 
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
						
						
					 
					
						2005-03-22 15:57:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						466d3bff25 
					 
					
						
						
							
							Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build  
						
						 
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build 
						
						
					 
					
						2005-03-22 15:14:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						f3d284c8bc 
					 
					
						
						
							
							mysql-test-run.sh, mysql-test-run.pl:  
						
						 
						
						... 
						
						
						
						InnoDB needs longer start time for second slave on slow hosts 
						
						
					 
					
						2005-03-22 15:12:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						348c285d0f 
					 
					
						
						
							
							mysql-test-run.sh:  
						
						 
						
						... 
						
						
						
						Disabled old feature to disable test cases 
						
						
					 
					
						2005-03-18 16:48:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						b435d6e862 
					 
					
						
						
							
							Merge 4.1 -> 5.0  
						
						 
						
						
						
						
					 
					
						2005-03-17 16:51:07 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						265270b970 
					 
					
						
						
							
							Fix to get --skip-ndb to work  
						
						 
						
						
						
						
					 
					
						2005-03-16 15:32:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						72e2466c0d 
					 
					
						
						
							
							mysql-test-run.sh:  
						
						 
						
						... 
						
						
						
						Check that there is a disabled.def before using it
disabled.def:
  Reenable ndb tests accidently disabled 
						
						
					 
					
						2005-03-16 09:23:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						fde941e5b4 
					 
					
						
						
							
							Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way  
						
						 
						
						
						
						
					 
					
						2005-03-16 01:15:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						5749c537ed 
					 
					
						
						
							
							mysql-test-run.sh:  
						
						 
						
						... 
						
						
						
						Added feature to disable tests from a list in a file "disabled.def"
  Moved down the code that disables, so that --do-test and --start-from
  don't list the disabled tests not in range.
disabled.def:
  List of test cases to temporarely disable 
						
						
					 
					
						2005-03-15 19:48:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						0a100d7464 
					 
					
						
						
							
							Add support for showing table type to mysqlshow command. (Bug  #5036 )  
						
						 
						
						
						
						
					 
					
						2005-03-15 10:46:43 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						f87c045e7e 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-03-11 11:21:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						2d0ecfa7c9 
					 
					
						
						
							
							Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1  
						
						 
						
						
						
						
					 
					
						2005-03-10 20:31:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						956682de1a 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2005-03-09 14:09:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						633f50cbef 
					 
					
						
						
							
							Added possibility to add disabled tests to mysql-test-run.  
						
						 
						
						
						
						
					 
					
						2005-03-08 18:32:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						dfab08eab0 
					 
					
						
						
							
							mysql-test-run.sh:  
						
						 
						
						... 
						
						
						
						added skip-ndbcluster switch 
						
						
					 
					
						2005-03-07 14:28:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						f5e9b79c28 
					 
					
						
						
							
							mysql-test-run to default run with ndbcluster if compiled with that support  
						
						 
						
						
						
						
					 
					
						2005-03-07 13:42:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						c28adf3173 
					 
					
						
						
							
							Ensure that the tests with '--ps-protocol' and '--embedded-server' are taken even  
						
						 
						
						... 
						
						
						
						after the previous run had some failures, provided it did not totally crash. 
						
						
					 
					
						2005-03-03 13:04:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						5a7f3ce9c1 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-23 10:29:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e2ea35ec67 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2005-02-22 15:47:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e2dc9b4099 
					 
					
						
						
							
							Backport my_strntod() from 5.0  
						
						 
						
						... 
						
						
						
						Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740 ) 
						
						
					 
					
						2005-02-22 12:51:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						347c700211 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-5.0-ndb 
						
						
					 
					
						2005-02-21 11:48:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						4ebbb92054 
					 
					
						
						
							
							BUG#8583 ndb_...multi tests fail in 5.0.3  
						
						 
						
						... 
						
						
						
						- the variable MASTER_MY_PORT1 was used from the script, but it was not set to the port where the second server was started 
						
						
					 
					
						2005-02-18 10:57:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						eecb813c6b 
					 
					
						
						
							
							Re-enable ctype_latin1_de test for embedded server (already passes, so it  
						
						 
						
						... 
						
						
						
						appears to have been accidently disabled) and enable ctype_ucs after moving
a subtest that requires binlog to its own test file. 
						
						
					 
					
						2005-02-10 18:08:30 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						1bda3aaa24 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-5.0-ndb 
						
						
					 
					
						2005-02-10 17:12:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						87349f0d81 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-5.0-ndb 
						
						
					 
					
						2005-02-10 16:19:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						7d735c7207 
					 
					
						
						
							
							manual merge  
						
						 
						
						
						
						
					 
					
						2005-02-10 16:58:02 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.homeip.net 
							
						 
					 
					
						
						
							
						
						a172575854 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-02-10 14:41:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ccb2f3381b 
					 
					
						
						
							
							Things missing in last changset  
						
						 
						
						... 
						
						
						
						After merge fixes
Don't give duplicate warnings for some ::store() functions 
						
						
					 
					
						2005-02-10 15:41:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.homeip.net 
							
						 
					 
					
						
						
							
						
						8fb1f824ea 
					 
					
						
						
							
							Change script to avoiud multiple --debug flags when starting master servers  
						
						 
						
						
						
						
					 
					
						2005-02-10 14:13:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						3c5602faec 
					 
					
						
						
							
							Re-enable alter_table test for embedded server by moving grant-related test  
						
						 
						
						... 
						
						
						
						to grant.test and using replace_column to neuter the Privileges column in
SHOW FULL COLUMNS. 
						
						
					 
					
						2005-02-09 18:17:40 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						264bac2f1d 
					 
					
						
						
							
							ndb_port_base is obsolete with WL#2278  
						
						 
						
						
						
						
					 
					
						2005-02-09 19:29:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.homeip.net 
							
						 
					 
					
						
						
							
						
						0ed971878d 
					 
					
						
						
							
							Fix so that master and master1 does not write to same .trace file  
						
						 
						
						
						
						
					 
					
						2005-02-09 16:23:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						6515400d92 
					 
					
						
						
							
							Add the zlib .libs directory to LD_LIBRARY_PATH in mysql-test-run.sh,  
						
						 
						
						... 
						
						
						
						which fixes running the tests when using the bundled zlib. 
						
						
					 
					
						2005-02-07 15:17:30 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						9220ef26d0 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-07 18:05:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						ee985f9a7e 
					 
					
						
						
							
							mysql-test-run.sh:  
						
						 
						
						... 
						
						
						
						fixed start-and-exit flag 
						
						
					 
					
						2005-02-07 17:59:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						3249388a5d 
					 
					
						
						
							
							have test suite continue even if ndbcluster fails to start if --force flag is set  
						
						 
						
						
						
						
					 
					
						2005-02-07 17:46:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						2953a79835 
					 
					
						
						
							
							Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-5.0 
						
						
					 
					
						2005-02-05 07:17:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						d1abda58b3 
					 
					
						
						
							
							mysql-test-run.sh:  
						
						 
						
						... 
						
						
						
						USE_RUNNING_SERVER should be set to 0 or 1 
						
						
					 
					
						2005-02-04 17:24:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						fcdbaf1071 
					 
					
						
						
							
							Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-5.0 
						
						
					 
					
						2005-02-04 06:10:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						4143a189c9 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-02-03 17:04:27 +01:00