pem@mysql.com 
							
						 
					 
					
						
						
							
						
						71eddc362e 
					 
					
						
						
							
							Merging 4.1 to 5.0.  
						
						
						
						
					 
					
						2004-05-26 17:04:45 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						56c0258536 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Remove compiler warnings
Update windows project files 
						
						
					 
					
						2004-05-24 14:42:34 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a4b0ec1ede 
					 
					
						
						
							
							Merge with 4.0, mainly to get changes to windows project files  
						
						
						
						
					 
					
						2004-05-20 00:54:52 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						e13e9288c9 
					 
					
						
						
							
							Fix for Bug#3754 "SET GLOBAL myisam_max_sort_file_size doesn't  
						
						... 
						
						
						
						work as expected": precision-losing conversion removed from 
sys_var_thd_ulonglong. 
						
						
					 
					
						2004-05-19 16:42:29 +04:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						ec92106535 
					 
					
						
						
							
							Post-merge fixes.  
						
						... 
						
						
						
						Note: One sp.test still fails (prime), and rpl_server_id2.test fails (will be fixed by guilhem ASAP). 
						
						
					 
					
						2004-05-14 16:00:57 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4c774e0c18 
					 
					
						
						
							
							fixed flags of printed query  
						
						
						
						
					 
					
						2004-05-13 23:47:20 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						d42b145817 
					 
					
						
						
							
							Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc  
						
						... 
						
						
						
						merged manually by guilhem. 
						
						
					 
					
						2004-04-28 12:08:54 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						dfd59e296e 
					 
					
						
						
							
							Merge 4.1 -> 5.0.  
						
						
						
						
					 
					
						2004-04-07 19:07:44 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						928e796e67 
					 
					
						
						
							
							Better error messages for not nullable  
						
						... 
						
						
						
						SET character_set_xxx=NULL
and
SET collation_xxx=NULL 
						
						
					 
					
						2004-03-29 18:33:24 +05:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						6395822932 
					 
					
						
						
							
							Fixed BUG#3117: LAST_INSERT_ID() works incorrectly inside stored procedure.  
						
						... 
						
						
						
						This turned out to be a problem for prepared statements as well; the id was
evaluated once, at parse time. 
						
						
					 
					
						2004-03-25 17:42:13 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						61a365e696 
					 
					
						
						
							
							more sys_var_str fixes  
						
						
						
						
					 
					
						2004-03-20 17:08:01 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						581996393a 
					 
					
						
						
							
							select @@smth=@@sys_str_var crash fixed  
						
						
						
						
					 
					
						2004-03-20 14:36:00 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						ceec63f18a 
					 
					
						
						
							
							EOVERFLOW moved to my_base.h - it is used not only in strtod.c  
						
						... 
						
						
						
						error message corrected 
						
						
					 
					
						2004-03-16 16:35:47 +01:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8ba33d7dd3 
					 
					
						
						
							
							Fix for bug#2586 Disallow global/session/local as structured var. instance names  
						
						
						
						
					 
					
						2004-03-16 14:01:05 +04:00 
						 
				 
			
				
					
						
							
							
								paul@ice.local 
							
						 
					 
					
						
						
							
						
						09113817d2 
					 
					
						
						
							
							SESSION instead of LOCAL in error messages.  
						
						
						
						
					 
					
						2004-03-07 08:32:00 -06:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f43093ec0e 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t) 
						
						
					 
					
						2004-02-16 10:03:25 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						f9e73c7716 
					 
					
						
						
							
							Post-merge fixes.  
						
						
						
						
					 
					
						2004-02-11 18:21:55 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ce14578909 
					 
					
						
						
							
							Merge with 4.0.18  
						
						
						
						
					 
					
						2004-02-11 00:06:46 +01:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						7b13840a46 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2003-12-18 17:51:43 +01:00 
						 
				 
			
				
					
						
							
							
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						2b53eef5f0 
					 
					
						
						
							
							WorkLog  #1323  (part 2)  
						
						... 
						
						
						
						New Statement: SHOW [STORAGE] ENGINES
New System Variable: storage_engine
New mysqld Argument: --default-storage-engine= 
						
						
					 
					
						2003-12-17 22:52:03 +00:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						d49ff0fd62 
					 
					
						
						
							
							added error message for receiving variable with wrong GLOBAL|LOCAL type  
						
						... 
						
						
						
						(bug #2086 ) 
						
						
					 
					
						2003-12-17 16:37:47 -04:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						bb51272bd1 
					 
					
						
						
							
							Post-merge fixes.  
						
						... 
						
						
						
						Multiple result sets from stored procedures now works with the
mysql and mysqltest clients. 
						
						
					 
					
						2003-12-16 18:09:22 +01:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						cbdc0b4c3a 
					 
					
						
						
							
							Post-merge fixes.  
						
						
						
						
					 
					
						2003-12-05 14:45:48 +01:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						63f4858030 
					 
					
						
						
							
							Merged 4.1 -> 5.0  
						
						
						
						
					 
					
						2003-12-05 13:11:50 +01:00 
						 
				 
			
				
					
						
							
							
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						afc619f0a2 
					 
					
						
						
							
							WorkLog#1280 - Remove fixed table handler from lex/yacc  
						
						
						
						
					 
					
						2003-12-02 20:23:13 +00:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						3ed561d3cf 
					 
					
						
						
							
							Post-merge fixes.  
						
						
						
						
					 
					
						2003-12-01 18:24:09 +01:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						e3e4836f30 
					 
					
						
						
							
							warning number changed  
						
						
						
						
					 
					
						2003-11-21 20:52:18 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						28a2c6a96b 
					 
					
						
						
							
							Merging 4.1->5.0.  
						
						
						
						
					 
					
						2003-11-19 15:19:46 +01:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						33346e26af 
					 
					
						
						
							
							added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()  
						
						... 
						
						
						
						added string length for more speed
made code covarage for print() method of Item
fixed printability of some items (SCRUM) (WL#1274) 
						
						
					 
					
						2003-10-30 12:57:26 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						f349adf8de 
					 
					
						
						
							
							support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned  
						
						... 
						
						
						
						(BUG#1484) 
						
						
					 
					
						2003-10-24 17:28:32 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						692609537d 
					 
					
						
						
							
							Post-merge fixes.  
						
						
						
						
					 
					
						2003-10-23 16:06:51 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						337238b78a 
					 
					
						
						
							
							Merging 4.1->5.0  
						
						
						
						
					 
					
						2003-10-22 16:10:22 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						9ef2a83fbe 
					 
					
						
						
							
							Portability fixes for windows  
						
						... 
						
						
						
						After merge fixes 
						
						
					 
					
						2003-10-15 22:40:36 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						e71b53a8fe 
					 
					
						
						
							
							merge with 4.0 to get fix for SET enum_system_variable=NULL  
						
						
						
						
					 
					
						2003-10-14 16:34:09 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2d3840f550 
					 
					
						
						
							
							Fixed bug in SET enum_system_variable=NULL  
						
						
						
						
					 
					
						2003-10-14 16:30:42 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						461d1627b3 
					 
					
						
						
							
							merge with 4.0 for more memory allocation variables.  
						
						
						
						
					 
					
						2003-10-13 15:50:30 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c95d142f8f 
					 
					
						
						
							
							Add new user variables for tuning memory usage:  
						
						... 
						
						
						
						query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization 
						
						
					 
					
						2003-10-11 22:00:24 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.telia.com 
							
						 
					 
					
						
						
							
						
						6e55a3428a 
					 
					
						
						
							
							Post-merge fixes.  
						
						
						
						
					 
					
						2003-09-24 15:26:20 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.telia.com 
							
						 
					 
					
						
						
							
						
						08e5a7e135 
					 
					
						
						
							
							Post-merge fixes.  
						
						
						
						
					 
					
						2003-08-26 17:41:40 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						7f158dd12a 
					 
					
						
						
							
							Merge 4.1 into 5.0  
						
						
						
						
					 
					
						2003-08-26 11:51:09 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c2a7768b56 
					 
					
						
						
							
							A new separate error message: Unknown collation 'blablabla'  
						
						
						
						
					 
					
						2003-07-29 17:12:14 +05:00 
						 
				 
			
				
					
						
							
							
								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@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						ebcc7b5a4f 
					 
					
						
						
							
							Support for variables with components  
						
						... 
						
						
						
						Added framework to create/drop and manager buffers for multiple key caches 
						
						
					 
					
						2003-07-06 19:09:57 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						23145cfed7 
					 
					
						
						
							
							Added SQLSTATE to client/server protocol  
						
						... 
						
						
						
						bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86 
						
						
					 
					
						2003-06-04 18:28:51 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						cb7061ebe4 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-05-22 02:57:27 +03:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8d52377a5c 
					 
					
						
						
							
							Some SHOW VARIABLES have been renamed:  
						
						... 
						
						
						
						collation_client  -> character_set_client
collation_results -> character_set_results
character_set     -> character_set_server
SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion 
						
						
					 
					
						2003-05-21 17:44:12 +05:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a46c0a7cac 
					 
					
						
						
							
							Portability fix for 64 bit machines  
						
						
						
						
					 
					
						2003-05-14 23:06:06 +03:00 
						 
				 
			
				
					
						
							
							
								jani@hynda.(none) 
							
						 
					 
					
						
						
							
						
						c9c5841760 
					 
					
						
						
							
							- Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342  
						
						... 
						
						
						
						- Fix for QNX: UNIX sockets available since 6.2.1 
						
						
					 
					
						2003-05-13 19:34:51 +03:00