joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						b2ff852c62 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/wl1744 
						
						
					 
					
						2004-11-10 21:53:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						dd1cd8aa46 
					 
					
						
						
							
							Bug#6031 - To drop database you have to execute DROP DATABASE command twice.  
						
						 
						
						... 
						
						
						
						DROP DATABASE failed because of file ext not in TYPELIB of known extensions.
  General solution - construct a TYPELIB at runtime instead of a static list. 
						
						
					 
					
						2004-11-10 15:07:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Administrator@w2k. 
							
						 
					 
					
						
						
							
						
						414298f38b 
					 
					
						
						
							
							Merge joreland@bk-internal.mysql.com:wl1744 into w2k.:C:/mysql-4.1  
						
						 
						
						
						
						
					 
					
						2004-11-10 14:02:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						aeafd88e19 
					 
					
						
						
							
							bug#6538  
						
						 
						
						... 
						
						
						
						ndb: Fix return value in index_last wo/ rows 
						
						
					 
					
						2004-11-10 11:02:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						31303bd0de 
					 
					
						
						
							
							wl1744 - win compile fixes  
						
						 
						
						
						
						
					 
					
						2004-11-10 00:39:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1087186657 
					 
					
						
						
							
							Merge with 4.1 to get new thd->mem_root handling  
						
						 
						
						
						
						
					 
					
						2004-11-08 17:53:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						9d8dcdcf72 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/new-fix  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-4.1 
						
						
					 
					
						2004-11-08 11:26:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						3821a8dfca 
					 
					
						
						
							
							ndb: bug#6435  
						
						 
						
						... 
						
						
						
						fix null handling in ha_ndbcluster when using ordered index 
						
						
					 
					
						2004-11-08 11:11:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						8acbd6a2ba 
					 
					
						
						
							
							ndb: bug#6451  
						
						 
						
						... 
						
						
						
						1) fix so that missing blob tables don't prevent table from being
    dropped
2) decrease size of blob part if record length exceeds max length
3) add test case for table wo/ corresponding blob table
4) init scan counters when sending scan_tabreq 
						
						
					 
					
						2004-11-08 11:06:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						071001950e 
					 
					
						
						
							
							Merge with 4.1 to get in latest bug fixes  
						
						 
						
						
						
						
					 
					
						2004-11-04 15:06:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						0bd6fd7875 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1 
						
						
					 
					
						2004-11-04 10:43:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						700da57918 
					 
					
						
						
							
							Fix for bug#6398 update of primary key fails  
						
						 
						
						
						
						
					 
					
						2004-11-03 15:53:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						47bbf768d4 
					 
					
						
						
							
							Fixes after merge with 4.1  
						
						 
						
						... 
						
						
						
						FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete 
						
						
					 
					
						2004-11-03 12:39:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						86b33f360b 
					 
					
						
						
							
							A fix (bug  #6331 : INSERT IGNORE .. SELECT breaks subsequent inserts).  
						
						 
						
						
						
						
					 
					
						2004-11-02 19:48:37 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						afbe601302 
					 
					
						
						
							
							merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-10-29 19:26:52 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						289f68a1b9 
					 
					
						
						
							
							test that attribute name truncation works  
						
						 
						
						... 
						
						
						
						exposed the attribute name size limit for handler
   added field name truncation to ndb handler 
						
						
					 
					
						2004-10-28 15:35:06 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						179a4ca86e 
					 
					
						
						
							
							fix for alignment bug on solaris 64 bit  
						
						 
						
						... 
						
						
						
						removed compiler warning 
						
						
					 
					
						2004-10-25 20:35:46 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						75ac46c0d4 
					 
					
						
						
							
							compile fixes for butch  
						
						 
						
						
						
						
					 
					
						2004-10-21 12:39:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						8ae6219c26 
					 
					
						
						
							
							fix so that ndb handler can cope with char(0), mapped to char(1) for now  
						
						 
						
						
						
						
					 
					
						2004-10-20 17:22:58 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						7af65592c7 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mishka.local:/home/my/mysql-4.1 
						
						
					 
					
						2004-10-20 02:55:03 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						1ef4979e48 
					 
					
						
						
							
							fix for platforms that have lower_case_table_names == 2  
						
						 
						
						
						
						
					 
					
						2004-10-19 23:55:02 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						719c88e38f 
					 
					
						
						
							
							true,false -> TRUE, FALSE  
						
						 
						
						... 
						
						
						
						Simple fixes/optimization of things discovered during review of new pushed code 
						
						
					 
					
						2004-10-14 18:03:46 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pekka@mysql.com 
							
						 
					 
					
						
						
							
						
						5c700650ca 
					 
					
						
						
							
							Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb  
						
						 
						
						... 
						
						
						
						into mysql.com:/space/pekka/ndb/version/my41-tux 
						
						
					 
					
						2004-10-14 10:38:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						57612c479f 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-4.1-ndb 
						
						
					 
					
						2004-10-13 10:19:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						29c270c13e 
					 
					
						
						
							
							Bug#6020, any lock >= write_allow_write is a write lock  
						
						 
						
						
						
						
					 
					
						2004-10-13 10:08:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pekka@mysql.com 
							
						 
					 
					
						
						
							
						
						fabf791061 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-10-10 18:55:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						252c14049e 
					 
					
						
						
							
							Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge 
						
						
					 
					
						2004-10-10 10:03:10 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						01c29fc921 
					 
					
						
						
							
							BUG#5973 ndb table belonging to different database shows up in SHOW TABLES  
						
						 
						
						
						
						
					 
					
						2004-10-08 13:37:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pekka@mysql.com 
							
						 
					 
					
						
						
							
						
						8920cff4e9 
					 
					
						
						
							
							NDB wl-2151 Fix bounds setting table handler vs TUX  
						
						 
						
						
						
						
					 
					
						2004-10-08 10:50:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						9035aab33c 
					 
					
						
						
							
							fixed bug where scan is not closed as it should  
						
						 
						
						
						
						
					 
					
						2004-10-07 16:01:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						d55efe332d 
					 
					
						
						
							
							Sned original NDB error as warning to client  
						
						 
						
						
						
						
					 
					
						2004-10-07 14:19:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						ac9016df91 
					 
					
						
						
							
							Initialise "sorted" variable in constructor of QUICK_SELECT. The variable is set to 1 in test_if_skip_sort_order if we decide to optimize "order by" by uinsg index_read.  
						
						 
						
						
						
						
					 
					
						2004-10-07 11:57:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						6985bcd59d 
					 
					
						
						
							
							Don't show NDB$BLOB tables in SHOW TABLES  
						
						 
						
						
						
						
					 
					
						2004-10-07 09:16:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						884892a650 
					 
					
						
						
							
							bug#5736, subqueries and not in  
						
						 
						
						... 
						
						
						
						and testcases 
						
						
					 
					
						2004-10-06 13:18:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						a716d2c4cf 
					 
					
						
						
							
							bug#5367  
						
						 
						
						... 
						
						
						
						subqueries with "not in" and ndb 
						
						
					 
					
						2004-10-06 08:48:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						9d6cb54bce 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-4.1-ndb 
						
						
					 
					
						2004-10-05 14:04:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						ac7771becd 
					 
					
						
						
							
							Don't need to scan exclusive since keyinfo is sent anyway  
						
						 
						
						
						
						
					 
					
						2004-10-05 13:51:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						0a8bbe4d85 
					 
					
						
						
							
							wl2135 - index restart  
						
						 
						
						
						
						
					 
					
						2004-10-05 12:17:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						d60ba54d1c 
					 
					
						
						
							
							moved code out of DBUG_ASSERT  
						
						 
						
						
						
						
					 
					
						2004-10-05 10:04:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						bc5ca3a1ce 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-10-04 12:36:25 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						e13b136c9a 
					 
					
						
						
							
							bug  #5872 , transactions should only be restarted with transaction.on flag off if execute_commit has been performed  
						
						 
						
						... 
						
						
						
						added testcase for this
use force send for all executes 
						
						
					 
					
						2004-10-04 12:26:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						65949b5eb0 
					 
					
						
						
							
							merge error  
						
						 
						
						
						
						
					 
					
						2004-10-03 23:20:05 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						b17bcca66f 
					 
					
						
						
							
							merge error  
						
						 
						
						
						
						
					 
					
						2004-10-03 22:27:04 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						f6ad058388 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-10-03 21:39:04 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						5745223a90 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
						
						
					 
					
						2004-10-01 21:35:50 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						929e98b45b 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
						
						
					 
					
						2004-10-01 16:17:04 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						53209cc4fc 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-4.1-ryan 
						
						
					 
					
						2004-10-01 18:55:17 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						2511990c97 
					 
					
						
						
							
							Support for TIMESTAMP columns holding NULL values. Unlike all other  
						
						 
						
						... 
						
						
						
						column types TIMESTAMP is NOT NULL by default, so in order to have 
TIMESTAMP column holding NULL valaues you have to specify NULL as
one of its attributes (this needed for backward compatibility).
Main changes:
Replaced TABLE::timestamp_default_now/on_update_now members with
TABLE::timestamp_auto_set_type flag which is used everywhere
for determining if we should auto-set value of TIMESTAMP field 
during this operation or not. We are also use Field_timestamp::set_time()
instead of handler::update_timestamp() in handlers. 
						
						
					 
					
						2004-10-01 18:54:06 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						5e8ce3841a 
					 
					
						
						
							
							bug#5349 ALTER TABLE corrupts TEXT (and blob?)  
						
						 
						
						
						
						
					 
					
						2004-10-01 11:16:49 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						53d77cfcb3 
					 
					
						
						
							
							Merge mskold@build.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1 
						
						
					 
					
						2004-10-01 12:08:04 +02:00