anozdrin/alik@alik.opbmk 
							
						 
					 
					
						
						
							
						
						50e5958f28 
					 
					
						
						
							
							Fix merge & update result file.  
						
						 
						
						
						
						
					 
					
						2007-02-23 23:36:25 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anozdrin/alik@alik.opbmk 
							
						 
					 
					
						
						
							
						
						fe585401ed 
					 
					
						
						
							
							Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-build  
						
						 
						
						... 
						
						
						
						into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build 
						
						
					 
					
						2007-02-23 21:55:14 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anozdrin/alik@alik.opbmk 
							
						 
					 
					
						
						
							
						
						90115eac42 
					 
					
						
						
							
							Fix mysql-test-run.pl: IM in 5.0 uses old incorrect  
						
						 
						
						... 
						
						
						
						'shutdown_delay' option name. 
						
						
					 
					
						2007-02-23 21:51:33 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anozdrin/alik@alik.opbmk 
							
						 
					 
					
						
						
							
						
						13acde39ba 
					 
					
						
						
							
							Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt  
						
						 
						
						... 
						
						
						
						into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt 
						
						
					 
					
						2007-02-23 20:27:13 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anozdrin/alik@alik.opbmk 
							
						 
					 
					
						
						
							
						
						8f5c21172c 
					 
					
						
						
							
							BUG#24415: im_daemon_life_cycle.imtest fails  
						
						 
						
						... 
						
						
						
						Fix timeouts. Only test suite is changed. 
						
						
					 
					
						2007-02-23 20:24:32 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com/narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f0ae3ce9b9 
					 
					
						
						
							
							Fixed compiler warnings  
						
						 
						
						... 
						
						
						
						Fixed compile-pentium64 scripts
Fixed wrong estimate of update_with_key_prefix in sql-bench
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
Split handle_one_connection() into reusable sub functions.
Split create_new_thread() into reusable sub functions.
Added thread_scheduler; Preliminary interface code for future thread_handling code.
Use 'my_thread_id' for internal thread id's
Make thr_alarm_kill() to depend on thread_id instead of thread
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
In store_globals(), set my_thread_var->id to be thd->thread_id.
Use my_thread_var->id as basis for my_thread_name()
The above changes makes the connection we have between THD and threads more soft.
Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
Fixed compiler warnings
Fixed core dumps when running with --debug
Removed setting of signal masks (was never used)
Made event code call pthread_exit() (portability fix)
Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
Removed one common 'not freed memory' warning from mysqltest
Fixed a couple of usage of not initialized warnings (unlikely cases)
Suppress compiler warnings from bdb and (for the moment) warnings from ndb 
						
						
					 
					
						2007-02-23 13:13:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com/narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						26aa385bc5 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2007-02-21 14:07:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com/narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						222e128b34 
					 
					
						
						
							
							Fixed unsafe define of uint4korr()  
						
						 
						
						... 
						
						
						
						Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups 
						
						
					 
					
						2007-02-21 13:02:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						104995f2e7 
					 
					
						
						
							
							Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166 
						
						
					 
					
						2007-02-20 12:48:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						bcd368fcfb 
					 
					
						
						
							
							Bug#20166 mysql-test-run.pl does not test system privilege tables creation  
						
						 
						
						... 
						
						
						
						- Add test of bootstrap mode
 - Make mysqld return error if bootstrap failed 
						
						
					 
					
						2007-02-20 12:48:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						10da8b7e96 
					 
					
						
						
							
							Bug#25592 wrong reporting for mysql-test-run.pl --mysqld=--binlog-format=...  
						
						 
						
						
						
						
					 
					
						2007-02-19 12:59:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						03b71c9209 
					 
					
						
						
							
							Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint 
						
						
					 
					
						2007-02-16 15:32:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						b57994a7c2 
					 
					
						
						
							
							Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-02-16 15:23:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						8931166e55 
					 
					
						
						
							
							Workaround for problem where cygwin's bash/sh randomly fails with error 128 which  
						
						 
						
						... 
						
						
						
						mainly occurs on win2003 64bit.
 - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..." 
						
						
					 
					
						2007-02-16 15:19:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						b6f78aa153 
					 
					
						
						
							
							Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint  
						
						 
						
						... 
						
						
						
						into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint 
						
						
					 
					
						2007-02-14 14:51:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						24a242bee1 
					 
					
						
						
							
							Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628  
						
						 
						
						... 
						
						
						
						into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-02-14 14:45:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						45fe5879f4 
					 
					
						
						
							
							Bug#18628 mysql-test-run: security problem(part1)  
						
						 
						
						... 
						
						
						
						- Implement --secure-file-priv=<dir> option that limits
  "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
  with files in specified dir.
 - Use above option for mysqld in mysql-test-run.pl 
						
						
					 
					
						2007-02-14 14:44:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						836f777b55 
					 
					
						
						
							
							Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint  
						
						 
						
						... 
						
						
						
						into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint 
						
						
					 
					
						2007-02-06 16:38:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						b6bd53aa9d 
					 
					
						
						
							
							Correct the non working check for --skip-log-bin in "extra_opt"  
						
						 
						
						
						
						
					 
					
						2007-02-06 16:38:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						61686e8556 
					 
					
						
						
							
							Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805  
						
						 
						
						... 
						
						
						
						into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-02-06 14:30:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						3a48e8ee27 
					 
					
						
						
							
							Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805  
						
						 
						
						... 
						
						
						
						into  pilot.mysql.com:/home/msvensson/mysql/bug24805/my51-bug24805 
						
						
					 
					
						2007-02-06 14:22:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						958308a5cf 
					 
					
						
						
							
							Bug#24805 mtr.pl can't handle test with --disable-log-bin  
						
						 
						
						... 
						
						
						
						- Don't give mysqld the --log-bin argument if .opt file
  contains --skip-log-bin
- Enable flush2 test 
						
						
					 
					
						2007-02-06 14:19:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cmiller@zippy.cornsilk.net 
							
						 
					 
					
						
						
							
						
						a795b7097f 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint 
						
						
					 
					
						2007-01-31 16:26:12 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cmiller@zippy.cornsilk.net 
							
						 
					 
					
						
						
							
						
						522d6fb0cc 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.1  
						
						 
						
						... 
						
						
						
						into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint 
						
						
					 
					
						2007-01-31 16:24:28 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cmiller@zippy.cornsilk.net 
							
						 
					 
					
						
						
							
						
						ad66e7a0dd 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-01-31 16:23:05 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								df@kahlann.erinye.com 
							
						 
					 
					
						
						
							
						
						224ce90806 
					 
					
						
						
							
							Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work  
						
						 
						
						... 
						
						
						
						into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work 
						
						
					 
					
						2007-01-22 16:41:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								df@kahlann.erinye.com 
							
						 
					 
					
						
						
							
						
						c5de0332e1 
					 
					
						
						
							
							Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work  
						
						 
						
						... 
						
						
						
						into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
						
						
					 
					
						2007-01-22 16:39:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								df@kahlann.erinye.com 
							
						 
					 
					
						
						
							
						
						c124372550 
					 
					
						
						
							
							after-merge fix  
						
						 
						
						
						
						
					 
					
						2007-01-22 16:32:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								df@kahlann.erinye.com 
							
						 
					 
					
						
						
							
						
						58bf072264 
					 
					
						
						
							
							Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061  
						
						 
						
						... 
						
						
						
						into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
						
						
					 
					
						2007-01-22 16:30:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								knielsen@ymer.(none) 
							
						 
					 
					
						
						
							
						
						f2bbf5225a 
					 
					
						
						
							
							Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  ymer.(none):/usr/local/mysql/x/mysql-5.1-new-maint 
						
						
					 
					
						2007-01-22 09:00:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								knielsen@ymer.(none) 
							
						 
					 
					
						
						
							
						
						854ef6b0a3 
					 
					
						
						
							
							Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  ymer.(none):/usr/local/mysql/x/mysql-5.0-maint 
						
						
					 
					
						2007-01-22 08:59:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								knielsen@ymer.(none) 
							
						 
					 
					
						
						
							
						
						ba6e6d0754 
					 
					
						
						
							
							Implement mysql-test-run.pl option to limit the number of saved core  
						
						 
						
						... 
						
						
						
						files. This helps stability of multiple parallel automated test runs,
avoiding the situation where one bad build fills up disk with 1000s of
core files, causing failures in other test runs. 
						
						
					 
					
						2007-01-19 09:41:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tsmith@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						6b729ff2cd 
					 
					
						
						
							
							Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51  
						
						 
						
						... 
						
						
						
						into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51 
						
						
					 
					
						2007-01-18 10:30:39 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tsmith@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						cc7afe2494 
					 
					
						
						
							
							Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51  
						
						 
						
						... 
						
						
						
						into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51 
						
						
					 
					
						2007-01-18 08:30:35 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars/lthalmann@dl145j.mysql.com 
							
						 
					 
					
						
						
							
						
						1e356251a0 
					 
					
						
						
							
							Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl  
						
						 
						
						... 
						
						
						
						into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge 
						
						
					 
					
						2007-01-12 12:31:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tsmith@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						bc0e0ba7cc 
					 
					
						
						
							
							Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build  
						
						 
						
						... 
						
						
						
						into  siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build 
						
						
					 
					
						2007-01-11 13:50:48 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cmiller@zippy.cornsilk.net 
							
						 
					 
					
						
						
							
						
						896e2623eb 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-01-11 09:43:44 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tsmith@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						bac65ee90a 
					 
					
						
						
							
							WL  #3670 : Compile-time option to remove GRANT-related startup options  
						
						 
						
						... 
						
						
						
						- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
- configure.js/cmake also updated
- if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
  --bootstrap
  --init-file
  --skip-grant-tables
Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.
For example:
$ export MYSQLD_BOOTSTRAP
$ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
$ mysql_install_db
$ make test 
						
						
					 
					
						2007-01-09 19:22:01 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tsmith/tim@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						c5aa8fea82 
					 
					
						
						
							
							Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint  
						
						 
						
						... 
						
						
						
						into  siva.hindu.god:/usr/home/tim/m/bk/51 
						
						
					 
					
						2006-12-22 13:43:48 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tsmith/tim@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						bb108f57c1 
					 
					
						
						
							
							Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint  
						
						 
						
						... 
						
						
						
						into  siva.hindu.god:/usr/home/tim/m/bk/50 
						
						
					 
					
						2006-12-22 13:41:10 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						8da9222853 
					 
					
						
						
							
							Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint  
						
						 
						
						... 
						
						
						
						into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint 
						
						
					 
					
						2006-12-22 10:00:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						b28e8faf23 
					 
					
						
						
							
							Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2006-12-22 10:00:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						73d82523a3 
					 
					
						
						
							
							Set default number of masters to 1  
						
						 
						
						
						
						
					 
					
						2006-12-22 09:59:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tsmith/tim@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						8075fc447e 
					 
					
						
						
							
							Merge siva.hindu.god:/usr/home/tim/m/bk/g51  
						
						 
						
						... 
						
						
						
						into  siva.hindu.god:/usr/home/tim/m/bk/51 
						
						
					 
					
						2006-12-21 18:23:14 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tsmith/tim@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						f204db4dd1 
					 
					
						
						
							
							Merge siva.hindu.god:/usr/home/tim/m/bk/g50  
						
						 
						
						... 
						
						
						
						into  siva.hindu.god:/usr/home/tim/m/bk/50 
						
						
					 
					
						2006-12-21 18:20:09 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						c862eae163 
					 
					
						
						
							
							Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint  
						
						 
						
						... 
						
						
						
						into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint 
						
						
					 
					
						2006-12-22 01:13:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						fe0a11d194 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2006-12-20 23:59:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						da6773f97b 
					 
					
						
						
							
							Count number of masters the test is actually using and only start as  
						
						 
						
						... 
						
						
						
						many as neeeded 
						
						
					 
					
						2006-12-20 23:44:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@trift2. 
							
						 
					 
					
						
						
							
						
						7f0cb242bc 
					 
					
						
						
							
							Merge trift2.:/MySQL/M50/upward-5.0  
						
						 
						
						... 
						
						
						
						into  trift2.:/MySQL/M51/push-5.1 
						
						
					 
					
						2006-12-20 19:24:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						5ccd3608d5 
					 
					
						
						
							
							When running with --valgrind and --debug send all the output from  
						
						 
						
						... 
						
						
						
						mysqld and valgrind to tracefile. 
						
						
					 
					
						2006-12-20 16:54:37 +01:00