monty@mysql.com 
							
						 
					 
					
						
						
							
						
						9db45adb60 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-05-14 18:31:22 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b4e92e6360 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2005-05-14 00:01:40 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						20f969b256 
					 
					
						
						
							
							Change create_field->offset to store offset from start of fields, independent of null bits.  
						
						... 
						
						
						
						Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236  
						
						
					 
					
						2005-05-13 11:11:50 +03:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						c33a0673a6 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1  
						
						... 
						
						
						
						into mysql.com:/Users/mikron/wl1682 
						
						
					 
					
						2005-05-12 12:01:01 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						cf642995f6 
					 
					
						
						
							
							Many fixes  
						
						
						
						
					 
					
						2005-05-12 11:20:50 +02:00 
						 
				 
			
				
					
						
							
							
								ndbdev@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						58aa78e32d 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-05-09 20:28:54 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						34cec09efb 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/bug10241  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-05-09 11:26:48 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						aedc92ab39 
					 
					
						
						
							
							After review fixes  
						
						
						
						
					 
					
						2005-05-09 10:30:25 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com[mikron] 
							
						 
					 
					
						
						
							
						
						4bfdc6c9c3 
					 
					
						
						
							
							wl2445.patch  
						
						
						
						
					 
					
						2005-05-07 14:06:07 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						c18a302577 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1  
						
						... 
						
						
						
						into mysql.com:/Users/mikron/wl1682 
						
						
					 
					
						2005-05-07 11:23:09 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						b4ab00df62 
					 
					
						
						
							
							WL 1682: Bitvector for updated/read fields in handler interface  
						
						... 
						
						
						
						Fixed clear issues of bitvector and memory allocation issues 
						
						
					 
					
						2005-05-07 10:00:25 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						5b5565c30a 
					 
					
						
						
							
							BUG#10241 cygwin port: invalid pragma interface directives  
						
						... 
						
						
						
						- Introduce ifdefs so we can control when to use #pragma interface on cygwin 
						
						
					 
					
						2005-05-04 15:05:56 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						f7cd6b8aa1 
					 
					
						
						
							
							WL 1682: After review fixes + update bitvector class + bitvector test  
						
						... 
						
						
						
						cases + bug fixes 
						
						
					 
					
						2005-05-02 15:45:33 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						21347433cf 
					 
					
						
						
							
							WL 1682: Use bitvector instead of query_id to tell handler which fields  
						
						... 
						
						
						
						to read and write
Changed Server code, added new interface to handler and changed the
NDB handler, InnoDB handler and Federated handler that previously used
query_id
Bug#10202 fix (one-liner fix for memory leak) 
						
						
					 
					
						2005-04-28 14:45:27 +02:00 
						 
				 
			
				
					
						
							
							
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						8974ce0836 
					 
					
						
						
							
							Many files:  
						
						... 
						
						
						
						Semi-synchronous replication for InnoDB type tables; before telling the client that a commit has been processed, wait that the replication thread has returned from my_net_send() where it sends the binlog to the slave; note that TCP/IP, even with the TCP_NODELAY option does not guarantee that the slave has RECEIVED the data - this is just heuristic at the moment; this is useful in failover: in almost all cases, every transaction that has returned from the commit has been sent and processed in the slave, which makes failover to the slave simpler if the master crashes; the code does not work yet as is, because MySQL should call innobase_report_binlog_offset_and_commit() in a commit; we will most probably return that call to 5.0.x, to make InnoDB Hot Backup and group commit to work again; XA code broke them temporarily in 5.0.3 
						
						
					 
					
						2005-04-20 19:27:46 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						c8170b349f 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-04-16 04:35:54 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						6632ed5ce7 
					 
					
						
						
							
							Check that the default storage engine is really available, and  
						
						... 
						
						
						
						refuse to start up if it is not. (Bug #9815 ) 
						
						
					 
					
						2005-04-13 18:25:31 -07:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						71f530c4ea 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-04-11 15:11:52 +05: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 
						 
				 
			
				
					
						
							
							
								marko@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						b5328a7dbc 
					 
					
						
						
							
							InnoDB: Prevent ALTER TABLE ... ENGINE=...  
						
						... 
						
						
						
						if there are foreign key constraints on the table. (Bug #5574 ) 
						
						
					 
					
						2005-04-07 12:16:41 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						52770e8682 
					 
					
						
						
							
							XID SQL syntax  
						
						... 
						
						
						
						minor cleanups
XA tests 
						
						
					 
					
						2005-04-04 00:50:05 +02:00 
						 
				 
			
				
					
						
							
							
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						0c21adf370 
					 
					
						
						
							
							Fix upgrade/downgrade issue.  
						
						
						
						
					 
					
						2005-03-25 12:36:04 -08:00 
						 
				 
			
				
					
						
							
							
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						7b81a9fd4c 
					 
					
						
						
							
							Merging support for blackhole up to 5.0.  
						
						
						
						
					 
					
						2005-03-25 10:36:58 -08:00 
						 
				 
			
				
					
						
							
							
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						cfcedd85cd 
					 
					
						
						
							
							Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request.  With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.  
						
						
						
						
					 
					
						2005-03-22 16:10:39 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						ee2b4ec959 
					 
					
						
						
							
							Eliminate warnings noticed by VC7. This includes fixing my_mmap() on  
						
						... 
						
						
						
						Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826 ) 
						
						
					 
					
						2005-03-18 16:12:25 -08: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 
						 
				 
			
				
					
						
							
							
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						2952f73c16 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-02-24 06:24:46 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						383c6e312a 
					 
					
						
						
							
							don't log BEGIN in auto-commit mode  
						
						... 
						
						
						
						correct end_log_pos for Xid_log_event 
						
						
					 
					
						2005-02-23 18:26:49 +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 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						a4dbb3b061 
					 
					
						
						
							
							compatibility fixes, crashing tests  
						
						
						
						
					 
					
						2005-02-22 15:22:37 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f5acf0be01 
					 
					
						
						
							
							Generate warning in ha_delete_table() if files is missing in handler  
						
						
						
						
					 
					
						2005-02-21 20:41:48 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						b3d3f73753 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-02-21 16:13:29 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cab35adf7e 
					 
					
						
						
							
							Review of new pushed code (XA & other)  
						
						... 
						
						
						
						Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command() 
						
						
					 
					
						2005-02-21 14:47:57 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b75d8ac0f3 
					 
					
						
						
							
							xa assert fixes  
						
						
						
						
					 
					
						2005-02-21 11:51:50 +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 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						fd828e5b4d 
					 
					
						
						
							
							manually merged  
						
						
						
						
					 
					
						2005-02-14 21:50:09 +01:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						b371e8a567 
					 
					
						
						
							
							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-14 09:22:14 +01:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						3f1e1f0f6b 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-02-11 22:33:52 +01:00 
						 
				 
			
				
					
						
							
							
								marko@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						7dbb93d9fc 
					 
					
						
						
							
							InnoDB: Make SHOW TABLE STATUS report Row_format=Compact and  
						
						... 
						
						
						
						Row_format=Redundant 
						
						
					 
					
						2005-02-08 13:35:10 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						8c8553af81 
					 
					
						
						
							
							Merge changes  
						
						
						
						
					 
					
						2005-02-04 11:59:02 -08:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						cc1ee6475f 
					 
					
						
						
							
							indexless boolean fulltext search was depending on default_charset_info - Bug#8159  
						
						... 
						
						
						
						ftbw->off wasn't cleared on reinit - Bug#8234 
						
						
					 
					
						2005-02-04 15:24:06 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.homeip.net 
							
						 
					 
					
						
						
							
						
						e54ea9189d 
					 
					
						
						
							
							Merge of query cache from 4.1 to 5.0  
						
						
						
						
					 
					
						2005-02-04 10:56:53 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.homeip.net 
							
						 
					 
					
						
						
							
						
						3181f5d2b6 
					 
					
						
						
							
							Merged "query cache for ndb" to 5.0  
						
						
						
						
					 
					
						2005-02-03 09:33:48 +01:00 
						 
				 
			
				
					
						
							
							
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						a67924ecbc 
					 
					
						
						
							
							WL#1967  
						
						... 
						
						
						
						Support for COMMIT/ROLLBACK optional arguments 
						
						
					 
					
						2005-02-01 19:48:05 +00:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3c5060981f 
					 
					
						
						
							
							query_id and my_xid -> ulonglong  
						
						... 
						
						
						
						fix for binlog+autocommit+tclog
comments, style fixes 
						
						
					 
					
						2005-01-27 22:38:56 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2c0d5bb41d 
					 
					
						
						
							
							documented handlerton structure  
						
						
						
						
					 
					
						2005-01-16 16:11:16 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1034677f94 
					 
					
						
						
							
							XA (not completely polished out yet)  
						
						
						
						
					 
					
						2005-01-16 13:16:23 +01:00 
						 
				 
			
				
					
						
							
							
								marko@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						52ebc04fc5 
					 
					
						
						
							
							Introduce ROW_TYPE=REDUNDANT and ROW_TYPE=COMPACT for InnoDB table formats  
						
						
						
						
					 
					
						2005-01-07 16:43:27 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						19e3c001f4 
					 
					
						
						
							
							revert "LOCK TABLES ... WHERE ENGINE=INNODB"  
						
						
						
						
					 
					
						2004-12-27 12:08:22 +01:00