gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3d61d2d973 
					 
					
						
						
							
							Conflicts relsolving  
						
						
						
						
					 
					
						2003-03-11 16:32:17 +04:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e7f4bf5b27 
					 
					
						
						
							
							Added 'PURGE LOGS BEFORE' command  
						
						... 
						
						
						
						Added expire-logs-days option 
						
						
					 
					
						2003-03-11 13:49:06 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						ced6463686 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mashka.mysql.fi:/home/my/mysql-4.1 
						
						
					 
					
						2003-03-11 00:39:55 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2d09c5bf9c 
					 
					
						
						
							
							Portability fixes  
						
						
						
						
					 
					
						2003-03-11 00:30:35 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						2c849470e0 
					 
					
						
						
							
							- typo fix for newly added error message  
						
						
						
						
					 
					
						2003-03-10 13:41:37 +01:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						fae2711297 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-03-10 14:13:46 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						6977704d2b 
					 
					
						
						
							
							after merge fixes  
						
						
						
						
					 
					
						2003-03-10 13:54:20 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f1635f64f9 
					 
					
						
						
							
							Merge with 3.23 to get fixes for --user and BACKUP TABLE  
						
						
						
						
					 
					
						2003-03-10 12:48:43 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						c231b747e3 
					 
					
						
						
							
							Don't allow multiple --user options to mysqld  
						
						... 
						
						
						
						(First one is used) 
						
						
					 
					
						2003-03-10 12:24:22 +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 
						 
				 
			
				
					
						
							
							
								wax@kishkin.ru 
							
						 
					 
					
						
						
							
						
						b6a117fb2c 
					 
					
						
						
							
							Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4nh  
						
						
						
						
					 
					
						2003-03-07 03:44:15 +05:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						6897b00216 
					 
					
						
						
							
							--new option and local variable to optionally turn on  
						
						... 
						
						
						
						"very new functions" - for now 4.1-compatible TIMESTAMT format 
						
						
					 
					
						2003-03-05 18:43:56 +01:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						9034ed296b 
					 
					
						
						
							
							A better, but larger fix for server_id bug ..  
						
						
						
						
					 
					
						2003-03-05 15:34:58 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						4d83bdef2a 
					 
					
						
						
							
							Fix for SHOW VARIABLES on 64-bit platforms  
						
						
						
						
					 
					
						2003-03-04 18:23:15 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						d0d071dca9 
					 
					
						
						
							
							Fix for using unitialized mutex when running version compiled with --debug  
						
						
						
						
					 
					
						2003-03-04 15:02:49 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						2a7dfa172c 
					 
					
						
						
							
							Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped  
						
						
						
						
					 
					
						2003-03-04 12:22:35 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						b2f27a155c 
					 
					
						
						
							
							made variable query_cache_min_res_unit from QUERY_CACHE_MIN_RESULT_DATA_SIZE (SCRUM)  
						
						
						
						
					 
					
						2003-03-02 21:39:03 +02:00 
						 
				 
			
				
					
						
							
							
								wax@kishkin.ru 
							
						 
					 
					
						
						
							
						
						15e69055a1 
					 
					
						
						
							
							URGENT fixed bug in shared memory (handler_count)  
						
						
						
						
					 
					
						2003-03-02 19:35:37 +05: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 
						 
				 
			
				
					
						
							
							
								greg@mysql.com 
							
						 
					 
					
						
						
							
						
						de427e5234 
					 
					
						
						
							
							Minor changes from 4.0->4.1 by Novell (Rob Lyon)  
						
						
						
						
					 
					
						2003-02-26 13:43:54 -05:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						9a46698e1e 
					 
					
						
						
							
							Merge with 4.0.11  
						
						
						
						
					 
					
						2003-02-26 01:03:47 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						b4fbb06ad8 
					 
					
						
						
							
							Portability fix for HPUX10.20  
						
						
						
						
					 
					
						2003-02-25 21:43:24 +02:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						dd7ecee561 
					 
					
						
						
							
							Merge vkishkin@work.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/wax/mysql-4n 
						
						
					 
					
						2003-02-24 23:54:58 +05:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						ee2b888696 
					 
					
						
						
							
							Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM  
						
						
						
						
					 
					
						2003-02-20 14:14:37 -08:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						45ada60304 
					 
					
						
						
							
							add option default-week-format and variable default_week_format  
						
						... 
						
						
						
						(SCRUM) 
						
						
					 
					
						2003-02-19 17:05:35 +05:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						aadf481f49 
					 
					
						
						
							
							Made it work with bison 1.875. They've changed the "parse error" string into  
						
						... 
						
						
						
						"syntax error". 
						
						
					 
					
						2003-02-18 11:58:19 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						90bf074438 
					 
					
						
						
							
							Merge with 4.0.11 tree to get latest bug fixes  
						
						
						
						
					 
					
						2003-02-17 05:43:37 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6051b2f998 
					 
					
						
						
							
							Fixed multi-table-delete for InnoDB tables  
						
						... 
						
						
						
						Novell patches 
						
						
					 
					
						2003-02-17 02:14:37 +02:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						2022b7b68f 
					 
					
						
						
							
							SCRUM: 'Replication: PURGE LOGS with date' task  
						
						... 
						
						
						
						Added:
PURGE [MASTER] LOGS BEFORE date/date_expression
expire-logs-days option
  With this option old files are deleted when
      - mysqld is started
      - log is rotated
      - someone does FLUSH LOGS 
						
						
					 
					
						2003-02-16 20:39:12 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7abe5e234e 
					 
					
						
						
							
							merge with 4.0.11 to get fix for thread stack  
						
						
						
						
					 
					
						2003-02-08 01:58:58 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						025dde7867 
					 
					
						
						
							
							Check how much stack we got;  Needed to be able to run crash-me  
						
						
						
						
					 
					
						2003-02-08 01:55:16 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						25de9c19b2 
					 
					
						
						
							
							After merge fixes & remove compiler warnings  
						
						... 
						
						
						
						Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files 
						
						
					 
					
						2003-02-07 15:47:24 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						023d6dd39b 
					 
					
						
						
							
							Merge with 4.0.11  
						
						
						
						
					 
					
						2003-02-04 21:52:14 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						aee15a4407 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-02-04 03:27:47 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						303c3e30ab 
					 
					
						
						
							
							Added charset number to result header  
						
						
						
						
					 
					
						2003-02-04 03:19:19 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						a9ee051a4d 
					 
					
						
						
							
							Fixed core dump bug in 'mysql' when using \p in prompt on Windows.  
						
						... 
						
						
						
						Fixed error when mysql_unix_port pointed to const string (not uncommon on windows) 
						
						
					 
					
						2003-02-02 05:13:09 +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 
							
						 
					 
					
						
						
							
						
						b025fa8b32 
					 
					
						
						
							
							Fixed compilation error on windows  
						
						
						
						
					 
					
						2003-01-29 19:10:33 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d88eb71f34 
					 
					
						
						
							
							Fixed handling of lower_case_table_names in SHOW TABLE STATUS, mysql_list_fields() and mysql_table_dump().  
						
						... 
						
						
						
						This fixes some Errcode 13 errors on Windows when deleting tables. 
						
						
					 
					
						2003-01-29 18:56:34 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						735399a850 
					 
					
						
						
							
							Move latin1 into a separarte file  
						
						
						
						
					 
					
						2003-01-29 17:31:20 +04:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						08129eea2b 
					 
					
						
						
							
							Reorganization to restore generating charset C files from conf files  
						
						
						
						
					 
					
						2003-01-29 15:08:09 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						3d28913740 
					 
					
						
						
							
							Only write to the error log if --log-error is specified and --console is not specified  
						
						... 
						
						
						
						(On Windows --log-error is enabled by default) 
						
						
					 
					
						2003-01-28 20:56:35 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6b71279382 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-01-28 09:02:51 +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 
						 
				 
			
				
					
						
							
							
								Administrador@light. 
							
						 
					 
					
						
						
							
						
						826993bba2 
					 
					
						
						
							
							Added option hostname.err  
						
						
						
						
					 
					
						2003-01-27 15:37:25 -02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						1bdd1d0626 
					 
					
						
						
							
							Merge with 3.23.55  
						
						
						
						
					 
					
						2003-01-25 15:31:07 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						9af5e6b70a 
					 
					
						
						
							
							Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements)  
						
						
						
						
					 
					
						2003-01-23 21:49:28 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						a90a0cc966 
					 
					
						
						
							
							small fix for SHOW STATUS  
						
						
						
						
					 
					
						2003-01-23 15:49:56 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						274df58118 
					 
					
						
						
							
							--ft_stopword_file command-line option  
						
						
						
						
					 
					
						2003-01-23 13:20:37 +01:00