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 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e1237cbc53 
					 
					
						
						
							
							manually merged  
						
						
						
						
					 
					
						2004-08-18 19:57:55 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						1097805cf2 
					 
					
						
						
							
							- rename: EXCEPTIONS->EXCEPTIONS-CLIENT  
						
						
						
						
					 
					
						2004-08-05 17:05:11 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						e5cb60dcaa 
					 
					
						
						
							
							- applied the required changes to create the FOSS License exception  
						
						... 
						
						
						
						file "EXCEPTIONS" and include it in the source and binary 
   distributions 
						
						
					 
					
						2004-08-05 01:54:04 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1e31199995 
					 
					
						
						
							
							Merge with 4.1.3-beta  
						
						
						
						
					 
					
						2004-07-07 11:29:39 +03:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						edb9af25bc 
					 
					
						
						
							
							- added mysql_tzinfo_to_sql to binary distributions  
						
						
						
						
					 
					
						2004-06-24 09:22:45 +02:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						8d7d4c077b 
					 
					
						
						
							
							several ndb make changes, see respective file  
						
						
						
						
					 
					
						2004-06-02 00:54:58 +00:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7d8f8bc77b 
					 
					
						
						
							
							Changed prototype of killed_ptr() to make it more portable  
						
						... 
						
						
						
						Applied patches for Netware 
						
						
					 
					
						2004-05-26 19:12:49 +03: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 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ca8dbc24ee 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.0  
						
						... 
						
						
						
						into mysql.com:/tmp/skr99/mysql-4.0 
						
						
					 
					
						2004-05-25 22:01:50 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f2e1e3ce4c 
					 
					
						
						
							
							Added patches from Novell  
						
						
						
						
					 
					
						2004-05-25 22:00:14 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cd3dab49cc 
					 
					
						
						
							
							Merge with 4.0.20  
						
						
						
						
					 
					
						2004-05-17 01:52:13 +03:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						b1f2932fff 
					 
					
						
						
							
							- make sure the binaries are executable before calling them during  
						
						... 
						
						
						
						make_binary_distribution (bug#2857) 
						
						
					 
					
						2004-05-13 18:50:09 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						bf45960eef 
					 
					
						
						
							
							Merge 4.1 -> 5.0  
						
						
						
						
					 
					
						2004-05-07 18:52:06 +02:00 
						 
				 
			
				
					
						
							
							
								tomas@mc05.(none) 
							
						 
					 
					
						
						
							
						
						8e381405eb 
					 
					
						
						
							
							make_binary_distribution.sh:  
						
						... 
						
						
						
						added --with-ndbcluster switch 
						
						
					 
					
						2004-04-15 15:43:10 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						dfd59e296e 
					 
					
						
						
							
							Merge 4.1 -> 5.0.  
						
						
						
						
					 
					
						2004-04-07 19:07:44 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@kallisto.local 
							
						 
					 
					
						
						
							
						
						bbbb3f6540 
					 
					
						
						
							
							- install all *.sql files into the "shared" directory for the binary tar.gz  
						
						... 
						
						
						
						distribution (this is more in line with how "make install" would install
   them) - this should also fix a test failure in the "system_mysql_db_fix"
   test. 
						
						
					 
					
						2004-04-01 17:34:26 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ce14578909 
					 
					
						
						
							
							Merge with 4.0.18  
						
						
						
						
					 
					
						2004-02-11 00:06:46 +01:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						9736c9c457 
					 
					
						
						
							
							- renamed myisam/ft_dump to myisam/mysam_ftdump and added it to the  
						
						... 
						
						
						
						binary distribution and Server RPM 
						
						
					 
					
						2004-02-03 22:25:02 +01:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						6e717133c5 
					 
					
						
						
							
							Merge 4.1 to 5.0  
						
						
						
						
					 
					
						2003-12-01 16:14:40 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						bff0bbeb1f 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2003-11-25 18:26:53 +01:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						531eb44301 
					 
					
						
						
							
							- Removed COPYING.LIB from all source and binary distributions  
						
						... 
						
						
						
						after it was removed from manual.texi (where it was automatically
   generated from). 
						
						
					 
					
						2003-11-25 17:52:12 +01:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						8d884c02bb 
					 
					
						
						
							
							Merging 4.1 -> 5.0  
						
						
						
						
					 
					
						2003-09-24 11:29:38 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						77a70a0a24 
					 
					
						
						
							
							merge with 4.0.15  
						
						
						
						
					 
					
						2003-08-29 13:44:35 +03:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						94c7024eaa 
					 
					
						
						
							
							- enabled embedded server in the binary distributions by default  
						
						... 
						
						
						
						(Do-compile)
 - added mysql.info to the binary distribution files (BUG#1019)
 - heavily reworked the Do-rpm script to be more in line with Do-pkg
 - create a "docs" subdirectory in the binary distribution and moved the
   manual, ChangeLog and mysql.info file into it to unclutter the top
   directory 
						
						
					 
					
						2003-08-12 23:21:21 +02:00 
						 
				 
			
				
					
						
							
							
								greg@mysql.com[greg] 
							
						 
					 
					
						
						
							
						
						ea46c24279 
					 
					
						
						
							
							rlyon-5.0.0-alpha.patch  
						
						
						
						
					 
					
						2003-05-29 14:28:02 -04:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a7708c7904 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2003-04-03 21:19:12 +03:00 
						 
				 
			
				
					
						
							
							
								greg@mysql.com 
							
						 
					 
					
						
						
							
						
						080b73ee18 
					 
					
						
						
							
							Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches  
						
						
						
						
					 
					
						2003-03-28 14:24:32 -05:00 
						 
				 
			
				
					
						
							
							
								greg@mysql.com 
							
						 
					 
					
						
						
							
						
						9aeb60210f 
					 
					
						
						
							
							Improve make_binary_distribution from Novell code at Monty's request  
						
						
						
						
					 
					
						2003-03-27 18:13:37 -05:00 
						 
				 
			
				
					
						
							
							
								greg@mysql.com 
							
						 
					 
					
						
						
							
						
						67985efed5 
					 
					
						
						
							
							Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC  
						
						
						
						
					 
					
						2003-03-21 16:45:39 -05:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						112dfa5900 
					 
					
						
						
							
							Fixes for fill_help_tables.sql  
						
						
						
						
					 
					
						2003-03-21 18:53:55 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						26f9bee733 
					 
					
						
						
							
							- added missing file mysql-test/std_data/des_key_file to source and binary  
						
						... 
						
						
						
						distribution to fix a test failure in test "func_encrypt" 
						
						
					 
					
						2003-03-04 22:24:00 +01:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						905ce89dc5 
					 
					
						
						
							
							- added missing file mysql-test/std_data/des_key_file to source and binary  
						
						... 
						
						
						
						distribution to fix a test failure in test "func_encrypt" 
						
						
					 
					
						2003-03-04 18:18:05 +01:00 
						 
				 
			
				
					
						
							
							
								greg@mysql.com[greg] 
							
						 
					 
					
						
						
							
						
						137bdcec5a 
					 
					
						
						
							
							novell41.patch  
						
						
						
						
					 
					
						2003-03-04 10:34:32 -05:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						326b8abc89 
					 
					
						
						
							
							merge with 3.23 to get corrected error message files and rename of files in mysql-test  
						
						
						
						
					 
					
						2003-02-26 00:22:35 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						e6c575dacc 
					 
					
						
						
							
							change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS  
						
						
						
						
					 
					
						2003-02-26 00:04:13 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6051b2f998 
					 
					
						
						
							
							Fixed multi-table-delete for InnoDB tables  
						
						... 
						
						
						
						Novell patches 
						
						
					 
					
						2003-02-17 02:14:37 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						cf25397e0e 
					 
					
						
						
							
							- fixed typo for better portability (many shells don't support the "=="  
						
						... 
						
						
						
						operator) 
						
						
					 
					
						2003-01-29 09:22:20 +01: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 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						1bdd1d0626 
					 
					
						
						
							
							Merge with 3.23.55  
						
						
						
						
					 
					
						2003-01-25 15:31:07 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						1ecf9d5098 
					 
					
						
						
							
							- added mysql_waitpid to the MySQL-client RPM and binary distributions  
						
						... 
						
						
						
						- renamed MySQL.rpm to MySQL-server.rpm 
						
						
					 
					
						2003-01-24 16:10:21 +01:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						0021a71aee 
					 
					
						
						
							
							- merge relevant Do-compile changes from 4.0 tree  
						
						... 
						
						
						
						- use "gnutar" on Mac OS X to build the binary distribution 
						
						
					 
					
						2003-01-23 20:07:19 +01:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						2423780823 
					 
					
						
						
							
							- moved manual pages from "man" to "man/man1" for the binary distribution  
						
						
						
						
					 
					
						2002-12-11 19:37:09 +01:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						059b0017dc 
					 
					
						
						
							
							- make sure to replace HOSTNAME in mysql.server when packing up the binary  
						
						... 
						
						
						
						distribution (this will still be broken for 3.23.54)
 - make sure that mysql.server in the binary distribution is executable, too 
						
						
					 
					
						2002-12-10 14:25:23 +01:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						79ab39ec94 
					 
					
						
						
							
							- replaced Docs/LICENSE with Docs/MySQLEULA.txt  
						
						... 
						
						
						
						- Updated scripts/make_binary_distribution and scripts/mysql-copyright*
   accordingly 
						
						
					 
					
						2002-10-13 16:57:33 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						d8f843a779 
					 
					
						
						
							
							- Tagged ChangeSet 1.1224 as "mysql-3.23.53"  
						
						... 
						
						
						
						- bumped up version number to 3.23.54 in configure.in
 - replaced Docs/LICENSE with Docs/MySQLEULA.txt and modified
   scripts/make_binary_distribution.sh and Build-tools/mysql-copyright*
   accordingly. 
						
						
					 
					
						2002-10-13 16:26:28 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						a15eafd0a0 
					 
					
						
						
							
							- Small fix for support-files/mysql.spec.sh  
						
						... 
						
						
						
						- Updated scripts/make_binary_distribution.sh to include the correct
   ChangeLog and the LICENSE file for non-GPL builds 
						
						
					 
					
						2002-10-02 13:06:04 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						bf5b57ad2b 
					 
					
						
						
							
							- small modification to scripts/make_binary_distribution.sh (add the  
						
						... 
						
						
						
						up-to-date BK changelog instead of sql/ChangeLog, add LICENSE if
   available) 
						
						
					 
					
						2002-10-02 12:56:16 +02:00