monty@mysql.com 
							
						 
					 
					
						
						
							
						
						775f17667b 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2005-06-07 00:31:53 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6a5349028c 
					 
					
						
						
							
							a compiler must see '#pragma implementation' *before*  
						
						 
						
						... 
						
						
						
						'#pragma interface' (that comes with the #include'd header file) 
						
						
					 
					
						2005-06-05 19:38:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						29fd1f2fd9 
					 
					
						
						
							
							Move USE_PRAGMA_IMPLEMENTATION to proper place  
						
						 
						
						... 
						
						
						
						Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable 
						
						
					 
					
						2005-06-03 23:46:03 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						644906bf9c 
					 
					
						
						
							
							bitmap bug fixes and interface change  
						
						 
						
						
						
						
					 
					
						2005-06-02 18:40:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						bef102ec90 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1 
						
						
					 
					
						2005-06-02 09:50:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						f0fcc54b0c 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-06-02 04:45:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						bd48eed988 
					 
					
						
						
							
							tztime.cc:  
						
						 
						
						... 
						
						
						
						Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION 
						
						
					 
					
						2005-06-02 02:43:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						5088b28d09 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-05-31 14:37:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						697cfe7f07 
					 
					
						
						
							
							Merge from 4.1  
						
						 
						
						
						
						
					 
					
						2005-05-26 21:01:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						83d430353e 
					 
					
						
						
							
							Add ifdefs to control when "#pragma implementation" should be used  
						
						 
						
						... 
						
						
						
						Added some more ifdefs for "#pragma interface" 
						
						
					 
					
						2005-05-26 12:09:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tulin@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						03590c20bd 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-05-18 22:26:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						c1b512fad3 
					 
					
						
						
							
							Change update_auto_increment to return 1 if get_auto_increment() returned ~(ulonglong)  
						
						 
						
						... 
						
						
						
						This makes it easier to give an error in the handler if there was a problem generating an auto-increment value 
						
						
					 
					
						2005-05-18 10:41:35 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tulin@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						23f79bd1f2 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-05-17 10:17:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d06bb6fa39 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						
						
						
					 
					
						2005-05-16 15:21:35 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						a9f6aab4c9 
					 
					
						
						
							
							Fixes while reviewing new code  
						
						 
						
						... 
						
						
						
						Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema 
						
						
					 
					
						2005-05-06 11:39:30 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						abec3ade26 
					 
					
						
						
							
							WL 1682:  
						
						 
						
						... 
						
						
						
						Divide bitvector into .cc and .h file 
						
						
					 
					
						2005-05-05 10:17:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						0f40e05cbe 
					 
					
						
						
							
							Silly mistake, forgot return :(  
						
						 
						
						
						
						
					 
					
						2005-05-04 10:44:11 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						c0e8a8d625 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-30 03:46:38 +03: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						f78e1d1c44 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-04-28 10:58:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						9969e1c5ea 
					 
					
						
						
							
							BUG#9911 After review fixes  
						
						 
						
						... 
						
						
						
						- Remove ha_archive::rename_table and move the fix to handler::rename_table 
						
						
					 
					
						2005-04-28 10:49:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						215be0264b 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-27 17:19:32 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						69b813a901 
					 
					
						
						
							
							mysqladmin extended-status now displays global status  
						
						 
						
						... 
						
						
						
						Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part 
						
						
					 
					
						2005-04-27 17:16:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						ce2c8126a2 
					 
					
						
						
							
							handler.cc:  
						
						 
						
						... 
						
						
						
						Fix compilation error if HAVE_REPLICATION is not defined 
						
						
					 
					
						2005-04-27 15:09:41 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						f12cd8c708 
					 
					
						
						
							
							Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into hundin.mysql.fi:/home/heikki/mysql-5.0 
						
						
					 
					
						2005-04-26 17:57:15 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gbichot@quadita2.mysql.com 
							
						 
					 
					
						
						
							
						
						b75789e3d8 
					 
					
						
						
							
							Fixes for BUG#10039 "MEMORY engine is reported as HEAP",  
						
						 
						
						... 
						
						
						
						BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs" 
						
						
					 
					
						2005-04-23 00:05:05 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						8d919770c7 
					 
					
						
						
							
							Fixed core dump with long timezone names  
						
						 
						
						... 
						
						
						
						Don't abort on bootstrap if a wrong --default-storage-engine is specified 
						
						
					 
					
						2005-04-16 03:40:33 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3ab03ccbb0 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-04-12 17:22:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d4a0becc8a 
					 
					
						
						
							
							FLUSH TABLES WITH READ LOCK should block writes to binlog too  
						
						 
						
						
						
						
					 
					
						2005-04-12 17:15:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						7a0e28feb5 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-04-07 20:19:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						12b6252145 
					 
					
						
						
							
							BUG#6762 ALTER TABLE gives weird results and error message  
						
						 
						
						... 
						
						
						
						- Removed hardcoded error message from 4.1 
						
						
					 
					
						2005-04-07 20:17:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						78332dcf78 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2005-04-06 20:20:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						42277bdd2f 
					 
					
						
						
							
							Per Heikki's request make trans_register_ha tolerant to multiple registrations  
						
						 
						
						
						
						
					 
					
						2005-04-05 18:42:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						a3e6b30a89 
					 
					
						
						
							
							handler.cc, ha_innodb.cc:  
						
						 
						
						... 
						
						
						
						Fix Bug #8650  : InnoDB does not rollback SQL statement at an error 
						
						
					 
					
						2005-04-05 17:56:40 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c796ea598c 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-04-05 13:23:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						810b2c3d40 
					 
					
						
						
							
							remove the rest of isam/merge references  
						
						 
						
						... 
						
						
						
						fix a race condition in TC_LOG_BINLOG::unlog 
						
						
					 
					
						2005-04-05 13:17:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						52770e8682 
					 
					
						
						
							
							XID SQL syntax  
						
						 
						
						... 
						
						
						
						minor cleanups
XA tests 
						
						
					 
					
						2005-04-04 00:50:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						fc1e7b07d6 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-5.0-trg3 
						
						
					 
					
						2005-04-03 17:02:13 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						332b7ed4a1 
					 
					
						
						
							
							Give warnings if wrong date/time/datetime argument for STR_TO_DATE  
						
						 
						
						... 
						
						
						
						Small fixes while doing review of new pushed code
More test cases for decimal 
						
						
					 
					
						2005-03-30 16:00:31 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						d4b20f4a86 
					 
					
						
						
							
							Fix for bugs  #5859  "DROP TABLE does not drop triggers" and  
						
						 
						
						... 
						
						
						
						#6559  "DROP DATABASE forgets to drop triggers".
If we drop table we should also drop all triggers associated with it.
To do this we have to check for existence of .TRG file when we are 
dropping table and delete it too. 
						
						
					 
					
						2005-03-27 16:15:21 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						7b81a9fd4c 
					 
					
						
						
							
							Merging support for blackhole up to 5.0.  
						
						 
						
						
						
						
					 
					
						2005-03-25 10:36:58 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d6bedfa8e0 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2005-03-23 09:42:24 +01:00