knielsen@mysql.com 
							
						 
					 
					
						
						
							
						
						56d44ff1f9 
					 
					
						
						
							
							Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes  
						
						 
						
						... 
						
						
						
						into  mysql.com:/usr/local/mysql/x/mysql-5.1-new 
						
						
					 
					
						2006-01-30 17:57:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								knielsen@mysql.com 
							
						 
					 
					
						
						
							
						
						bfe989671f 
					 
					
						
						
							
							Merge mysql.com:/usr/local/mysql/mysql-5.0-merge  
						
						 
						
						... 
						
						
						
						into  mysql.com:/usr/local/mysql/mysql-5.1-merge 
						
						
					 
					
						2006-01-30 15:05:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								knielsen@mysql.com 
							
						 
					 
					
						
						
							
						
						899fc2653d 
					 
					
						
						
							
							Windows compile fixes in preparation for 5.1.6 beta.  
						
						 
						
						
						
						
					 
					
						2006-01-30 13:09:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								knielsen@mysql.com 
							
						 
					 
					
						
						
							
						
						e5598d2fad 
					 
					
						
						
							
							Windows Visual Studio 2003 fixes.  
						
						 
						
						
						
						
					 
					
						2006-01-16 09:56:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								knielsen@mysql.com 
							
						 
					 
					
						
						
							
						
						12cb3f4c5e 
					 
					
						
						
							
							Windows/Visual Studio 2003 fixes for the 5.1.5 release.  
						
						 
						
						
						
						
					 
					
						2006-01-13 22:09:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								knielsen@mysql.com 
							
						 
					 
					
						
						
							
						
						d4c6aff386 
					 
					
						
						
							
							Cleanup "make dist" and Windows builds after push of pluggable storage engines.  
						
						 
						
						
						
						
					 
					
						2005-12-22 13:18:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						0538845963 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.1-release  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.1-clean 
						
						
					 
					
						2005-11-30 13:51:23 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						0597c510c8 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.0-clean  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.1-clean 
						
						
					 
					
						2005-11-30 12:17:01 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								aivanov@mysql.com 
							
						 
					 
					
						
						
							
						
						6680d33a4c 
					 
					
						
						
							
							Changed mysqld.dsp to avoid compilation error in VC++  
						
						 
						
						
						
						
					 
					
						2005-11-28 22:15:43 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						f4ba8acb97 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						Enable build on Windows 
						
						
					 
					
						2005-11-26 19:21:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						708b8ff014 
					 
					
						
						
							
							Fix VS project files following move of storage engines below storage/.  
						
						 
						
						
						
						
					 
					
						2005-11-25 10:46:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a6f5375cb0 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.1 
						
						
					 
					
						2005-11-05 01:32:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						7a57b741ca 
					 
					
						
						
							
							Hastily fix VC++6 project files to include a new file.  
						
						 
						
						
						
						
					 
					
						2005-10-18 01:35:08 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2e2d18b7cf 
					 
					
						
						
							
							Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.1 
						
						
					 
					
						2005-10-09 19:10:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						2c7505b263 
					 
					
						
						
							
							Remove protocol_cursor.cpp (no longer used) from sources  
						
						 
						
						... 
						
						
						
						Fix a compile failure 
						
						
					 
					
						2005-10-09 14:45:08 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						620b7bafb0 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-10-06 10:54:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						538aaa96eb 
					 
					
						
						
							
							mysqld.vcproj:  
						
						 
						
						... 
						
						
						
						Removed "examples/" from path to "ha_archive.cc" 
						
						
					 
					
						2005-10-01 21:05:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						c72092bdab 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						Revert back 5.0 changes to Visual Studio .Net project files 
						
						
					 
					
						2005-09-30 16:44:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						7b2e04d5a2 
					 
					
						
						
							
							Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
						
						
					 
					
						2005-09-30 16:37:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						664503deca 
					 
					
						
						
							
							Removed all Visual Studio .Net .vcproj files to be able to  
						
						 
						
						... 
						
						
						
						back-port to 4.1 and merge forward to 5.x again properly. 
						
						
					 
					
						2005-09-30 16:33:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						21cf818a8d 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver 
						
						
					 
					
						2005-09-30 14:03:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						cb77a6accb 
					 
					
						
						
							
							Fixes needed to build 5.0.13 on Windows:  
						
						 
						
						... 
						
						
						
						- reflect two "Makefile.am" changes in the respective "VC project" files,
- correct a typo in a (normally) unused macro parameter. 
						
						
					 
					
						2005-09-22 18:57:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						57403ddc9d 
					 
					
						
						
							
							Merge zim.(none):/home/brian/mysql/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  zim.(none):/home/brian/mysql/mysql-5.1
Resolved to minor issues. 
						
						
					 
					
						2005-08-30 14:40:02 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								reggie@linux.site 
							
						 
					 
					
						
						
							
						
						6bf4e15b08 
					 
					
						
						
							
							updated some vcproj files and the .sln file  
						
						 
						
						
						
						
					 
					
						2005-08-29 15:35:27 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						64c2d24978 
					 
					
						
						
							
							libmysqld.vcproj:  
						
						 
						
						... 
						
						
						
						Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
  Aligned engines with Unix version
sql_class.cc:
  VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
  Can't assume macro set_timespec_nsec exists if set_timespec does 
						
						
					 
					
						2005-08-25 23:24:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						02056f8e3a 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1 
						
						
					 
					
						2005-08-25 13:11:38 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						f384e08277 
					 
					
						
						
							
							Merge mishka.local:/home/my/mysql-4.1  
						
						 
						
						... 
						
						
						
						into  mishka.local:/home/my/mysql-5.0 
						
						
					 
					
						2005-08-25 06:55:48 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						c070251abd 
					 
					
						
						
							
							Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1  
						
						 
						
						
						
						
					 
					
						2005-08-24 13:56:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						7933906325 
					 
					
						
						
							
							mysqld.dsp:  
						
						 
						
						... 
						
						
						
						Added archive and example storage engine to Windows build
ha_example.cc, ha_archive.cc:
  Windows fix, use relative include path to "mysql_priv.h"
ha_archive.h:
  Windows VC6 compile needed (char*) cast of byte var
mysqltest.dsp, mysql_test_run_new.dsp:
  Added /FD flag, to avoid include file warnings 
						
						
					 
					
						2005-08-18 17:29:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						d17a4773b4 
					 
					
						
						
							
							mysqld.dsp:  
						
						 
						
						... 
						
						
						
						Added the blackhole storage engine to the Max builds 
						
						
					 
					
						2005-08-04 13:47:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								reggie@fedora.(none) 
							
						 
					 
					
						
						
							
						
						5a0250c349 
					 
					
						
						
							
							Conversions of dsp files to vcproj.  These files are compatible with  
						
						 
						
						... 
						
						
						
						Visual Studio 2003.  I have not yet changed the windows build scripts
to use these. 
						
						
					 
					
						2005-08-02 18:47:02 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						3d9bae7b54 
					 
					
						
						
							
							File / directory structure change from 5.0 to 5.1:  
						
						 
						
						... 
						
						
						
						Table handlers "bdb" and "myisam" (and others) have been moved into a common subdirectory "storage".
Include paths between main projects and table handler files need to be adapted. 
						
						
					 
					
						2005-07-22 18:45:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						16bfcd3c75 
					 
					
						
						
							
							File / directory structure change from 5.0 to 5.1:  
						
						 
						
						... 
						
						
						
						Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level. 
						
						
					 
					
						2005-07-21 21:47:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						fab90ce856 
					 
					
						
						
							
							mysqld.dsp:  
						
						 
						
						... 
						
						
						
						Corrected quoting of string "pro-nt" 
						
						
					 
					
						2005-06-28 04:37:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						f2b0874f80 
					 
					
						
						
							
							Clean up warnings and build problems on Windows. (Bug  #11045 )  
						
						 
						
						
						
						
					 
					
						2005-06-18 01:55:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						155c322c59 
					 
					
						
						
							
							mysqld.dsp:  
						
						 
						
						... 
						
						
						
						Corrected typo 
						
						
					 
					
						2005-06-10 04:09:42 +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 
							
						 
					 
					
						
						
							
						
						bedc2e3d4c 
					 
					
						
						
							
							ha_archive.cc:  
						
						 
						
						... 
						
						
						
						Use local seach path for "mysql_priv.h"
mysqld.dsp:
  Added the ARCHIVE storage engine to max
ha_archive.h:
  VC6, but not VC7, needs a cast of byte[] to char* to make
  the compile select the right conversion function in String 
						
						
					 
					
						2005-05-24 18:51:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						181f21c5d2 
					 
					
						
						
							
							mysqld.dsp:  
						
						 
						
						... 
						
						
						
						Added BLACKHOLE and FEDERATED storage engines for max builds
  Some preparations for including yaSSL
ha_federated.cc:
  Use local seach path for "mysql_priv.h" 
						
						
					 
					
						2005-05-23 21:15:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						2292480e79 
					 
					
						
						
							
							mysqld.dsp:  
						
						 
						
						... 
						
						
						
						Corrected wrong exe naming from bad merge 
						
						
					 
					
						2005-04-02 03:35:28 +02: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								georg@beethoven.site 
							
						 
					 
					
						
						
							
						
						26e3685b02 
					 
					
						
						
							
							Changes and fixes for windows compilation  
						
						 
						
						
						
						
					 
					
						2005-02-18 15:17:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						a156ddd0be 
					 
					
						
						
							
							- Create the mysqld binaries with the correct file names during the build  
						
						 
						
						... 
						
						
						
						instead of renaming them in the packaging stage with Do-win-build later:
  mysqld-opt.exe -> mysqld.exe, mysqld.exe -> mysqld-debug.exe 
						
						
					 
					
						2005-01-11 15:41:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						fb820c4b9c 
					 
					
						
						
							
							prepare, winmysqladmin.cpp, mysqldmax.dsp, mysqld.dsp, mysql.dsw:  
						
						 
						
						... 
						
						
						
						Removed references to ISAM and MERGE 
						
						
					 
					
						2005-01-01 20:27:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						4f4bbfc279 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-12-22 13:54:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rburnett@build.mysql.com 
							
						 
					 
					
						
						
							
						
						4278e6194b 
					 
					
						
						
							
							Bug  #6697   	Failure to build 4.1.7 on Visual Studio .NET [fixed]  
						
						 
						
						... 
						
						
						
						mysqld.dsp:
  Added custom build step for message.mc to all targets 
						
						
					 
					
						2004-12-02 18:05:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						40c5b91930 
					 
					
						
						
							
							- added sql_trigger.cpp to the mysqld and libmysqld project files  
						
						 
						
						
						
						
					 
					
						2004-11-18 16:36:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						31122efde7 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						... 
						
						
						
						(Includes merge of arena code in 4.1 and 5.0) 
						
						
					 
					
						2004-09-06 15:14:10 +03:00