msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						3f8a66cbea 
					 
					
						
						
							
							Merged WL#2269 to mysql-5.0  
						
						 
						
						
						
						
					 
					
						2005-03-15 15:22:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						2bdd710d3c 
					 
					
						
						
							
							WL#2269 Enable query cache for NDB part 2  
						
						 
						
						... 
						
						
						
						-This is mostly fixes for correct behaviour when using query cache + transactions + the thread that
fetches commit count from NDB at regular intervals. The major fix is to add a
list in thd_ndb, that keeps a list of NDB_SHARE's that were modified by
transaction and then "clearing" them in ndbcluster_commit. 
						
						
					 
					
						2005-03-15 15:03:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						a7ad7784c3 
					 
					
						
						
							
							Manual merge  
						
						 
						
						
						
						
					 
					
						2005-03-14 12:25:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						13ec961c3a 
					 
					
						
						
							
							BUG#6554 Problem Building MySql on Fedora Core 3  
						
						 
						
						... 
						
						
						
						- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3 
						
						
					 
					
						2005-03-14 12:07:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8986ffebde 
					 
					
						
						
							
							print xa recovery progress  
						
						 
						
						... 
						
						
						
						add names to handlertons
trans_need_2pc() macro 
						
						
					 
					
						2005-03-13 21:58:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						a85613f62c 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-03-11 21:37:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						c7925bd3be 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
						
						
					 
					
						2005-03-10 09:20:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e40bf3c40b 
					 
					
						
						
							
							sql/ha_ndbcluster.cc  
						
						 
						
						... 
						
						
						
						after merge fix
sql/sql_parse.cc
    correct max_connections condition 
						
						
					 
					
						2005-03-10 00:10:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								marty@linux.site 
							
						 
					 
					
						
						
							
						
						d88b75874b 
					 
					
						
						
							
							Fixed broken 4.1->5.0 merge  
						
						 
						
						
						
						
					 
					
						2005-03-09 23:38:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						3e95113461 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
						
						
					 
					
						2005-03-09 21:19:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						a032510e19 
					 
					
						
						
							
							corrected typo: deafault -> default  
						
						 
						
						
						
						
					 
					
						2005-03-09 16:39:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						956682de1a 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2005-03-09 14:09:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						ce87085294 
					 
					
						
						
							
							Review fixes for Bug  #8753  Invalid schema  
						
						 
						
						... 
						
						
						
						object version after dropping index 
						
						
					 
					
						2005-03-07 10:53:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						6fc6a7521a 
					 
					
						
						
							
							Fix for Bug  #8753  Invalid schema object version after dropping index  
						
						 
						
						
						
						
					 
					
						2005-03-07 10:21:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						1029db2b6d 
					 
					
						
						
							
							Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-5.0-ndb 
						
						
					 
					
						2005-02-24 20:57:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						0a265b6d84 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-5.0-ndb 
						
						
					 
					
						2005-02-24 20:48:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						168847b8e1 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/fix  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-5.0 
						
						
					 
					
						2005-02-24 19:01:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						c25ce0e362 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/fix  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-4.1 
						
						
					 
					
						2005-02-24 18:59:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						15de06f290 
					 
					
						
						
							
							bug#8786 - ndb autodiscover, sometimes fails  
						
						 
						
						... 
						
						
						
						remove dict forwarding
  add api retries on NotMaster 
						
						
					 
					
						2005-02-24 18:58:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						4e6a4dfa13 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-24 14:48:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						00d5e43c75 
					 
					
						
						
							
							Added support for condition pushdown to storage engine for LIKE of varbin  
						
						 
						
						
						
						
					 
					
						2005-02-24 11:09:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						2570dc8883 
					 
					
						
						
							
							Convert ndb-cache-check-time fomr milliseconds to seconds  
						
						 
						
						
						
						
					 
					
						2005-02-24 09:42:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						e0dbdca79e 
					 
					
						
						
							
							ha_ndbcluster.cc:  
						
						 
						
						... 
						
						
						
						Fixed faulty debug printout
ndb_condition_pushdown.test, ndb_condition_pushdown.result:
  Added BINARY and VARBINARY tests 
						
						
					 
					
						2005-02-23 17:18:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						364492239b 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-02-23 15:54:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						fcc37a0787 
					 
					
						
						
							
							Fixes for condition pushdown to storage engine based on comments from code review  
						
						 
						
						
						
						
					 
					
						2005-02-23 15:51:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						c4f1804d9c 
					 
					
						
						
							
							Manual merge  
						
						 
						
						
						
						
					 
					
						2005-02-22 11:19:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tulin@mysql.com 
							
						 
					 
					
						
						
							
						
						d863b8951d 
					 
					
						
						
							
							corrected errors in how ndbcluster handler closes down in case of error  
						
						 
						
						
						
						
					 
					
						2005-02-21 23:29:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						b3d3f73753 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-21 16:13:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						b4417c7572 
					 
					
						
						
							
							Fix so that ndb-cache-check-time is measured in milliseconds  
						
						 
						
						
						
						
					 
					
						2005-02-21 14:04:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						b6e20e350f 
					 
					
						
						
							
							ndb - fix problems introduced/discovered by XA  
						
						 
						
						
						
						
					 
					
						2005-02-21 10:53:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						bf2e97ca25 
					 
					
						
						
							
							Added missing NOR  
						
						 
						
						
						
						
					 
					
						2005-02-19 14:18:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						067543c4e8 
					 
					
						
						
							
							Added support for LIKE and NOT LIKE in condition pushdown  
						
						 
						
						
						
						
					 
					
						2005-02-18 21:43:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1235e6d2c7 
					 
					
						
						
							
							Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa 
						
						
					 
					
						2005-02-18 13:38:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						ed53a37b02 
					 
					
						
						
							
							Added NULL initilizers for commit_by_xid and rollback_by_xid in hton struct. Changed back table->in_use to current_thd.  
						
						 
						
						
						
						
					 
					
						2005-02-18 12:53:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3f7355dfef 
					 
					
						
						
							
							making XA tree to compile (and pass tests) in -max build  
						
						 
						
						
						
						
					 
					
						2005-02-17 22:52:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						55824f59b7 
					 
					
						
						
							
							Merged test case  
						
						 
						
						
						
						
					 
					
						2005-02-17 14:45:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.homeip.net 
							
						 
					 
					
						
						
							
						
						a004533a76 
					 
					
						
						
							
							BUG#8547: Wrong errormessage when dropping table that does not exist in NDB  
						
						 
						
						... 
						
						
						
						- Added tescases
 - Added handling of HA_ERR_NO_SUCH_TABLE in mysql_rm_table_part2 so that 
   error messages now are consistent 
						
						
					 
					
						2005-02-17 14:22:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						96188c81e9 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-02-16 23:16:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pekka@mysql.com 
							
						 
					 
					
						
						
							
						
						338f75a49d 
					 
					
						
						
							
							ndb - fix new decimal type mysql vs. ndb  
						
						 
						
						
						
						
					 
					
						2005-02-16 21:19:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						59a986d947 
					 
					
						
						
							
							Small fixes and added comments to condition pushdown to ndbcluster, after code review  
						
						 
						
						
						
						
					 
					
						2005-02-16 14:18:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pekka@mysql.com 
							
						 
					 
					
						
						
							
						
						c177f9fc4a 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-16 13:14:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pekka@mysql.com 
							
						 
					 
					
						
						
							
						
						7c9a155c4a 
					 
					
						
						
							
							ndb - fix old decimal type mysql vs ndb  
						
						 
						
						
						
						
					 
					
						2005-02-16 12:45:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						f72082ea06 
					 
					
						
						
							
							No support for decimal type for columns yet  
						
						 
						
						
						
						
					 
					
						2005-02-14 07:09:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						1f4df0b448 
					 
					
						
						
							
							Added support for new decimal type in condition pushdown  
						
						 
						
						
						
						
					 
					
						2005-02-13 22:03:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						3f1e1f0f6b 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-11 22:33:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						828a785610 
					 
					
						
						
							
							Condition pushdown v.2  
						
						 
						
						
						
						
					 
					
						2005-02-11 22:05:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.homeip.net 
							
						 
					 
					
						
						
							
						
						e64145818b 
					 
					
						
						
							
							Fix core dump in  ha_ndbcluster::print_results  
						
						 
						
						
						
						
					 
					
						2005-02-09 15:09:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.homeip.net 
							
						 
					 
					
						
						
							
						
						facc7b4da1 
					 
					
						
						
							
							Updated style after review  
						
						 
						
						
						
						
					 
					
						2005-02-09 11:14:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.homeip.net 
							
						 
					 
					
						
						
							
						
						558af8e2ea 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-02-07 13:48:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.homeip.net 
							
						 
					 
					
						
						
							
						
						28b21534bb 
					 
					
						
						
							
							Small changes after Tomas review  
						
						 
						
						
						
						
					 
					
						2005-02-07 13:46:13 +01:00