jonas@perch.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						b43d0f0495 
					 
					
						
						
							
							Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0  
						
						... 
						
						
						
						into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push 
						
						
					 
					
						2005-09-30 12:25:39 +02:00 
						 
				 
			
				
					
						
							
							
								jonas@perch.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						21153069fb 
					 
					
						
						
							
							export forced_defaults_file using global variable defaults_file  
						
						... 
						
						
						
						analog with defaults_extra_file and defaults_grouop_suffix 
						
						
					 
					
						2005-09-30 09:54:53 +02:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						1a29e7b084 
					 
					
						
						
							
							Fixed a missing cast.  
						
						
						
						
					 
					
						2005-09-20 09:17:04 +03:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						9730b5369a 
					 
					
						
						
							
							A fix (bug  #12917 : The --defaults-extra-file option is ignored by the 5.0 client binaries).  
						
						
						
						
					 
					
						2005-09-09 12:51:43 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e60d786dde 
					 
					
						
						
							
							Ensure we free all items for prepared statements  
						
						... 
						
						
						
						Before the fix in ~Prepared_statments we got a memory leak when executing mysql_client_test.test
Note that test 'variables.test' fails.
This will be fixed when Jimw pushes the fix for Bug 10351 
						
						
					 
					
						2005-07-29 05:06:35 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b3cbd0048f 
					 
					
						
						
							
							Cleanups during review of new code  
						
						... 
						
						
						
						Ensure mysql_close() is called if mysql_set_character_set() fails 
						
						
					 
					
						2005-07-28 16:10:14 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						2278e0319c 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into  mishka.local:/home/my/mysql-5.0 
						
						
					 
					
						2005-07-18 19:03:01 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						78c65b5adc 
					 
					
						
						
							
							Cleanups during review  
						
						... 
						
						
						
						Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while ( 
						
						
					 
					
						2005-07-18 15:33:18 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						7d7a59e46f 
					 
					
						
						
							
							Look in the directory above the executable for the my.cnf/ini, on Windows, as  
						
						... 
						
						
						
						the new installer and GUI tools expect. (Bug #10419 ) Also, dynamically bind to
GetSystemWindowsDirectory() so that it works on all platforms. (Bug #5354 ) 
						
						
					 
					
						2005-07-06 19:49:43 +02:00 
						 
				 
			
				
					
						
							
							
								marty@linux.site 
							
						 
					 
					
						
						
							
						
						e4aedcc2c1 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb  
						
						... 
						
						
						
						into  linux.site:/home/marty/MySQL/mysql-5.0 
						
						
					 
					
						2005-06-30 12:20:52 +02:00 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						b64e6db5a4 
					 
					
						
						
							
							fixes for windows 64-bit compiler warnings  
						
						
						
						
					 
					
						2005-06-13 12:41:15 +02:00 
						 
				 
			
				
					
						
							
							
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						5e4ce743a3 
					 
					
						
						
							
							Merge mysql.com:/home/jonas/src/wl1882  
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-5.0-ndb 
						
						
					 
					
						2005-06-13 11:59:51 +02:00 
						 
				 
			
				
					
						
							
							
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						5be3eecc42 
					 
					
						
						
							
							Add "--instance=name" option to load_defaults (or env(MYSQL_INSTANCE))  
						
						... 
						
						
						
						which enables having multiple mysqld in same my.cnf 
       without mysql_multi or IM 
						
						
					 
					
						2005-06-07 16:52:50 +02:00 
						 
				 
			
				
					
						
							
							
								reggie@monster. 
							
						 
					 
					
						
						
							
						
						4283fdb170 
					 
					
						
						
							
							fixes for compiler warnings from VC6  
						
						
						
						
					 
					
						2005-06-06 11:34:52 -05:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						6757a04e4c 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.0-build  
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-05-18 17:13:31 -07:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						c63ad3b549 
					 
					
						
						
							
							New file default_modify.c. Fixed a typo on mysqld.cc  
						
						... 
						
						
						
						Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it. 
						
						
					 
					
						2005-05-18 20:10:17 +03:00 
						 
				 
			
				
					
						
							
							
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						67364e99af 
					 
					
						
						
							
							fix comments  
						
						
						
						
					 
					
						2005-05-18 15:28:38 +04:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						318c41e94d 
					 
					
						
						
							
							default.c:  
						
						... 
						
						
						
						Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
  Removed unused variable 'field' from print_warnings()
libmysql.dsp:
  Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
  Added "my_chsize.c" 
						
						
					 
					
						2005-05-18 12:15:28 +02:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						0b90c8bfd6 
					 
					
						
						
							
							a fix (bug  #10655 : mysys/default.c compilation problem).  
						
						
						
						
					 
					
						2005-05-16 13:40:57 +05:00 
						 
				 
			
				
					
						
							
							
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						834c47f336 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-05-16 03:01:05 +04:00 
						 
				 
			
				
					
						
							
							
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						180d0ed620 
					 
					
						
						
							
							post-review fixes  
						
						
						
						
					 
					
						2005-05-16 01:54:02 +04:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						e4d1964851 
					 
					
						
						
							
							--default-extra-file handling code fix.  
						
						
						
						
					 
					
						2005-05-12 17:23:16 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@ram-book.(none) 
							
						 
					 
					
						
						
							
						
						6a7306823b 
					 
					
						
						
							
							A fix (bug  #5056 : defaults-extra-file throws no error when file is inaccessible).  
						
						
						
						
					 
					
						2005-05-06 16:51:58 +05:00 
						 
				 
			
				
					
						
							
							
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						560a908315 
					 
					
						
						
							
							fix --defaults-file and --defaults-extra-file broken by a wrong merge  
						
						
						
						
					 
					
						2005-05-04 18:46:29 +04:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						2d44d93ce6 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.0-5354  
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-05-02 10:20:22 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						7bab94f36b 
					 
					
						
						
							
							Clean up merge from 4.1  
						
						
						
						
					 
					
						2005-05-02 10:19:37 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						7370017daf 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-9136  
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-4.1-clean 
						
						
					 
					
						2005-05-02 08:11:32 -07:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						28a5491d3d 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-04-30 09:46:08 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						fbf31c4a8c 
					 
					
						
						
							
							CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug  #7036 )  
						
						... 
						
						
						
						Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467 )
Fix compiler problems with MinGW (Bug #8872 ) 
						
						
					 
					
						2005-04-29 17:03:34 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						2441da8cd9 
					 
					
						
						
							
							Add default configuration files to my_print_defaults usage, and  
						
						... 
						
						
						
						add handling of configuration file in the Windows shared system
directory. (Bug #5354 ) 
						
						
					 
					
						2005-04-28 12:11:48 -07:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						972f86f1ee 
					 
					
						
						
							
							Cleanups during review  
						
						
						
						
					 
					
						2005-04-26 23:24:59 +03:00 
						 
				 
			
				
					
						
							
							
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						da9a6aecad 
					 
					
						
						
							
							Merge mysql.com:/home/cps/mysql/trees/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/cps/mysql/trees/mysql-5.0 
						
						
					 
					
						2005-04-14 01:57:52 +04:00 
						 
				 
			
				
					
						
							
							
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						75cfee68fb 
					 
					
						
						
							
							post review fix  
						
						
						
						
					 
					
						2005-04-14 01:39:24 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						49e721677f 
					 
					
						
						
							
							Fixed errors descovered by valgrind 2.4  
						
						... 
						
						
						
						Added suppression file for some valgrind warnings that are not real errors 
						
						
					 
					
						2005-04-06 17:22:21 +03:00 
						 
				 
			
				
					
						
							
							
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						e57534e64b 
					 
					
						
						
							
							more merge fixes  
						
						
						
						
					 
					
						2005-03-29 16:15:22 +04:00 
						 
				 
			
				
					
						
							
							
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						7428d7ee25 
					 
					
						
						
							
							manual merge  
						
						
						
						
					 
					
						2005-03-29 13:55:11 +04:00 
						 
				 
			
				
					
						
							
							
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						8139af1807 
					 
					
						
						
							
							Post-review fixes for "!include" patch originating from Yahoo! (the whole patch is recommitted)  
						
						
						
						
					 
					
						2005-03-25 04:13:30 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						bd76a4baba 
					 
					
						
						
							
							Fix handling of the -e flag to my_print_defaults. (Bug  #9136 )  
						
						
						
						
					 
					
						2005-03-15 15:54:57 -08:00 
						 
				 
			
				
					
						
							
							
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						dbc0937dd0 
					 
					
						
						
							
							made IM to work with --defaults-file smoothly  
						
						
						
						
					 
					
						2005-02-18 14:58:30 +03:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						c64897dbe8 
					 
					
						
						
							
							--defaults-extra-file bug fixed  
						
						
						
						
					 
					
						2005-01-12 19:57:26 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						6f511796fc 
					 
					
						
						
							
							Merging fixed  
						
						
						
						
					 
					
						2005-01-11 23:28:56 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						196c95e938 
					 
					
						
						
							
							Merging conflicts resolved  
						
						
						
						
					 
					
						2005-01-11 21:00:53 +04:00 
						 
				 
			
				
					
						
							
							
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						81d99da104 
					 
					
						
						
							
							Added checking for my.cnf file from environment variable MYSQL_HOME  
						
						... 
						
						
						
						instead of DATADIR. 
						
						
					 
					
						2005-01-04 20:13:47 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						5eb5fd12be 
					 
					
						
						
							
							fix for bug  #5920  (embedded-server mysql doesn't handle --defaults-file)  
						
						
						
						
					 
					
						2005-01-03 19:21:54 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e0f1e6af36 
					 
					
						
						
							
							Portability fix for gcc 2.95.3  
						
						... 
						
						
						
						After merge fixes 
						
						
					 
					
						2004-11-12 21:24:16 +02:00 
						 
				 
			
				
					
						
							
							
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						fe0b00985f 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2004-11-12 20:38:58 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						addd1a0da8 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2004-11-12 19:58:24 +02:00 
						 
				 
			
				
					
						
							
							
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						76b8c8747d 
					 
					
						
						
							
							Removed an unneccessary for() and variable.  
						
						
						
						
					 
					
						2004-11-12 19:22:58 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						9252656d49 
					 
					
						
						
							
							merge with 4.0  
						
						
						
						
					 
					
						2004-11-12 11:17:53 +02:00 
						 
				 
			
				
					
						
							
							
								jani@a80-186-24-72.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						54dac2cfac 
					 
					
						
						
							
							Some code clean-up and optimization.  
						
						
						
						
					 
					
						2004-11-11 16:59:36 +02:00