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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@a80-186-24-72.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						4f04217879 
					 
					
						
						
							
							Removed check for .ini file elsewhere, except on Windows.  
						
						 
						
						
						
						
					 
					
						2004-11-11 16:20:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						bfdf57ef31 
					 
					
						
						
							
							Fixed a typo that caused segmentation fault when using  
						
						 
						
						... 
						
						
						
						--defaults-extra-file option. 
						
						
					 
					
						2004-11-05 23:58:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						083a2f5613 
					 
					
						
						
							
							Changed default.c so that it now checks for my.ini and then  
						
						 
						
						... 
						
						
						
						my.cnf from the default directories. 
						
						
					 
					
						2004-11-05 18:59:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								petr@mysql.com 
							
						 
					 
					
						
						
							
						
						998873c996 
					 
					
						
						
							
							Fixed a problem causing load_defaults not to accept some command-line  
						
						 
						
						... 
						
						
						
						options. 
						
						
					 
					
						2004-09-11 00:44:09 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cps@silver_beast.(none) 
							
						 
					 
					
						
						
							
						
						d07557d687 
					 
					
						
						
							
							Fixed memory allocation: allocated memory wasn't enough to store the  
						
						 
						
						... 
						
						
						
						final 0 of the string. 
						
						
					 
					
						2004-09-06 18:19:19 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cps@silver_beast.(none) 
							
						 
					 
					
						
						
							
						
						27fdfad74a 
					 
					
						
						
							
							After review fix: added a comment  
						
						 
						
						
						
						
					 
					
						2004-09-06 00:32:21 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cps@silver_beast.(none) 
							
						 
					 
					
						
						
							
						
						d14e6c3400 
					 
					
						
						
							
							Please rewiev. Here added a function to process config. files options.  
						
						 
						
						... 
						
						
						
						A lot of the default.c module code was refactored. The patch is needed
for the IM. 
						
						
					 
					
						2004-08-30 18:17:50 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								paul@kite-hub.kitebird.com 
							
						 
					 
					
						
						
							
						
						2f0ca1ce42 
					 
					
						
						
							
							Fix skipp -> skip once and for all.  
						
						 
						
						... 
						
						
						
						(Note: This affects only comments, not variable names.) 
						
						
					 
					
						2004-06-03 11:52:54 -05: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 
							
						 
					 
					
						
						
							
						
						f2e1e3ce4c 
					 
					
						
						
							
							Added patches from Novell  
						
						 
						
						
						
						
					 
					
						2004-05-25 22:00:14 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						32d0b69503 
					 
					
						
						
							
							Allow one to send empty strings with mysql_stmt_send_long_data()  
						
						 
						
						... 
						
						
						
						mysql_stmt_reset() now resets param->long_data_used
Abort if --defaults-file=path-name uses a non-existing file (Bug #3413 )
Fixed problem with symlink test (bug in 4.1.2) 
						
						
					 
					
						2004-04-28 20:19:50 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e0e0314d60 
					 
					
						
						
							
							Merge with 4.0  
						
						 
						
						
						
						
					 
					
						2004-03-25 23:29:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						23a74015f1 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-conf-4.0 
						
						
					 
					
						2004-03-23 22:11:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						4f4668ef20 
					 
					
						
						
							
							comment  
						
						 
						
						
						
						
					 
					
						2004-03-23 19:25:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						8215fbe957 
					 
					
						
						
							
							fixed config parser to recognize correctly strings like following:  
						
						 
						
						... 
						
						
						
						test="\"#no comment here"#real comment 
						
						
					 
					
						2004-03-20 23:50:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						f231d9826b 
					 
					
						
						
							
							just tried to find all 'skipp' and replace it with 'skip'.  
						
						 
						
						
						
						
					 
					
						2004-02-02 20:25:39 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						0680d16595 
					 
					
						
						
							
							Reverted an addition to be able to use ';' as a comment  
						
						 
						
						... 
						
						
						
						starting character elsewhere than in the beginning of a line,
because it affected some innodb options that had ';'
in them. 
						
						
					 
					
						2004-01-23 15:31:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lenz@kallisto.local 
							
						 
					 
					
						
						
							
						
						3ceef284df 
					 
					
						
						
							
							- no C++ comments in .c files, please...  
						
						 
						
						
						
						
					 
					
						2004-01-15 13:32:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						0d19a14ade 
					 
					
						
						
							
							Added handling for ; comment character as there was for #.  
						
						 
						
						... 
						
						
						
						Bug#2080 
						
						
					 
					
						2004-01-15 04:00:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						8aeb63dd3b 
					 
					
						
						
							
							Update VC++ files  
						
						 
						
						... 
						
						
						
						Portability fixes
After merge fixes 
						
						
					 
					
						2003-11-21 01:53:01 +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 
							
						 
					 
					
						
						
							
						
						6056cfadfc 
					 
					
						
						
							
							Merge with 4.0.16  
						
						 
						
						
						
						
					 
					
						2003-10-07 15:42:26 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						45a41e85e3 
					 
					
						
						
							
							Code cleanup of new patches  
						
						 
						
						
						
						
					 
					
						2003-09-23 17:06:44 +03:00