monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7436e9ec97 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2003-01-21 21:28:51 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						25c393a12e 
					 
					
						
						
							
							Portability fixes (for windows)  
						
						... 
						
						
						
						Some changes to the prepared statement protocol to make it easier to use and faster. 
						
						
					 
					
						2003-01-21 21:07:59 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4fa14086ad 
					 
					
						
						
							
							fix removation  
						
						
						
						
					 
					
						2003-01-21 15:54:14 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						389680e04e 
					 
					
						
						
							
							Conflicts resolving  
						
						
						
						
					 
					
						2003-01-20 18:59:45 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						1f6b615677 
					 
					
						
						
							
							SCRUM  
						
						... 
						
						
						
						embedded-related changes 
						
						
					 
					
						2003-01-20 18:47:25 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						8acc22296c 
					 
					
						
						
							
							Change client_flag to unsigned long (16 -> 32 bits) to handle more options.  
						
						... 
						
						
						
						Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows 
						
						
					 
					
						2003-01-18 16:39:21 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						76f146a175 
					 
					
						
						
							
							Merge with 4.0.9  
						
						
						
						
					 
					
						2003-01-18 03:13:37 +02:00 
						 
				 
			
				
					
						
							
							
								miguel@hegel.local 
							
						 
					 
					
						
						
							
						
						e2548b3fa5 
					 
					
						
						
							
							Fix VC++ error compiler  
						
						
						
						
					 
					
						2003-01-16 22:29:24 -04:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4f9d82700d 
					 
					
						
						
							
							strnto family functions now return error in a new argument  
						
						
						
						
					 
					
						2003-01-16 17:17:07 +04:00 
						 
				 
			
				
					
						
							
							
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						94cc7d751e 
					 
					
						
						
							
							Added support sql_mode, which can be used to produce various outputs  
						
						... 
						
						
						
						of SHOW CREATE TABLE 'name'. Depending on the mode, the output can
be compatible with various databases, including earlier versions of
MySQL
. 
						
						
					 
					
						2003-01-16 02:04:50 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						96089e2b3a 
					 
					
						
						
							
							resolving conflicts  
						
						
						
						
					 
					
						2003-01-15 13:15:35 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c59bff7c96 
					 
					
						
						
							
							SCRUM  
						
						... 
						
						
						
						embedded library trimming 
						
						
					 
					
						2003-01-15 12:11:44 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7e9b27eaf5 
					 
					
						
						
							
							Updates for multi-byte character sets  
						
						... 
						
						
						
						(Note: test 'union' fails, but Sanja promised to fix this) 
						
						
					 
					
						2003-01-14 14:28:36 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f8e660d88c 
					 
					
						
						
							
							merge with 4.0.9  
						
						... 
						
						
						
						To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys 
						
						
					 
					
						2003-01-09 03:55:26 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						ee59eb2418 
					 
					
						
						
							
							Portability fixes  
						
						... 
						
						
						
						Fixed test suite for HPUX 10.20 and MacOSX 
						
						
					 
					
						2003-01-07 16:53:10 +02:00 
						 
				 
			
				
					
						
							
							
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						b1b47e93b1 
					 
					
						
						
							
							buf0buf.c, buf0buf.ic, buf0buf.h:  
						
						... 
						
						
						
						Reduce memory usage of the buffer headers
Many files:
  Merge InnoDB-4.1 with AWE support 
						
						
					 
					
						2003-01-06 22:07:25 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6be1b941bc 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-01-06 02:46:36 +02:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						e4b9df7ba5 
					 
					
						
						
							
							Fix bug with shared memory's variables  
						
						
						
						
					 
					
						2003-01-04 20:33:17 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f9772317ee 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-01-04 15:40:55 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						07daf3169e 
					 
					
						
						
							
							Merge with 4.0.8  
						
						
						
						
					 
					
						2003-01-03 00:04:33 +02:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						3904f03786 
					 
					
						
						
							
							Fixed duplicate of handle_count in __NT__ section  
						
						
						
						
					 
					
						2002-12-31 17:01:53 +05:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						6ab60981e8 
					 
					
						
						
							
							Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1  
						
						... 
						
						
						
						into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1 
						
						
					 
					
						2002-12-30 01:59:08 +04:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						1dcca480e8 
					 
					
						
						
							
							processing thread specific queries  
						
						
						
						
					 
					
						2002-12-30 01:46:48 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c729c0ea05 
					 
					
						
						
							
							Safety fix to not allow one to specify too big max_alloc_packet to mysqld  
						
						... 
						
						
						
						Safety fix to not cause conflicts with extended packages in 4.0. 
						
						
					 
					
						2002-12-26 17:50:07 +02:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						78e0a8497b 
					 
					
						
						
							
							removed chroot() bugfix, now --chroot in 3.23 is broken again :((  
						
						
						
						
					 
					
						2002-12-20 18:39:53 +01:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						cb619f3a11 
					 
					
						
						
							
							less default_charset_info  
						
						
						
						
					 
					
						2002-12-20 17:57:24 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						b5aa9ae0c7 
					 
					
						
						
							
							Changed thd variables max_join_size and select_limit to type ha_rows.  
						
						... 
						
						
						
						This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug 
						
						
					 
					
						2002-12-20 14:58:27 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c1e69d2cca 
					 
					
						
						
							
							Merging  
						
						
						
						
					 
					
						2002-12-16 18:58:55 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e3b3b68307 
					 
					
						
						
							
							Big purge about embedded library (scrum)  
						
						
						
						
					 
					
						2002-12-16 17:33:29 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d783e18436 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2002-12-14 17:49:01 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d49167bae5 
					 
					
						
						
							
							Fixes for binary protocol (complement to last push)  
						
						... 
						
						
						
						Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run 
						
						
					 
					
						2002-12-14 17:43:01 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						15b870d6c9 
					 
					
						
						
							
							Merge with 3.23 to get patch for lower_case_table_names for MacOSX  
						
						
						
						
					 
					
						2002-12-14 12:49:55 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						00e005cbdb 
					 
					
						
						
							
							Make --lower-case-table-names default on MacOSX  
						
						
						
						
					 
					
						2002-12-14 12:25:33 +02:00 
						 
				 
			
				
					
						
							
							
								miguel@hegel.br 
							
						 
					 
					
						
						
							
						
						558ee89e7a 
					 
					
						
						
							
							Remove variables redefined and variable shutdown_event_name fix  
						
						
						
						
					 
					
						2002-12-13 05:18:22 -04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						62dfd57475 
					 
					
						
						
							
							Removed compiler warnings  
						
						... 
						
						
						
						Fixed wrong variable name for Windows 
						
						
					 
					
						2002-12-12 21:01:32 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3517febe97 
					 
					
						
						
							
							Resolving merge conflicts  
						
						
						
						
					 
					
						2002-12-12 12:49:56 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						dcb5293576 
					 
					
						
						
							
							Some fixes  
						
						
						
						
					 
					
						2002-12-12 12:16:34 +04:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						b4fcdaa276 
					 
					
						
						
							
							Preparation to charset dependant test_if_int and test_if_real  
						
						
						
						
					 
					
						2002-12-11 17:42:48 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						146814f2ea 
					 
					
						
						
							
							Merge with 3.23  
						
						
						
						
					 
					
						2002-12-11 13:32:31 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						53ac261312 
					 
					
						
						
							
							Added back -max to server name if we are using InnoDB.  
						
						
						
						
					 
					
						2002-12-11 12:59:55 +02:00 
						 
				 
			
				
					
						
							
							
								miguel@hegel.br 
							
						 
					 
					
						
						
							
						
						c5e18e6ad2 
					 
					
						
						
							
							Update Windows binaries prefix according MySQL Pro release package  
						
						
						
						
					 
					
						2002-12-10 04:17:31 -04: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 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7d681c4449 
					 
					
						
						
							
							Copy arguments given to mysql_server_init()  
						
						... 
						
						
						
						Made keybuff_size longlong (To make show variables work similar on 32
and 64 bit systems)
Fixed some 'not initalized variable errors' in multi-table-update.
Fixed memory leak in multi-table-update.
Now all tests works under valgrind without any errors. 
						
						
					 
					
						2002-12-05 16:38:49 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						fc06433a69 
					 
					
						
						
							
							Removed copying of parameters as this leads to memory leaks in embedded server.  
						
						... 
						
						
						
						Fixed 'not initialized' memory error. 
						
						
					 
					
						2002-12-05 03:40:33 +02:00 
						 
				 
			
				
					
						
							
							
								peter@mysql.com 
							
						 
					 
					
						
						
							
						
						1d920529a8 
					 
					
						
						
							
							SCRAM Remove spaces from most changed files.  
						
						... 
						
						
						
						This alters not only my code so it looks like I'm not only one adding the spaces. 
						
						
					 
					
						2002-12-05 01:14:51 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						6dfd1d867e 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2002-12-04 10:16:19 +01:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						9b331dc354 
					 
					
						
						
							
							Proper fix for SHOW VARS on 64-bit systems  
						
						
						
						
					 
					
						2002-12-02 15:33:16 +02:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						ce56f927fa 
					 
					
						
						
							
							Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0  
						
						
						
						
					 
					
						2002-12-01 00:48:36 +02:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						f1b806cfd1 
					 
					
						
						
							
							Fixed --datadir for embedded server  
						
						
						
						
					 
					
						2002-12-01 00:02:58 +02:00