hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						d72a837029 
					 
					
						
						
							
							Merge deer.(none):/home/hf/work/mysql-4.1.clean  
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-5.0.clean 
						
						
					 
					
						2005-07-22 12:18:19 +05:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						62aad2bcd0 
					 
					
						
						
							
							merging  
						
						
						
						
					 
					
						2005-07-22 12:15:09 +05:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						ea81d5eaa3 
					 
					
						
						
							
							Fix for bug  #12042  (User breakpoints calling free() in embedded library)  
						
						
						
						
					 
					
						2005-07-21 17:17:46 +05:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						2c6616e3ff 
					 
					
						
						
							
							Many files:  
						
						... 
						
						
						
						More yaSSL changes in Visual Studio 6 project files 
						
						
					 
					
						2005-06-09 16:53:08 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						4d0a81aa8b 
					 
					
						
						
							
							config-win.h:  
						
						... 
						
						
						
						Enabled yaSSL on Windows
Many files:
  Added yaSSL to Visual Studio 6 project files 
						
						
					 
					
						2005-06-09 05:04:59 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						0005165fa0 
					 
					
						
						
							
							mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp:  
						
						... 
						
						
						
						Added /FD flag, to avoid include file warnings
mysqlclient.dsp:
  Removed duplicate entry for "strings/ctype-cp932.c"
  Added missing "mysys/my_access.c"
libmysqld.dsp:
  Added missing "mysys/charset.c"
libmysqld.def:
  Added symbol 'get_charset_name' 
						
						
					 
					
						2005-06-09 00:49:37 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						363fd14115 
					 
					
						
						
							
							default_modify.c:  
						
						... 
						
						
						
						Use MY_STAT to declare argument to my_fstat()
des_key_file.cc:
  Use local seach path for "mysql_priv.h"
mysys.dsp, libmysqld.dsp, libmysql.dsp:
  New file needed, "../mysys/default_modify.c" 
						
						
					 
					
						2005-05-21 23:23:39 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5f715b52d0 
					 
					
						
						
							
							Fix test_libmysqld link problem on Windows.  
						
						
						
						
					 
					
						2005-03-21 21:51:31 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						956682de1a 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2005-03-09 14:09:06 +01:00 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						e8e5cd5053 
					 
					
						
						
							
							Various fixes for Windows 2003 Platform SDK SP1 beta  
						
						
						
						
					 
					
						2005-03-07 13:04:05 +01:00 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						473f2f9409 
					 
					
						
						
							
							New Project files for Windows Ithanium 64-bit builds  
						
						
						
						
					 
					
						2005-03-06 14:22:28 +01:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						c3af8b202d 
					 
					
						
						
							
							libmysqld.dsp:  
						
						... 
						
						
						
						Corrected path to my_decimal.cpp 
						
						
					 
					
						2005-02-24 11:24:59 +01:00 
						 
				 
			
				
					
						
							
							
								georg@beethoven.site 
							
						 
					 
					
						
						
							
						
						26e3685b02 
					 
					
						
						
							
							Changes and fixes for windows compilation  
						
						
						
						
					 
					
						2005-02-18 15:17:17 +01:00 
						 
				 
			
				
					
						
							
							
								georg@beethoven.site 
							
						 
					 
					
						
						
							
						
						3b2bf2f512 
					 
					
						
						
							
							Fixes for windows compilation bugs  
						
						... 
						
						
						
						(After review of cs georg:1.1800 by Monty) 
						
						
					 
					
						2005-01-26 15:19:20 +01:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						196c95e938 
					 
					
						
						
							
							Merging conflicts resolved  
						
						
						
						
					 
					
						2005-01-11 21:00:53 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						eb723e0537 
					 
					
						
						
							
							Fix for bug  #6434  (bad memory deletion in app using libmysqld)  
						
						... 
						
						
						
						We should build libmysqld in SAFEMALLOC mode. 
						
						
					 
					
						2005-01-03 18:50:51 +04:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						40c5b91930 
					 
					
						
						
							
							- added sql_trigger.cpp to the mysqld and libmysqld project files  
						
						
						
						
					 
					
						2004-11-18 16:36:25 +01:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						35c8dc935d 
					 
					
						
						
							
							- Added sql/parse_file.cpp and sql/sql_view.cpp to the mysqld and  
						
						... 
						
						
						
						libmysqld project files 
						
						
					 
					
						2004-07-16 20:59:09 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1e31199995 
					 
					
						
						
							
							Merge with 4.1.3-beta  
						
						
						
						
					 
					
						2004-07-07 11:29:39 +03:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						28adaa438a 
					 
					
						
						
							
							Merge mysql.com:/space/my/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/space/my/mysql-4.1-build 
						
						
					 
					
						2004-06-24 19:30:34 +02:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						a30fcdc690 
					 
					
						
						
							
							Fix for Bug#4030 "Client side conversion string -> date type doesn't  
						
						... 
						
						
						
						work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
  MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added. 
						
						
					 
					
						2004-06-24 19:08:36 +04:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						1c88943129 
					 
					
						
						
							
							- Windows compile fix: added srv/srv0que.c to the innobase project  
						
						... 
						
						
						
						file and sql/tztime.cpp to the libmysqld project file 
						
						
					 
					
						2004-06-24 11:45:06 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						71eddc362e 
					 
					
						
						
							
							Merging 4.1 to 5.0.  
						
						
						
						
					 
					
						2004-05-26 17:04:45 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						390d9898f9 
					 
					
						
						
							
							merge with 4.0 to get Netware patches and fixes for libmysqld.dll  
						
						
						
						
					 
					
						2004-05-25 22:54:00 +03:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						640728a051 
					 
					
						
						
							
							Proposed fix for bug  #3818  (libmysqld.dll leads to program's crash)  
						
						... 
						
						
						
						configurations added to build the libraries with USE_TLS flag to be
used for libmysqld 
						
						
					 
					
						2004-05-26 00:27:00 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						4c23abc953 
					 
					
						
						
							
							Merge with 4.0 to get fixes for project files  
						
						
						
						
					 
					
						2004-05-25 16:01:37 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						050ec675db 
					 
					
						
						
							
							fixed typos  
						
						
						
						
					 
					
						2004-05-25 13:17:33 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0652547c77 
					 
					
						
						
							
							Fixed typo  
						
						
						
						
					 
					
						2004-05-25 02:49:43 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						af44187bff 
					 
					
						
						
							
							Merge with 4.0 to get fixes for Windows project files  
						
						
						
						
					 
					
						2004-05-25 02:47:25 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0babddff40 
					 
					
						
						
							
							New MYSQL_SERVER_SUFFIX usage (for easier compilation)  
						
						... 
						
						
						
						Update of VC++ project files. 
						
						
					 
					
						2004-05-25 02:28:44 +03: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 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						86a966256b 
					 
					
						
						
							
							Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'  
						
						... 
						
						
						
						Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables. 
						
						
					 
					
						2004-05-19 16:38:12 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						bf45960eef 
					 
					
						
						
							
							Merge 4.1 -> 5.0  
						
						
						
						
					 
					
						2004-05-07 18:52:06 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d21d49a32a 
					 
					
						
						
							
							Merge with 4.0.19  
						
						
						
						
					 
					
						2004-05-05 17:05:24 +03:00 
						 
				 
			
				
					
						
							
							
								greg@mysql.com 
							
						 
					 
					
						
						
							
						
						493c81d6e9 
					 
					
						
						
							
							Fixed compiler error in slave.cc on some platforms.  
						
						
						
						
					 
					
						2004-04-21 10:04:38 -01:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						dfd59e296e 
					 
					
						
						
							
							Merge 4.1 -> 5.0.  
						
						
						
						
					 
					
						2004-04-07 19:07:44 +02:00 
						 
				 
			
				
					
						
							
							
								Greg@greg-laptop. 
							
						 
					 
					
						
						
							
						
						59e8a77f6a 
					 
					
						
						
							
							Applied fixes to issues discovered during test builds on Windows.  
						
						
						
						
					 
					
						2004-02-27 17:27:07 +01:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						c8585f3283 
					 
					
						
						
							
							Merge 4.1 into 5.0.  
						
						
						
						
					 
					
						2004-02-10 18:44:02 +01:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						237d655e12 
					 
					
						
						
							
							Fix for  #2278  (mysql_prepare and mysql_execute not exported in libmysqld.dll)  
						
						... 
						
						
						
						Actually no PS-related methods were exported.
Now they're in the libmysqld.def 
						
						
					 
					
						2004-01-21 00:08:18 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						c6ed2a625b 
					 
					
						
						
							
							Update for VC++  
						
						... 
						
						
						
						(Fixed project files, compiler warnings etc..) 
						
						
					 
					
						2003-12-21 02:07:45 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d87494c5ac 
					 
					
						
						
							
							Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.  
						
						... 
						
						
						
						Updated project files for windows
Made rpl_change_master.test portable
Ensure that mutex are not freed if not initilized 
						
						
					 
					
						2003-11-22 03:21:40 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a444a3449f 
					 
					
						
						
							
							Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error  
						
						... 
						
						
						
						Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function. 
						
						
					 
					
						2003-11-03 14:01:59 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						77a70a0a24 
					 
					
						
						
							
							merge with 4.0.15  
						
						
						
						
					 
					
						2003-08-29 13:44:35 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f83e876065 
					 
					
						
						
							
							Update of VC++ project files (to remove link warnings)  
						
						... 
						
						
						
						Fix unlock error in myisamchk on windows when doing --sort-index
Use SetFilePointer instead of SetFilePointerEx 
						
						
					 
					
						2003-08-25 14:27:32 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						1bd306ccd4 
					 
					
						
						
							
							Fixed some new memory leaks  
						
						... 
						
						
						
						Updated VC++ files 
						
						
					 
					
						2003-06-24 12:10:35 +03:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						c14de0f584 
					 
					
						
						
							
							1. Portability fixups for Connector/ODBC 3.52 & DBD  
						
						... 
						
						
						
						(Addition of mysql_fetch_column & mysql_stmt_free_result)
 2. Windows build fixups for libmysqld, mysqlbinlog and mysqldemb 
						
						
					 
					
						2003-06-04 00:17:48 -07:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						99ceb8fd04 
					 
					
						
						
							
							Windows build fixups (Fix for slave_net_timeout)  
						
						
						
						
					 
					
						2003-06-03 22:57:42 -07:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						e8aa21c8d3 
					 
					
						
						
							
							LOAD DATA INFILE is not replicated if replicate_*_table is set  
						
						... 
						
						
						
						LOAD DATA LOCAL INFILE was not replicated correctly 
						
						
					 
					
						2003-02-28 22:24:00 +02:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						6974eb41b3 
					 
					
						
						
							
							Fix .dsp files to have all new changes to work with src disribution package script  
						
						
						
						
					 
					
						2003-02-20 14:16:57 -08:00