knielsen@mysql.com 
							
						 
					 
					
						
						
							
						
						eed5285e8c 
					 
					
						
						
							
							Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes  
						
						... 
						
						
						
						into  mysql.com:/usr/local/mysql/mysql-5.1-new 
						
						
					 
					
						2006-01-05 10:54:14 +01:00 
						 
				 
			
				
					
						
							
							
								knielsen@mysql.com 
							
						 
					 
					
						
						
							
						
						f13dff7a72 
					 
					
						
						
							
							EADDRINUSE is not defined on Windows.  
						
						
						
						
					 
					
						2006-01-04 16:38:54 +01:00 
						 
				 
			
				
					
						
							
							
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						ad126d90e0 
					 
					
						
						
							
							WL#1012: All changes as one single changeset.  
						
						... 
						
						
						
						This includes both code and test cases. 
						
						
					 
					
						2005-12-22 06:39:02 +01:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						b898368a93 
					 
					
						
						
							
							my_global.h:  
						
						... 
						
						
						
						Fix for bug #15841 : Change in sql_map.cc and mmap breaks on HP-UX
  - in order to enable the mmap64() (and others) define
  _LARGEFILE64_SOURCE in case of _LARGEFILE_SOURCE defined on HPUX. 
						
						
					 
					
						2005-12-19 17:00:53 +01:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						7eeab5eb97 
					 
					
						
						
							
							Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new 
						
						
					 
					
						2005-12-03 21:45:05 +01:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						9fd13ba93d 
					 
					
						
						
							
							my_global.h:  
						
						... 
						
						
						
						Make __cxa_pure_virtual weak symbol 
						
						
					 
					
						2005-12-03 20:52:34 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						aa37b75768 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-5.0  
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.1 
						
						
					 
					
						2005-11-24 02:56:12 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f5804869e3 
					 
					
						
						
							
							Don't use PATH_MAX for FN_REFLEN as this uses too much stack space  
						
						... 
						
						
						
						Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk 
						
						
					 
					
						2005-11-24 02:36:28 +02:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						2f95fc2701 
					 
					
						
						
							
							Merge mysql.com:/home/mysql_src/mysql-5.0  
						
						... 
						
						
						
						into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part) 
						
						
					 
					
						2005-11-18 16:38:01 +01:00 
						 
				 
			
				
					
						
							
							
								SergeyV@selena. 
							
						 
					 
					
						
						
							
						
						00990f9774 
					 
					
						
						
							
							Fixes bug  #13377 . my_open() & my_create() functions changed to use  
						
						... 
						
						
						
						my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to 
allow deleting opened files. my_sopen() implementation is added to
support this functionality. 
						
						
					 
					
						2005-11-14 16:01:10 +03:00 
						 
				 
			
				
					
						
							
							
								svoj@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						463811e900 
					 
					
						
						
							
							monty review: fixes after reapplying plugin patch from "crashed" 5.1 tree  
						
						
						
						
					 
					
						2005-11-06 14:26:37 +01:00 
						 
				 
			
				
					
						
							
							
								svoj@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						3791197f0d 
					 
					
						
						
							
							WL#2575 - Fulltext: Parser plugin for FTS  
						
						... 
						
						
						
						WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree. 
						
						
					 
					
						2005-11-06 13:13:06 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d9a687758c 
					 
					
						
						
							
							Added inclusion of dlfcn.h from old 5.1 tree  
						
						
						
						
					 
					
						2005-11-05 14:10:48 +02:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						620b7bafb0 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-10-06 10:54:07 +02:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						acf218b708 
					 
					
						
						
							
							Several fixes revelaled by Intel compiler.  
						
						
						
						
					 
					
						2005-09-23 16:47:08 +03:00 
						 
				 
			
				
					
						
							
							
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						f67c7186e8 
					 
					
						
						
							
							Merge the 5.0.13 clone changes up to 5.1  
						
						
						
						
					 
					
						2005-09-16 11:02:21 +02:00 
						 
				 
			
				
					
						
							
							
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						8b7b6f46f3 
					 
					
						
						
							
							Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by Kent)  
						
						
						
						
					 
					
						2005-09-15 19:00:25 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						6da41af772 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new 
						
						
					 
					
						2005-09-14 09:45:44 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						7fb9d5aaa0 
					 
					
						
						
							
							Fix QNX warning  
						
						
						
						
					 
					
						2005-09-14 08:33:00 +02:00 
						 
				 
			
				
					
						
							
							
								ndbdev@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						4e8595862d 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-09-13 05:33:11 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						a60ed0b75d 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-09-12 17:00:50 -07:00 
						 
				 
			
				
					
						
							
							
								SergeyV@selena. 
							
						 
					 
					
						
						
							
						
						784582b857 
					 
					
						
						
							
							Merge selena.:H:/MYSQL/src/#05588-mysql-4.0  
						
						... 
						
						
						
						into  selena.:H:/MYSQL/src/#05588-mysql-4.1 
						
						
					 
					
						2005-09-07 14:59:41 +04:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						345dfef41f 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-5.1 
						
						
					 
					
						2005-09-02 08:59:59 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						d6db387aea 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-08-31 19:12:16 -07:00 
						 
				 
			
				
					
						
							
							
								ndbdev@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						583979d949 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-08-31 20:45:48 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						37bf8394ab 
					 
					
						
						
							
							Add test for madvise() being declared in C++ code, because it is not  
						
						... 
						
						
						
						on Solaris even though it is available, and declare it ourselves in
that case. (Bug #7156 ) 
						
						
					 
					
						2005-08-31 10:08:55 -07:00 
						 
				 
			
				
					
						
							
							
								SergeyV@selena. 
							
						 
					 
					
						
						
							
						
						e82e15b051 
					 
					
						
						
							
							Fixes bug  #5588 . vio_was_interrupted() function was added to detect  
						
						... 
						
						
						
						read timeout properly on win32. 
						
						
					 
					
						2005-08-30 19:19:28 +04: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 
							
						 
					 
					
						
						
							
						
						d62295e44e 
					 
					
						
						
							
							Cleanup during review of new pushed code  
						
						
						
						
					 
					
						2005-08-22 01:13:37 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						a3ae4e0fc7 
					 
					
						
						
							
							Fix up definition of new set_timespec_nsec() macro. (Related to bug  #12582 )  
						
						
						
						
					 
					
						2005-08-17 18:08:30 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						054e78943e 
					 
					
						
						
							
							Fix SLEEP() to be interruptable. (Bug  #12582 )  
						
						
						
						
					 
					
						2005-08-16 16:31:16 -07:00 
						 
				 
			
				
					
						
							
							
								pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						e44ee76453 
					 
					
						
						
							
							Included partitioning into embedded server  
						
						
						
						
					 
					
						2005-07-21 03:31:49 -04:00 
						 
				 
			
				
					
						
							
							
								tulin@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						c2c0cb18c3 
					 
					
						
						
							
							no PARTITION in embedded server  
						
						
						
						
					 
					
						2005-07-20 16:05:47 +02:00 
						 
				 
			
				
					
						
							
							
								tulin@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						bf6e3f9aa8 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-07-20 07:53:10 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						80c1c6b33f 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-07-19 11:05:49 -07:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						7e83d09ce7 
					 
					
						
						
							
							Simple fixes during review of new code  
						
						
						
						
					 
					
						2005-07-19 19:25:05 +03:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						67087e2aa7 
					 
					
						
						
							
							Patch for push of wl1354 Partitioning  
						
						
						
						
					 
					
						2005-07-18 13:31:02 +02:00 
						 
				 
			
				
					
						
							
							
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						6db2602ad0 
					 
					
						
						
							
							Merge mysql.com:/home/bkroot/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/home/bk/mysql-5.0 
						
						
					 
					
						2005-07-13 02:13:04 +02:00 
						 
				 
			
				
					
						
							
							
								reggie@linux.site 
							
						 
					 
					
						
						
							
						
						c31d71c065 
					 
					
						
						
							
							Fixed some vio code that was using ___WIN__ instead of __WIN__  
						
						
						
						
					 
					
						2005-07-12 10:31:09 -06:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						f741566646 
					 
					
						
						
							
							Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
						
						
					 
					
						2005-07-12 10:57:01 +02:00 
						 
				 
			
				
					
						
							
							
								brian@avenger.(none) 
							
						 
					 
					
						
						
							
						
						0c5ac2dd5b 
					 
					
						
						
							
							Fix for gcc 4.0 (they have removed min/max operators).  
						
						
						
						
					 
					
						2005-07-11 16:56:18 -07:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						fe09e62d36 
					 
					
						
						
							
							Merge mysql.com:/usr/home/ram/work/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/usr/home/ram/work/mysql-5.0 
						
						
					 
					
						2005-07-06 14:01:30 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						f82420356f 
					 
					
						
						
							
							a fix (bug  #11544 : Use of missing rint() function on QNX).  
						
						
						
						
					 
					
						2005-07-06 13:51:53 +05:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						1c33fbc4c1 
					 
					
						
						
							
							Bug#10178 - failure to find a row in heap table by concurrent UPDATEs  
						
						... 
						
						
						
						Bug#10568 - Function 'LAST_DAY(date)' does not return NULL for invalid argument.
Manual merge. 
						
						
					 
					
						2005-06-24 19:47:18 +02:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						66330a9d59 
					 
					
						
						
							
							an improvement (bug  #7851 : C++ 'new' conflicts with kernel header asm/system.h).  
						
						
						
						
					 
					
						2005-06-24 12:51:11 +05:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						a5285b141e 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-06-09 18:00:47 -07:00 
						 
				 
			
				
					
						
							
							
								svoj@mysql.com 
							
						 
					 
					
						
						
							
						
						f9751e1785 
					 
					
						
						
							
							Merge mysql.com:/var/tmp/sslbug/mysql-4.0  
						
						... 
						
						
						
						into mysql.com:/var/tmp/sslbug/mysql-4.1 
						
						
					 
					
						2005-06-08 21:40:58 +05:00 
						 
				 
			
				
					
						
							
							
								svoj@mysql.com 
							
						 
					 
					
						
						
							
						
						cc31c4c7fb 
					 
					
						
						
							
							Fix for  
						
						... 
						
						
						
						BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
Remove obsolete code. 
						
						
					 
					
						2005-06-08 21:07:25 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						775f17667b 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-06-07 00:31:53 +03:00