jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						62b78d4182 
					 
					
						
						
							
							Merge from 4.1  
						
						 
						
						
						
						
					 
					
						2005-04-13 10:38:11 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						0162702290 
					 
					
						
						
							
							Fix ctype_ucs_binlog test when ucs2 not available  
						
						 
						
						
						
						
					 
					
						2005-04-13 09:02:12 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						7a4f495f5b 
					 
					
						
						
							
							Fixed BUG#9674: Stored Procs: Using declared vars in algebric operation  
						
						 
						
						... 
						
						
						
						causes system crash. 
						
						
					 
					
						2005-04-13 17:43:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						387afb3d29 
					 
					
						
						
							
							Fixed BUG#9856: Stored procedures: crash if handler for sqlexception, not found.  
						
						 
						
						
						
						
					 
					
						2005-04-13 16:57:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						6a46d0cd8a 
					 
					
						
						
							
							Added test case for BUG#6129: Stored procedure won't display @@sql_mode value.  
						
						 
						
						
						
						
					 
					
						2005-04-13 16:09:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mleich@mysql.com 
							
						 
					 
					
						
						
							
						
						d1806d7870 
					 
					
						
						
							
							Minor improvements + new option needed for WL#2520 Upgrade/Downgrade Test Plan  
						
						 
						
						
						
						
					 
					
						2005-04-13 11:47:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						3dcfc31e76 
					 
					
						
						
							
							Remove references to result.es files  
						
						 
						
						
						
						
					 
					
						2005-04-12 18:04:32 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						32221d9b9e 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-04-12 23:12:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b3e54c9aee 
					 
					
						
						
							
							mysql-test/r/flush_block_commit.result  
						
						 
						
						... 
						
						
						
						correct result after bugfix
sql/sql_class.cc
    initialize net.query_cache_query 
						
						
					 
					
						2005-04-12 23:08:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						24d4264d02 
					 
					
						
						
							
							Merge mysql.com:/usr/local/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/pem/work/mysql-5.0 
						
						
					 
					
						2005-04-12 18:13:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3ab03ccbb0 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-04-12 17:22:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d4a0becc8a 
					 
					
						
						
							
							FLUSH TABLES WITH READ LOCK should block writes to binlog too  
						
						 
						
						
						
						
					 
					
						2005-04-12 17:15:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						9c21006f81 
					 
					
						
						
							
							Fixed BUG#7185: Stored procedure crash if identifier is AVG  
						
						 
						
						
						
						
					 
					
						2005-04-12 15:43:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						a1c4918a6c 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-04-12 14:51:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						7387030e67 
					 
					
						
						
							
							BUG#8924 'Explain' shows different strategy  
						
						 
						
						... 
						
						
						
						- If number of records in table is 4, the calculated cost for using "index" and "range" become so close so that any rounding errors becomes visible.
 - Added one more record to the tables for heap test and expoect "range" to be selected
 - Decrease number of records in t1 for range and expect "index" to be choosen. 
						
						
					 
					
						2005-04-12 12:04:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						3b1c3d8c68 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/home/ram/work/5.0.bit_class 
						
						
					 
					
						2005-04-12 12:30:09 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						c4376b2bc6 
					 
					
						
						
							
							Bit type support for non-MyISAM tables.  
						
						 
						
						
						
						
					 
					
						2005-04-12 12:27:43 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						98601055b6 
					 
					
						
						
							
							backport kill.test fix from 5.0  
						
						 
						
						
						
						
					 
					
						2005-04-11 22:36:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								reggie@mdk10.(none) 
							
						 
					 
					
						
						
							
						
						4bb4a285ab 
					 
					
						
						
							
							Merge mdk10.(none):/home/reggie/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mdk10.(none):/home/reggie/bk/mysql-5.0 
						
						
					 
					
						2005-04-11 09:29:49 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						71f530c4ea 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-04-11 15:11:52 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						b0dd388190 
					 
					
						
						
							
							Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-4.1-merges 
						
						
					 
					
						2005-04-11 09:53:54 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						06e3647274 
					 
					
						
						
							
							Fix for bug  #9796  "Query Cache caches queries with CURRENT_USER()  
						
						 
						
						... 
						
						
						
						function".
We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function. 
						
						
					 
					
						2005-04-11 00:30:23 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						16e186779f 
					 
					
						
						
							
							ctype_collate.result, ctype_collate.test, union.result, union.test:  
						
						 
						
						... 
						
						
						
						fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating. 
						
						
					 
					
						2005-04-10 12:40:33 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						2038ced40c 
					 
					
						
						
							
							Fixed BUG#9073: Able to declare two handlers for same condition in same scope  
						
						 
						
						
						
						
					 
					
						2005-04-08 19:58:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						e6d72f1c48 
					 
					
						
						
							
							Merge mysql.com:/usr/local/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/pem/work/mysql-5.0 
						
						
					 
					
						2005-04-08 17:32:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						ce2e40ac19 
					 
					
						
						
							
							Fixed BUG#6900: Stored procedure inner handler ignored  
						
						 
						
						... 
						
						
						
						and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied 
						
						
					 
					
						2005-04-08 17:31:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						e99da54fd5 
					 
					
						
						
							
							Fixed BUG#7299: Stored procedures: exception handler catches not-found conditions  
						
						 
						
						
						
						
					 
					
						2005-04-08 16:05:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						3add511de7 
					 
					
						
						
							
							Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)  
						
						 
						
						... 
						
						
						
						Since 4.1 keys are compared with trailing spaces. 
Thus, a "x " key can be inserted between a couple of "x" keys.
The existing code did not take this into account. Though the
comments in the code claimed it did. 
						
						
					 
					
						2005-04-08 14:13:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						20a82a1a6a 
					 
					
						
						
							
							Fixed broken auto_increment  
						
						 
						
						
						
						
					 
					
						2005-04-08 12:34:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						7c38f9d8e7 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
						
						
					 
					
						2005-04-08 11:50:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						817f2c6a13 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
						
						
					 
					
						2005-04-08 11:39:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						813cc0eaf0 
					 
					
						
						
							
							Added more tests for auto_increment  
						
						 
						
						
						
						
					 
					
						2005-04-08 11:38:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						eae3f5ba1d 
					 
					
						
						
							
							Test result fixed  
						
						 
						
						
						
						
					 
					
						2005-04-08 09:23:10 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						33cd3168fb 
					 
					
						
						
							
							Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-5.0.errmsg 
						
						
					 
					
						2005-04-08 08:31:53 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						211638f539 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-08 00:56:29 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						f9dd856d9e 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-04-07 21:29:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						551ebb8a60 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-07 22:02:24 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						960410274c 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-4.1 
						
						
					 
					
						2005-04-07 20:21:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						7a0e28feb5 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-04-07 20:19:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						12b6252145 
					 
					
						
						
							
							BUG#6762 ALTER TABLE gives weird results and error message  
						
						 
						
						... 
						
						
						
						- Removed hardcoded error message from 4.1 
						
						
					 
					
						2005-04-07 20:17:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						8327593bfd 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-04-07 19:48:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						e66eaaa2a0 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-04-07 18:37:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						780202f130 
					 
					
						
						
							
							Moved some old test and added a new test to only be run with mysql-test-run --big  
						
						 
						
						... 
						
						
						
						Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files 
						
						
					 
					
						2005-04-07 19:24:14 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						89b140340c 
					 
					
						
						
							
							Fix for Bug  #9675  Auto-increment not working with INSERT..SELECT and NDB storage  
						
						 
						
						
						
						
					 
					
						2005-04-07 17:44:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						a8f80a8001 
					 
					
						
						
							
							Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-5.0.errmsg 
						
						
					 
					
						2005-04-07 19:30:14 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						345b6d476a 
					 
					
						
						
							
							Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-5.0.errmsg 
						
						
					 
					
						2005-04-07 19:25:13 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						18354f4570 
					 
					
						
						
							
							A small fix to Makefile.am  
						
						 
						
						
						
						
					 
					
						2005-04-07 13:20:15 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						8d05aa0f02 
					 
					
						
						
							
							Moved test for bug  #9566  "explicit LOCK TABLE and store procedures result in illegal  
						
						 
						
						... 
						
						
						
						state" to sp-error.test.
According to Per-Erik all SP related tests which should result in error
should go into sp-error.test and not in sp.test, because we want to be
able to run sp.test using normal client. 
						
						
					 
					
						2005-04-07 11:57:47 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						f374b21d07 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-5.0-bg9566 
						
						
					 
					
						2005-04-07 10:41:07 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						d85bed1121 
					 
					
						
						
							
							Fix for bug  #9566  "explicit LOCK TABLE and store procedures result in  
						
						 
						
						... 
						
						
						
						illegal state".
We should not assume that mysql.proc table does not exist if we are
unable to open it under LOCK TABLES or in prelocked mode (and
remember this fact by setting mysql_proc_table_exists to zero). 
						
						
					 
					
						2005-04-07 01:40:29 +04:00