pem@mysql.telia.com 
							
						 
					 
					
						
						
							
						
						a8a29a39d2 
					 
					
						
						
							
							Merging 4.1 into 5.0 (second pass; post-merge fixes).  
						
						 
						
						... 
						
						
						
						One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-( 
						
						
					 
					
						2003-07-09 17:07:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.telia.com 
							
						 
					 
					
						
						
							
						
						9c3a7a6ba3 
					 
					
						
						
							
							Merge 4.1 into 5.0 (first pass).  
						
						 
						
						
						
						
					 
					
						2003-07-08 17:50:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						d33cb08eb6 
					 
					
						
						
							
							LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows.  
						
						 
						
						
						
						
					 
					
						2003-06-15 12:34:04 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dad0664579 
					 
					
						
						
							
							merge with public tree  
						
						 
						
						
						
						
					 
					
						2003-06-05 00:12:45 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						40109c574a 
					 
					
						
						
							
							Merge with 4.0.13  
						
						 
						
						
						
						
					 
					
						2003-06-04 19:21:51 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						27469ec8b9 
					 
					
						
						
							
							Windows build fixups with the latest source  
						
						 
						
						
						
						
					 
					
						2003-06-03 18:45:07 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						e436736d29 
					 
					
						
						
							
							ixed wrong unlock of tables (new bug)  
						
						 
						
						
						
						
					 
					
						2003-05-26 20:48:40 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						b8e5b65f88 
					 
					
						
						
							
							ha_innodb.cc:  
						
						 
						
						... 
						
						
						
						Remove accidenatlly committed debug printfs when query cache is used
sql_update.cc, sql_load.cc, sql_insert.cc, sql_delete.cc:
  For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated. 
						
						
					 
					
						2003-05-26 19:10:43 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						8a1e18f4cb 
					 
					
						
						
							
							Fix for bug  #490  and  #491  (see details below)  
						
						 
						
						
						
						
					 
					
						2003-05-24 16:43:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						cb7061ebe4 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-05-22 02:57:27 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6aa8929cf3 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						... 
						
						
						
						Added initialization of all important global variables 
						
						
					 
					
						2003-05-21 21:39:58 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						39cbb547d4 
					 
					
						
						
							
							Resolve merge colflict  
						
						 
						
						
						
						
					 
					
						2003-05-21 00:12:09 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						 
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						13530887cb 
					 
					
						
						
							
							Fix for UNION and LEFT JOIN (Bug  #386 )  
						
						 
						
						... 
						
						
						
						Fixed wrong logging of Access denied error (Bug #398 ) 
						
						
					 
					
						2003-05-13 18:58:26 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						afd581edd3 
					 
					
						
						
							
							made lex a pointer in THD  
						
						 
						
						
						
						
					 
					
						2003-05-05 14:54:37 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						784fb81426 
					 
					
						
						
							
							INSERT ... UPDATE ... VALUES()  
						
						 
						
						
						
						
					 
					
						2003-05-03 01:16:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						eb137c063c 
					 
					
						
						
							
							Support of warnings for all DML statements (Insert, Update and Alter)  
						
						 
						
						... 
						
						
						
						Fix LOAD DATA INFILE warnings to have a better meanigful messages
Fix to make the mysql command line to automatically show the warnings count for all basic commands 
						
						
					 
					
						2003-04-30 00:02:28 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd377bfba6 
					 
					
						
						
							
							Fixed problem when comparing a key for a multi-byte-character set. (bug 152)  
						
						 
						
						... 
						
						
						
						Use 0x.... as strings if 'new' mode. (bug 152)
Don't report -max on windows when InnoDB is enabled. (bug 332)
Reset current_linfo;  This could cause a hang when doing PURGE LOGS.
Fix for row numbers in EXPLAIN (bug 322)
 Fix that USE_FRM works for all table types (bug 97) 
						
						
					 
					
						2003-04-27 22:12:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						bf6cfd2948 
					 
					
						
						
							
							Fix for -fbranch-probabilites (bug 268)  
						
						 
						
						... 
						
						
						
						Fix for LEFT/RIGHT/MID with multi-byte-character sets (bug 314)
Fix for new bison 1.875
max_insert_delayed_threads and delayed_insert_timeout now works as documented (bug 211)
Don't show port in SHOW PROCESSLIST for system threads
Fix problem with ORDER BY being discarded for some DISTINCT queries (bug 275)
Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
using many joined tables (Bug 212) 
						
						
					 
					
						2003-04-26 20:43:28 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@laptop.sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ed1b48185a 
					 
					
						
						
							
							fixed incorrect number of affected rows in REPLACE...SELECT... (bug 130)  
						
						 
						
						
						
						
					 
					
						2003-04-26 15:53:27 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5d4e9f95f2 
					 
					
						
						
							
							Merging  
						
						 
						
						
						
						
					 
					
						2003-04-08 19:43:24 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						9df615b7b1 
					 
					
						
						
							
							Tiny optimisation for a (boolean || boolean) test, as SQL_LOG_BIN is set to 1 by default  
						
						 
						
						
						
						
					 
					
						2003-04-02 10:59:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						654410a3d3 
					 
					
						
						
							
							Deprecated the update log (Sprint task  #792 ). Now --log-update  
						
						 
						
						... 
						
						
						
						just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
is handled in two ways (see mysqld.cc for comments). 
						
						
					 
					
						2003-04-02 00:15:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						0ee0589e93 
					 
					
						
						
							
							Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into genie.(none):/home/hf/work/mysql-5.0.kil 
						
						
					 
					
						2003-03-31 13:42:37 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						f8f0b70380 
					 
					
						
						
							
							SCRUM  
						
						 
						
						... 
						
						
						
						two KILL commands implementation (version 2) 
						
						
					 
					
						2003-03-31 13:39:46 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a434bca704 
					 
					
						
						
							
							Merge with 4.0  
						
						 
						
						
						
						
					 
					
						2003-03-16 19:17:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						b879a40120 
					 
					
						
						
							
							Write binlog before commit when doing INSERT ... SELECT  
						
						 
						
						
						
						
					 
					
						2003-03-16 16:28:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d57c2019d1 
					 
					
						
						
							
							Proper fix for INSERT DELAYED and --max-delayed-threads  
						
						 
						
						
						
						
					 
					
						2003-03-12 08:08:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						c5aadd2821 
					 
					
						
						
							
							Made it possible to use --max-delayed-threads=0 in order to disable  
						
						 
						
						... 
						
						
						
						INSERT DELAYED. 
						
						
					 
					
						2003-03-09 19:03:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						6b40954a5e 
					 
					
						
						
							
							remove spaces according to coding rules  
						
						 
						
						
						
						
					 
					
						2003-03-06 22:53:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						0a8f3e19a5 
					 
					
						
						
							
							Fix so that INSERT DELAYED cares about SQL_LOG_BIN=0 (bug  #104 )  
						
						 
						
						
						
						
					 
					
						2003-03-06 22:46:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						050543bdfc 
					 
					
						
						
							
							Merge with 3.23 -> 4.0  
						
						 
						
						
						
						
					 
					
						2003-02-28 13:29:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a0d2a621ed 
					 
					
						
						
							
							Added detection if pthread_attr_getstacksize() exists  
						
						 
						
						... 
						
						
						
						Fixed bug in RAND() usage in mysqlbinlog 
						
						
					 
					
						2003-02-27 17:35:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						023d6dd39b 
					 
					
						
						
							
							Merge with 4.0.11  
						
						 
						
						
						
						
					 
					
						2003-02-04 21:52:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						62902a3b4b 
					 
					
						
						
							
							after-review changes (577 SCRUM)  
						
						 
						
						
						
						
					 
					
						2003-02-02 23:30:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						e294751c41 
					 
					
						
						
							
							fixed bug in determinating uncacheable queries  
						
						 
						
						... 
						
						
						
						new fatal_error interface to assign is_fatal_error and ne.report_error
commant about Item_row 
						
						
					 
					
						2003-01-30 22:15:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						689578a099 
					 
					
						
						
							
							Fixes for Netware  
						
						 
						
						... 
						
						
						
						Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL 
						
						
					 
					
						2003-01-28 08:38:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						44d8a8cdab 
					 
					
						
						
							
							merging  
						
						 
						
						
						
						
					 
					
						2003-01-25 13:19:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d56e23f64e 
					 
					
						
						
							
							fixed subselects with temporary tables (SCRUM)  
						
						 
						
						... 
						
						
						
						fixed memory leacks 
						
						
					 
					
						2003-01-25 02:25:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						07daf3169e 
					 
					
						
						
							
							Merge with 4.0.8  
						
						 
						
						
						
						
					 
					
						2003-01-03 00:04:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						9c509fcb52 
					 
					
						
						
							
							Transactions in AUTOCOMMIT=0 mode didn't rotate binary log  
						
						 
						
						... 
						
						
						
						Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT rows (100) 
						
						
					 
					
						2002-12-14 12:45:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						b42eff16cb 
					 
					
						
						
							
							bulk insert code optimized  
						
						 
						
						
						
						
					 
					
						2002-12-07 22:40:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f1d35b29bc 
					 
					
						
						
							
							merge fix  
						
						 
						
						
						
						
					 
					
						2002-12-06 21:15:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						859b688476 
					 
					
						
						
							
							Merge with 4.0.6  
						
						 
						
						
						
						
					 
					
						2002-12-05 19:38:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						91bd1e4cc5 
					 
					
						
						
							
							fixed error message  
						
						 
						
						
						
						
					 
					
						2002-12-04 01:32:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						e54134fde7 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2002-12-02 20:41:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						2320923a7b 
					 
					
						
						
							
							INSERT ... ON DUPLICATE KEY UPDATE ...  
						
						 
						
						
						
						
					 
					
						2002-12-02 20:38:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c6b48c6f26 
					 
					
						
						
							
							fix of error handling  
						
						 
						
						
						
						
					 
					
						2002-12-01 00:11:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9da705ef2f 
					 
					
						
						
							
							check of using same table for changing and select  
						
						 
						
						
						
						
					 
					
						2002-11-30 19:26:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6603d75213 
					 
					
						
						
							
							New multi-table-update code  
						
						 
						
						... 
						
						
						
						New (simpler) internal timestamp handling.
More debuging to heap tables.
Small cleanups to multi-table-delete
false -> 0 and true -> 1  (We should use TRUE and FALSE) 
						
						
					 
					
						2002-11-29 16:40:18 +02:00