magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						673dc109b4 
					 
					
						
						
							
							Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb 
						
						
					 
					
						2004-09-30 17:15:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						6469a109da 
					 
					
						
						
							
							Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb 
						
						
					 
					
						2004-09-30 17:08:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						4faaed98ed 
					 
					
						
						
							
							Merge fixes  
						
						 
						
						
						
						
					 
					
						2004-09-30 16:12:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						caa8bbaeec 
					 
					
						
						
							
							cosmetic  
						
						 
						
						
						
						
					 
					
						2004-09-28 23:42:34 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						03e0606b66 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-09-28 19:22:04 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						d5b47c7933 
					 
					
						
						
							
							ha_ndbcluster.cc:  
						
						 
						
						... 
						
						
						
						testing foce send 
						
						
					 
					
						2004-09-28 19:11:50 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						1568b72d9c 
					 
					
						
						
							
							ha_ndbcluster.cc:  
						
						 
						
						... 
						
						
						
						typo 
						
						
					 
					
						2004-09-28 17:41:58 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						0a9730beb4 
					 
					
						
						
							
							set correct lockmode in all reads...  
						
						 
						
						... 
						
						
						
						move lockmode from scan operation to operation
    added read tuple with lock mode 
						
						
					 
					
						2004-09-28 17:35:07 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						18d5e9b45c 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb 
						
						
					 
					
						2004-09-28 10:34:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						1b9d0b340d 
					 
					
						
						
							
							Adjusted so auto_increment value after bulk insert will be exactly +1 after last (if no parallel inserts)  
						
						 
						
						
						
						
					 
					
						2004-09-28 09:53:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@shellback.(none) 
							
						 
					 
					
						
						
							
						
						19787199ec 
					 
					
						
						
							
							Correct merge problem  
						
						 
						
						
						
						
					 
					
						2004-09-28 08:53:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						1379567be1 
					 
					
						
						
							
							removed init on ConfigRetriever  
						
						 
						
						... 
						
						
						
						added some debug printouts
    some changes in ndbcluster_init to make start of mysqld first work 
						
						
					 
					
						2004-09-27 00:24:23 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@shellback.(none) 
							
						 
					 
					
						
						
							
						
						e5ff827178 
					 
					
						
						
							
							Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb  
						
						 
						
						... 
						
						
						
						into shellback.(none):/home/magnus/mysql/mysql-4.1-ndb 
						
						
					 
					
						2004-09-26 17:49:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@shellback.(none) 
							
						 
					 
					
						
						
							
						
						94b305b226 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-09-26 16:21:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@shellback.(none) 
							
						 
					 
					
						
						
							
						
						059941db21 
					 
					
						
						
							
							WL#1424 Updated after review  
						
						 
						
						... 
						
						
						
						* Changed the implementation of ndbcluster_find_files to be more efficient, using only one mutex lock
* Moved ha_find_files to end of mysql_find_files so that it can be passed the list that we are interested to find. 
						
						
					 
					
						2004-09-26 16:11:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@shellback.(none) 
							
						 
					 
					
						
						
							
						
						9e359d2397 
					 
					
						
						
							
							Clean up of index_name and unique_index_name  
						
						 
						
						
						
						
					 
					
						2004-09-25 14:35:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						71d5ea8f85 
					 
					
						
						
							
							fix for invalidating table if mismatch with frm  
						
						 
						
						... 
						
						
						
						removed debug printout
    new test in alter table for dictionay update test with multiple connections
    added coice of setting MaxNoOfOrderedIndexes
    added option to run "--small-bench" 
						
						
					 
					
						2004-09-24 16:58:25 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						f06d8027ea 
					 
					
						
						
							
							Merge mskold@build.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1 
						
						
					 
					
						2004-09-22 17:30:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						a0317069e5 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-09-21 12:56:05 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						b2c696393d 
					 
					
						
						
							
							bug#5591  
						
						 
						
						
						
						
					 
					
						2004-09-21 12:52:56 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						61be5a9c27 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-09-21 14:19:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						b1fa0304e8 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge 
						
						
					 
					
						2004-09-21 12:19:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						58899f0137 
					 
					
						
						
							
							Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2 
						
						
					 
					
						2004-09-21 12:23:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						0097c6d9b2 
					 
					
						
						
							
							Changed WL#1424 to use the function ha_find_files. This is a simpler implementation and all handler specific code is hidden in the appropriate handler.  
						
						 
						
						
						
						
					 
					
						2004-09-21 12:13:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						646f1036d4 
					 
					
						
						
							
							Merge mskold@build.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1 
						
						
					 
					
						2004-09-20 21:03:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						f3c68d3831 
					 
					
						
						
							
							Added support for calculating index cadinality  
						
						 
						
						
						
						
					 
					
						2004-09-20 21:03:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						b5fe917271 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-4.1-ndb 
						
						
					 
					
						2004-09-20 20:56:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						3473effec4 
					 
					
						
						
							
							suggested fix for bug 5591 adn corrct select count() with several clients  
						
						 
						
						
						
						
					 
					
						2004-09-20 15:52:19 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						08312bfb32 
					 
					
						
						
							
							Merge changes  
						
						 
						
						
						
						
					 
					
						2004-09-20 17:34:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						cdc7a32f37 
					 
					
						
						
							
							Merged Thd_ndb  
						
						 
						
						
						
						
					 
					
						2004-09-20 14:28:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						9aab724d6c 
					 
					
						
						
							
							Ues buf pointer in get_ndb_value  
						
						 
						
						... 
						
						
						
						Merge fixes 
						
						
					 
					
						2004-09-20 12:40:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						47168d1219 
					 
					
						
						
							
							Merged new ndb_insert.test and .result  
						
						 
						
						
						
						
					 
					
						2004-09-20 11:14:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						4c45731881 
					 
					
						
						
							
							Preparation for batching  
						
						 
						
						
						
						
					 
					
						2004-09-17 14:58:08 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.(none) 
							
						 
					 
					
						
						
							
						
						87ba45e99b 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb  
						
						 
						
						... 
						
						
						
						into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge 
						
						
					 
					
						2004-09-16 23:36:48 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						251fe25bf8 
					 
					
						
						
							
							Optimzed handling of NO_AUTO_VALUE_ON_ZERO  
						
						 
						
						
						
						
					 
					
						2004-09-16 04:55:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						37864e2727 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-09-15 22:36:57 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						91ff64e107 
					 
					
						
						
							
							Added options --auto-increment-increment and --auto-increment-offset.  
						
						 
						
						... 
						
						
						
						This allows one to setup a master <-> master replication with non conflicting auto-increment series.
Cleaned up binary log code to make it easyer to add new state variables.
Added simpler 'upper level' logic for artificial events (events that should not cause cleanups on slave).
Simplified binary log handling.
Changed how auto_increment works together with to SET INSERT_ID=# to make it more predictable: Now the inserted rows in a multi-row statement are set independent of the existing rows in the table. (Before only InnoDB did this correctly) 
						
						
					 
					
						2004-09-15 22:10:31 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						4a9805679e 
					 
					
						
						
							
							Fixed handling of NO_AUTO_VALUE_ON_ZERO  
						
						 
						
						
						
						
					 
					
						2004-09-15 18:44:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pekka@mysql.com 
							
						 
					 
					
						
						
							
						
						0caba84b46 
					 
					
						
						
							
							ndb charsets: DICT  
						
						 
						
						
						
						
					 
					
						2004-09-15 17:44:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						089e0565d1 
					 
					
						
						
							
							Added support for auto_increment of partial key  
						
						 
						
						
						
						
					 
					
						2004-09-15 17:31:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						013486701c 
					 
					
						
						
							
							BUG#4775 "Duplicate key requires rollback of transaction" - Improved error message telling that transaction is aborted  
						
						 
						
						... 
						
						
						
						BUG#4312 "wrong behaviour on insert .. on duplicate key" functionality disabled 
						
						
					 
					
						2004-09-15 14:44:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@a80-186-8-224.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						9a781af114 
					 
					
						
						
							
							Fixed a couple of bugs.  
						
						 
						
						
						
						
					 
					
						2004-09-14 22:02:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						9311c81a55 
					 
					
						
						
							
							Merge mskold@build.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1 
						
						
					 
					
						2004-09-14 18:17:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.(none) 
							
						 
					 
					
						
						
							
						
						db1604a7c7 
					 
					
						
						
							
							fix to make transaction failure also affect select count() on other tables in thread  
						
						 
						
						
						
						
					 
					
						2004-09-14 16:17:01 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.(none) 
							
						 
					 
					
						
						
							
						
						457dfbe779 
					 
					
						
						
							
							Added testcase for select count() during transaction with failures  
						
						 
						
						... 
						
						
						
						added fix for keeping "records" up to date when execute() fails 
						
						
					 
					
						2004-09-14 15:51:57 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.(none) 
							
						 
					 
					
						
						
							
						
						fc174af248 
					 
					
						
						
							
							new method to set size of local table data  
						
						 
						
						... 
						
						
						
						clearer configure description texts
changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects
moved allocation/deletion of Ndb objects to Thd_ndb 
						
						
					 
					
						2004-09-14 12:47:34 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.(none) 
							
						 
					 
					
						
						
							
						
						aecd1e5d7f 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb  
						
						 
						
						... 
						
						
						
						into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge 
						
						
					 
					
						2004-09-14 08:55:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.(none) 
							
						 
					 
					
						
						
							
						
						21a4b1b4e6 
					 
					
						
						
							
							moved all ndb thread specific data into new placeholder  
						
						 
						
						... 
						
						
						
						new methods to keep "records" up to date
unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
new methods to keep "records" up to datecorrect record field in ndbcluster handler
new method for ndbcluster handler to store/retrieve table and thread specific data
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
hanged deleteKey to return ponter to deleted object
moved heavy global cache fetch from inline to separate method 
						
						
					 
					
						2004-09-14 08:52:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						6370af0bb2 
					 
					
						
						
							
							Merge mskold@build.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1 
						
						
					 
					
						2004-09-13 22:31:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						0b3d778691 
					 
					
						
						
							
							Merge.  
						
						 
						
						
						
						
					 
					
						2004-09-13 18:12:44 +03:00