sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						b2ebf51fbe 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-4.1-bug9298 
						
						
					 
					
						2005-04-28 19:58:52 +04:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						5de370c534 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-04-28 13:32:52 +02:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						d84ed6466b 
					 
					
						
						
							
							A test case for Bug#5673 "Rounding problem in 4.0.21 inserting decimal  
						
						... 
						
						
						
						value into a char field": the patch submitted for the bug a while
ago has never been reviewed or approved to push into 4.0. Decimal
support in 5.0 resolves the issue.
Adding the test case and closing the bug report. 
						
						
					 
					
						2005-04-28 13:06:36 +04:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						9e2e0deece 
					 
					
						
						
							
							Merge bug9911 with 5.0  
						
						
						
						
					 
					
						2005-04-28 11:05:44 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						78263507ab 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
						
						
					 
					
						2005-04-28 10:57:08 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						47c2c96379 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-04-28 10:28:56 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						518f644204 
					 
					
						
						
							
							Fix 'mysql_client_test' with embedded server. (Bug  #9634 )  
						
						
						
						
					 
					
						2005-04-27 17:50:48 -07:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b40756c27e 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2005-04-28 00:41:39 +03:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						1ba85ac979 
					 
					
						
						
							
							BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error  
						
						... 
						
						
						
						- Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming. 
						
						
					 
					
						2005-04-27 22:20:58 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						1ee4426adc 
					 
					
						
						
							
							Little different behaviour in 5.0 and merge with new tests required these changes  
						
						
						
						
					 
					
						2005-04-27 22:02:26 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						bdb1441a65 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-4.1 
						
						
					 
					
						2005-04-27 21:40:11 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						1d8fe5acef 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-4.1-bug9298 
						
						
					 
					
						2005-04-27 22:51:02 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						4732c3b516 
					 
					
						
						
							
							Merge mysql.com:/home/psergey/mysql-4.1-bug9298  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-bug9298-merge 
						
						
					 
					
						2005-04-27 22:49:42 +04:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						c76c23fcbc 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-04-27 18:28:57 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						5f9843aeee 
					 
					
						
						
							
							Fix for avoiding gettin Invalid schema object version when doing local changes  
						
						
						
						
					 
					
						2005-04-27 18:17:41 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						254bb2570c 
					 
					
						
						
							
							Merge mysql.com:/usr/local/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/pem/work/mysql-5.0 
						
						
					 
					
						2005-04-27 16:37:09 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						f769a7a8b0 
					 
					
						
						
							
							Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW  
						
						... 
						
						
						
						(Review on irc by monty) 
						
						
					 
					
						2005-04-27 16:35:49 +02:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						79f049f7b0 
					 
					
						
						
							
							after-merge fix  
						
						
						
						
					 
					
						2005-04-27 19:06:47 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						bc6d650169 
					 
					
						
						
							
							merging  
						
						
						
						
					 
					
						2005-04-27 19:00:27 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						82fc2ce8b7 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/usr/home/ram/work/4.1.b9803 
						
						
					 
					
						2005-04-27 17:20:29 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e18a155fd6 
					 
					
						
						
							
							Fixed core dump bug when hot link list in key cache was empty. Bug  #10167  
						
						
						
						
					 
					
						2005-04-27 14:31:04 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						0290afcdb7 
					 
					
						
						
							
							Merge mysql.com:/usr/local/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/pem/work/mysql-5.0 
						
						
					 
					
						2005-04-27 13:24:40 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						203cdde955 
					 
					
						
						
							
							Merge from 4.1 to 5.0  
						
						
						
						
					 
					
						2005-04-27 12:56:01 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						631f035ee9 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/bug9911  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-4.1 
						
						
					 
					
						2005-04-27 12:17:07 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c35e690c12 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-04-27 11:43:00 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e7b2de98ee 
					 
					
						
						
							
							be sure to call top_level_item() on the new Item_cond_and,  
						
						... 
						
						
						
						that merges ON and WHERE (BUG#10162) 
						
						
					 
					
						2005-04-27 01:32:44 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3ca23bd918 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2005-04-26 21:09:42 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						281c0a8130 
					 
					
						
						
							
							Fixed BUG#8408: Stored procedure crash if function contains SHOW  
						
						... 
						
						
						
						We simply have to disallow any kind of result set being sent back
  from a function. Can't see any way to make that to work. 
						
						
					 
					
						2005-04-26 17:31:59 +02:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						5624641cb0 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/usr/home/ram/work/5.0.b9489 
						
						
					 
					
						2005-04-26 19:57:15 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						db2b729c73 
					 
					
						
						
							
							A fix (bug  #10176 : problem with varchar keys).  
						
						
						
						
					 
					
						2005-04-26 19:46:52 +05:00 
						 
				 
			
				
					
						
							
							
								gbichot@quadita2.mysql.com 
							
						 
					 
					
						
						
							
						
						bc7856cd1e 
					 
					
						
						
							
							Merge quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita  
						
						... 
						
						
						
						into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita 
						
						
					 
					
						2005-04-26 16:09:04 +02:00 
						 
				 
			
				
					
						
							
							
								gbichot@quadita2.mysql.com 
							
						 
					 
					
						
						
							
						
						a95571875c 
					 
					
						
						
							
							checking that statements get into binlog even when they were affecting  
						
						... 
						
						
						
						no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to). 
						
						
					 
					
						2005-04-26 15:52:04 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						220a01a838 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2005-04-26 16:03:20 +03:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						12d14eb96c 
					 
					
						
						
							
							Test case (bug  #9756 : mysql client failing on dumps containing certain \ sequences).  
						
						
						
						
					 
					
						2005-04-26 15:48:16 +05:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						8d370fbcf9 
					 
					
						
						
							
							BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error  
						
						... 
						
						
						
						- Implemented ha_archive::rename_table
 - Added testcases for rename 
						
						
					 
					
						2005-04-26 11:35:52 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						db6cc1ed17 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-bug8490-2 
						
						
					 
					
						2005-04-25 04:25:32 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						ea347e5b06 
					 
					
						
						
							
							Fix for BUG#8921: Make SHOW CREATE VIEW ignore temporary tables.  
						
						
						
						
					 
					
						2005-04-25 04:00:35 +04:00 
						 
				 
			
				
					
						
							
							
								gbichot@quadita2.mysql.com 
							
						 
					 
					
						
						
							
						
						b75789e3d8 
					 
					
						
						
							
							Fixes for BUG#10039 "MEMORY engine is reported as HEAP",  
						
						... 
						
						
						
						BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs" 
						
						
					 
					
						2005-04-23 00:05:05 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						d7a1549b07 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-bug8490-2 
						
						
					 
					
						2005-04-23 00:52:33 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						307c0cf908 
					 
					
						
						
							
							Fix for BUG#8490: In mysql_make_view for join algorithm views we need  
						
						... 
						
						
						
						to insert view's subqueries into select_lex->slave(->next)* chain. 
In case a join has several such views, don't add the same subqueries several times
(this forms a loop on the above chain which breaks many parts of the code) 
						
						
					 
					
						2005-04-23 00:13:46 +04:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						fd7176121e 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
						
						
					 
					
						2005-04-22 17:40:19 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						5411f8a6e4 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-04-22 17:38:28 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						9457551616 
					 
					
						
						
							
							Fix for Bug  #9318   drop database does not drop ndb tables  
						
						
						
						
					 
					
						2005-04-22 15:28:23 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						5fcfb8a442 
					 
					
						
						
							
							Merge mysql.com:/usr/local/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/pem/work/mysql-5.0 
						
						
					 
					
						2005-04-22 12:55:44 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						057b8aa9a8 
					 
					
						
						
							
							Fixed BUG#9004: Inconsistent behaviour of SP re. warnings  
						
						
						
						
					 
					
						2005-04-22 12:53:48 +02:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						51ca05b6e3 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-5.0-bg9486 
						
						
					 
					
						2005-04-22 10:51:04 +04:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						50ada0a01c 
					 
					
						
						
							
							A fix (Bug  #9489 : Problem with BIT_OR and MySQL 5.0.3)  
						
						
						
						
					 
					
						2005-04-21 21:06:08 +05:00 
						 
				 
			
				
					
						
							
							
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						c5d94db336 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-04-21 13:34:39 +01:00 
						 
				 
			
				
					
						
							
							
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						f67507588f 
					 
					
						
						
							
							Bug#8861 - If Return is a YEAR data type, value is not shown in year format  
						
						... 
						
						
						
						Bug partially fixed by 9775/9102 work on SP function return. 
						
						
					 
					
						2005-04-21 13:22:47 +01:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						c2a8d2c061 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-bug9912 
						
						
					 
					
						2005-04-21 13:36:06 +04:00