lars@mysql.com 
							
						 
					 
					
						
						
							
						
						1bd55e471e 
					 
					
						
						
							
							Merging 5.0->5.1  
						
						
						
						
					 
					
						2005-04-19 11:09:54 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						ea673c1afd 
					 
					
						
						
							
							Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-04-05 19:52:22 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						4962ba7f8a 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2005-04-05 19:44:39 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3c3defaa0a 
					 
					
						
						
							
							add changeset key to the bk commit mail  
						
						
						
						
					 
					
						2005-04-05 15:16:15 +02:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						8e17bedeee 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-03-08 10:40:52 +01:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						7eb8c130f7 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-02-17 16:16:58 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						7e499384b4 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.0-clean  
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-4.1-clean 
						
						
					 
					
						2005-02-17 13:46:33 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						af41813cff 
					 
					
						
						
							
							Make post-commit trigger not send emails when the message would not contain  
						
						... 
						
						
						
						any actual changes. (Often the case in merges where the only change involves
renumbering ChangeSet entries.) 
						
						
					 
					
						2005-02-16 14:03:16 -08:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						6e06100b0c 
					 
					
						
						
							
							Manual merge  
						
						
						
						
					 
					
						2005-02-11 18:14:44 -08:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						e528a1c777 
					 
					
						
						
							
							Manual merge  
						
						
						
						
					 
					
						2005-02-11 10:44:03 -08:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						601a4fdfa2 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-02-11 11:59:35 +01:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						6daef0229c 
					 
					
						
						
							
							Fix extra blank line in emails sent by post-commit trigger.  
						
						
						
						
					 
					
						2005-02-10 20:31:23 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						3d265e9777 
					 
					
						
						
							
							Merge commit trigger  
						
						
						
						
					 
					
						2005-02-10 14:32:01 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						c12c5b4e4c 
					 
					
						
						
							
							Add BUG# to subject and X-Bug header for all outgoing  
						
						... 
						
						
						
						emails re: bug fixes, and update the URL for the manual
page on installing from the source tree.
Fake bug number for testing: Bug #1234  
						
						
					 
					
						2005-01-25 12:24:50 -08:00 
						 
				 
			
				
					
						
							
							
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						6c5b0844ea 
					 
					
						
						
							
							Merge for 5.0 to 5.1  
						
						
						
						
					 
					
						2005-01-06 14:09:13 -08:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						afbe601302 
					 
					
						
						
							
							merge with 4.1  
						
						
						
						
					 
					
						2004-10-29 19:26:52 +03:00 
						 
				 
			
				
					
						
							
							
								mwagner@here.mwagner.org 
							
						 
					 
					
						
						
							
						
						06245b4508 
					 
					
						
						
							
							post-commit:  
						
						... 
						
						
						
						Added catch for (example) WL#1234 into bk commit subjects 
						
						
					 
					
						2004-10-12 15:08:58 -05:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						dfd59e296e 
					 
					
						
						
							
							Merge 4.1 -> 5.0.  
						
						
						
						
					 
					
						2004-04-07 19:07:44 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						9bf7e07b75 
					 
					
						
						
							
							version updated after merge :)  
						
						
						
						
					 
					
						2004-03-26 12:36:57 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						755c068ff9 
					 
					
						
						
							
							bugs-aware post-commit trigger  
						
						... 
						
						
						
						cleanup (VERSION variable) 
						
						
					 
					
						2004-03-25 13:29:12 +01:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ad05bbf48c 
					 
					
						
						
							
							version fixed  
						
						
						
						
					 
					
						2004-03-03 22:18:18 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						28a2c6a96b 
					 
					
						
						
							
							Merging 4.1->5.0.  
						
						
						
						
					 
					
						2003-11-19 15:19:46 +01:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4e4725377d 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2003-11-04 09:40:36 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						72d00ef0c2 
					 
					
						
						
							
							cleanup  
						
						
						
						
					 
					
						2003-10-25 22:43:19 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						fb548cbc6d 
					 
					
						
						
							
							Put username in the Subject line as well (with the changeset number).  
						
						
						
						
					 
					
						2003-10-23 15:24:48 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						0db8b774ad 
					 
					
						
						
							
							Post merge fix.  
						
						
						
						
					 
					
						2002-12-08 15:17:40 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						859b688476 
					 
					
						
						
							
							Merge with 4.0.6  
						
						
						
						
					 
					
						2002-12-05 19:38:42 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						130e00ef5e 
					 
					
						
						
							
							A better way to get the ChangeSet revision for the Subject: line.  
						
						
						
						
					 
					
						2002-11-28 12:45:01 +01:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						608ab49eff 
					 
					
						
						
							
							Add the ChangeSet id to Subject: in all emails.  
						
						
						
						
					 
					
						2002-11-27 13:01:50 +01:00 
						 
				 
			
				
					
						
							
							
								mwagner@work.mysql.com 
							
						 
					 
					
						
						
							
						
						18d6d83c0a 
					 
					
						
						
							
							configure.in	Updated for 5.0  
						
						... 
						
						
						
						post-commit	Updated for 5.0
post-commit	Removed truncate for commits to internal lists (for complete code reviews) 
						
						
					 
					
						2002-10-04 09:34:58 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						7134ffec21 
					 
					
						
						
							
							Merge with 4.0.3  
						
						... 
						
						
						
						Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed) 
						
						
					 
					
						2002-08-30 12:40:40 +03:00 
						 
				 
			
				
					
						
							
							
								arjen@fred.bitbike.com 
							
						 
					 
					
						
						
							
						
						e6f4e3939b 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2002-08-15 15:09:51 +10:00 
						 
				 
			
				
					
						
							
							
								arjen@fred.bitbike.com 
							
						 
					 
					
						
						
							
						
						1c5feb19e4 
					 
					
						
						
							
							Little clarification in post-commit script.  
						
						
						
						
					 
					
						2002-08-15 14:59:14 +10:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						c531b43272 
					 
					
						
						
							
							merge with 3.23.52  
						
						
						
						
					 
					
						2002-08-13 02:33:25 +03:00 
						 
				 
			
				
					
						
							
							
								arjen@fred.bitbike.com 
							
						 
					 
					
						
						
							
						
						4861939801 
					 
					
						
						
							
							Various little docs fixups.  
						
						
						
						
					 
					
						2002-08-12 14:55:07 +10:00 
						 
				 
			
				
					
						
							
							
								arjen@fred.bitbike.com 
							
						 
					 
					
						
						
							
						
						9a6dc9a33e 
					 
					
						
						
							
							Typo fix and sentence cleanup in post-commit script.  
						
						
						
						
					 
					
						2002-06-17 09:44:39 +10:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						f0b28da6f9 
					 
					
						
						
							
							merge with 4.0  
						
						
						
						
					 
					
						2002-06-03 12:59:31 +03:00 
						 
				 
			
				
					
						
							
							
								arjen@fred.bitbike.com 
							
						 
					 
					
						
						
							
						
						db8610b387 
					 
					
						
						
							
							Change bk post-commit trigger to pick up anything under Docs/ instead of just Docs/manual.texi  
						
						
						
						
					 
					
						2002-05-03 08:57:31 +10:00 
						 
				 
			
				
					
						
							
							
								bar@gw.udmsearch.izhnet.ru 
							
						 
					 
					
						
						
							
						
						589820b2ef 
					 
					
						
						
							
							post-commit:  
						
						... 
						
						
						
						Move to 4.1
README:
  It is just test, ignore. My first attempt to push into bk 
						
						
					 
					
						2002-02-15 16:43:23 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						b03a786ce5 
					 
					
						
						
							
							POSIX.2 compatible fix  
						
						
						
						
					 
					
						2001-11-08 00:14:16 +01:00 
						 
				 
			
				
					
						
							
							
								mwagner@evoq.mwagner.org 
							
						 
					 
					
						
						
							
						
						db70f731fa 
					 
					
						
						
							
							post-commit	Changed to docs-commit@  
						
						
						
						
					 
					
						2001-11-07 01:49:38 -06:00 
						 
				 
			
				
					
						
							
							
								mwagner@evoq.mwagner.org 
							
						 
					 
					
						
						
							
						
						bed6035f67 
					 
					
						
						
							
							post-commit	Added docs@ to get manual edits  
						
						
						
						
					 
					
						2001-10-15 23:28:30 -05:00 
						 
				 
			
				
					
						
							
							
								sasha@mysql.sashanet.com 
							
						 
					 
					
						
						
							
						
						242037992f 
					 
					
						
						
							
							merged with 3.23 replication updates  
						
						
						
						
					 
					
						2001-06-28 19:48:49 -06:00 
						 
				 
			
				
					
						
							
							
								sasha@mysql.sashanet.com 
							
						 
					 
					
						
						
							
						
						2e4d264c27 
					 
					
						
						
							
							fixed message in post-commit trigger  
						
						... 
						
						
						
						added debugging options to master to behave sporadically, and a 
test case to make sure the slave can deal with it 
						
						
					 
					
						2001-06-28 18:22:29 -06:00 
						 
				 
			
				
					
						
							
							
								sasha@mysql.sashanet.com 
							
						 
					 
					
						
						
							
						
						86d88318f5 
					 
					
						
						
							
							BitKeeper/triggers/post-commit  
						
						... 
						
						
						
						fixed post-commit message
mysql-test/t/check.test
    fixed bug from 3.23 merge 
						
						
					 
					
						2001-06-12 14:06:05 -06:00 
						 
				 
			
				
					
						
							
							
								monty@work.mysql.com 
							
						 
					 
					
						
						
							
						
						0652902ab5 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2001-06-12 14:12:35 +02:00 
						 
				 
			
				
					
						
							
							
								sasha@mysql.sashanet.com 
							
						 
					 
					
						
						
							
						
						824a3bb406 
					 
					
						
						
							
							send a separate commit message to internals  
						
						... 
						
						
						
						added a test for check table 
						
						
					 
					
						2001-06-11 20:26:24 -06:00 
						 
				 
			
				
					
						
							
							
								mwagner@evoq.mwagner.org 
							
						 
					 
					
						
						
							
						
						6eddbc4899 
					 
					
						
						
							
							post-commit	Updated commit address.  
						
						
						
						
					 
					
						2001-05-27 01:37:46 -05:00 
						 
				 
			
				
					
						
							
							
								mwagner@evoq.mwagner.org 
							
						 
					 
					
						
						
							
						
						e2d77e6a28 
					 
					
						
						
							
							post-commit	Updated commit address.  
						
						... 
						
						
						
						latvia.gif	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Flags/latvia.gif
latvia.txt	BitKeeper file /opt/local/x1/work/bk/mysql/Docs/Flags/latvia.txt 
						
						
					 
					
						2001-05-27 01:10:46 -05:00 
						 
				 
			
				
					
						
							
							
								sasha@mysql.sashanet.com 
							
						 
					 
					
						
						
							
						
						1915d11bb4 
					 
					
						
						
							
							BitKeeper/triggers/post-commit  
						
						... 
						
						
						
						do REAL_EMAIL magic
mysql-test/mysql-test-run.sh
    added show_failed_diffs
mysql-test/r/bench_count_distinct.result
    tired of waiting :-)
mysql-test/r/rpl000001.result
    new test results after implementing Monty's Hack (TM)
mysql-test/t/bench_count_distinct.test
    tired of waiting
mysql-test/t/rpl000001.test
    implemented Monty's Hack (TM) to kill a query in the middle of update
    without generating a table with 30,000 rows. This will also avoice the
    timing uncertainty 
						
						
					 
					
						2001-04-12 13:46:19 -06:00