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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						48de1ff277 
					 
					
						
						
							
							Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system)  
						
						 
						
						
						
						
					 
					
						2005-04-05 01:19:48 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						04f8e164fb 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-04 16:45:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								patg@patrick.local 
							
						 
					 
					
						
						
							
						
						8e0eb65f9a 
					 
					
						
						
							
							5.0 to 5.1 merge  
						
						 
						
						
						
						
					 
					
						2005-04-01 12:32:17 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						201ee3eb78 
					 
					
						
						
							
							Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug  #5902 )  
						
						 
						
						... 
						
						
						
						CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912 )
ALTER TABLE now fails in STRICT mode if it generates warnings.
Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933 ) 
						
						
					 
					
						2005-04-01 15:04:50 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1659dacab1 
					 
					
						
						
							
							fixed mechanism of detection selection from table wich we update  
						
						 
						
						... 
						
						
						
						(BUG##9398, BUG#8703)
fixed wrong join view detection in multi-delete which lead to server crash 
						
						
					 
					
						2005-03-28 15:13:31 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						efb077502d 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-03-21 23:05:55 +01: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						3f8a66cbea 
					 
					
						
						
							
							Merged WL#2269 to mysql-5.0  
						
						 
						
						
						
						
					 
					
						2005-03-15 15:22:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						6a2ef5577c 
					 
					
						
						
							
							WL#926 "AVG(DISTINCT) and other distincts", part 2 (out of 3): clean up  
						
						 
						
						... 
						
						
						
						Item_sum_count_distinct, and
deploy Unique for use with COUNT(DISTINCT) if there is no blob
column in the list of DISTINCT arguments. 
						
						
					 
					
						2005-03-15 03:46:19 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						a95f09e228 
					 
					
						
						
							
							set_var.cc, mysqld.cc, ha_innodb.cc, sql_class.h:  
						
						 
						
						... 
						
						
						
						Add a settable session variable innodb_support_xa; setting it to 0 can save up to 10 % of CPU time and 150 bytes of space in each undo log
trx0trx.h, trx0undo.c, trx0trx.c, trx0roll.c:
  Enable XA if innodb_support_xa is not set to 0; make prepare to do log fsync's according to innodb_flush_log_at_trx_commit 
						
						
					 
					
						2005-03-13 12:49:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						c94952d1f0 
					 
					
						
						
							
							Removed unused variable  
						
						 
						
						
						
						
					 
					
						2005-03-10 10:43:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c49928447d 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-03-09 13:02:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1e09c15a8b 
					 
					
						
						
							
							don't close binlog in the destructor - use explictit MYSQL_LOG::cleanup for this  
						
						 
						
						
						
						
					 
					
						2005-03-09 12:29:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						26787260b7 
					 
					
						
						
							
							WL#2472: Refactoring of replication and binlog filtering.  
						
						 
						
						... 
						
						
						
						Needed to be able to have multiple masters connected 
to same slave server with different filters. 
						
						
					 
					
						2005-03-08 21:12:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						8db4423b8c 
					 
					
						
						
							
							Fixed Bug#8922.  
						
						 
						
						... 
						
						
						
						Reverted Jim's patch. 
						
						
					 
					
						2005-03-08 18:12:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						fd6e7c878e 
					 
					
						
						
							
							Re-enable IO cache mode that allows slow and query logs to go to a FIFO  
						
						 
						
						... 
						
						
						
						(lost in merge because the code to open these logs was moved to a different
file). 
						
						
					 
					
						2005-03-07 13:56:58 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						5b16dbf960 
					 
					
						
						
							
							Manual merge SP-locking improvements patch with current tree.  
						
						 
						
						
						
						
					 
					
						2005-03-04 17:46:45 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						5a6c7027f0 
					 
					
						
						
							
							Better approach for prelocking of tables for stored routines execution  
						
						 
						
						... 
						
						
						
						and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
  to be prelocked and doing implicit LOCK/UNLOCK any more.
  Instead we calculate this list at open_tables() and do implicit
  LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
  Also now we support cases when same table (with same alias) is
  used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
  LEX and does preparations before statement execution or complex
  expression evaluation to auxilary sp_lex_keeper class. Now 
  all statements in SP (and corresponding instructions) that
  evaluate expression which can contain subquery have their
  own LEX. 
						
						
					 
					
						2005-03-04 16:35:28 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						66bd0447e4 
					 
					
						
						
							
							Fix for bug#8740: Server crash at start on Solaris 9 (64 bit)  
						
						 
						
						
						
						
					 
					
						2005-03-03 17:38:58 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						02d88c398f 
					 
					
						
						
							
							bug#8151 - truncate leaves a transaction open  
						
						 
						
						... 
						
						
						
						deadlock in MYSQL_LOG::new_file()
style fixes 
						
						
					 
					
						2005-03-02 10:38:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						b9aa67bc76 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-02-26 16:15:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7e5f74f8f2 
					 
					
						
						
							
							Merge with global tree  
						
						 
						
						
						
						
					 
					
						2005-02-25 17:12:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cd78e701a5 
					 
					
						
						
							
							Show all generated warnings in SHOW ERROR  
						
						 
						
						... 
						
						
						
						Previously we only stored the first given error (the error sent to the client) 
						
						
					 
					
						2005-02-24 23:33:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						2952f73c16 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-02-24 06:24:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						07cdc9e334 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-02-23 20:08:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						9c9d1fd406 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-02-23 19:20:17 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						f3c0e35e9f 
					 
					
						
						
							
							Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 
						
						
					 
					
						2005-02-23 14:47:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						ebce51950a 
					 
					
						
						
							
							Fixed Bug#Server crash due to 'flush status' in various tests.  
						
						 
						
						
						
						
					 
					
						2005-02-23 14:19:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3e9bf3af34 
					 
					
						
						
							
							Fix for bug  #7217 : information_schema: columns are varbinary() instead of timestamp &  
						
						 
						
						... 
						
						
						
						bug #7215 : information_schema: columns are longtext instead of varchar 
						
						
					 
					
						2005-02-23 15:15:36 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1f3bff8824 
					 
					
						
						
							
							forget savepoints at the end of transaction  
						
						 
						
						
						
						
					 
					
						2005-02-22 21:57:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b43029f4eb 
					 
					
						
						
							
							bug#8646 - deadlock if long transaction causes binlog rotate  
						
						 
						
						
						
						
					 
					
						2005-02-22 00:15:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						b3d3f73753 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-21 16:13:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						dc338e5b5c 
					 
					
						
						
							
							workaround for sun compiler on sol9x86  
						
						 
						
						
						
						
					 
					
						2005-02-21 14:04:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1bc6ae8913 
					 
					
						
						
							
							portability fixes  
						
						 
						
						
						
						
					 
					
						2005-02-20 20:08:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						530eecbd99 
					 
					
						
						
							
							Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa 
						
						
					 
					
						2005-02-17 14:00:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						5ddb6354a5 
					 
					
						
						
							
							after merge fixes  
						
						 
						
						
						
						
					 
					
						2005-02-16 17:34:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						fdbcad3eaf 
					 
					
						
						
							
							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-15 12:06:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						fd828e5b4d 
					 
					
						
						
							
							manually merged  
						
						 
						
						
						
						
					 
					
						2005-02-14 21:50:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						919f2f2364 
					 
					
						
						
							
							Merge mysql.com:/home/psergey/mysql-4.1-bug8218  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-bug8218 
						
						
					 
					
						2005-02-14 23:47:31 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						c0c50efdef 
					 
					
						
						
							
							Fix for BUG#8218:  
						
						 
						
						... 
						
						
						
						Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
pointing to the wrong List. 
						
						
					 
					
						2005-02-12 22:58:54 +03: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ccb2f3381b 
					 
					
						
						
							
							Things missing in last changset  
						
						 
						
						... 
						
						
						
						After merge fixes
Don't give duplicate warnings for some ::store() functions 
						
						
					 
					
						2005-02-10 15:41:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						db13afd89d 
					 
					
						
						
							
							auto-ROLLBACK if binlog was not closed properly  
						
						 
						
						... 
						
						
						
						auto-commit on Xid_log_event 
						
						
					 
					
						2005-02-09 20:04:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						96558f6ad3 
					 
					
						
						
							
							Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-5.0.clean 
						
						
					 
					
						2005-02-09 02:54:08 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						b94a482ee9 
					 
					
						
						
							
							Precision Math implementation  
						
						 
						
						
						
						
					 
					
						2005-02-09 02:50:45 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						2c26ebe359 
					 
					
						
						
							
							WL#2130: Table locking for stored FUNCTIONs  
						
						 
						
						... 
						
						
						
						Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables. 
						
						
					 
					
						2005-02-08 20:52:50 +01:00