serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						413a8753e2 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2004-09-07 15:18:53 +02:00 
						 
				 
			
				
					
						
							
							
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						56b4c31633 
					 
					
						
						
							
							Fixed Bug#3645, "PROCEDURE ANALYSE() recommends illegal  
						
						... 
						
						
						
						FLOAT columns". 
						
						
					 
					
						2004-09-07 11:40:27 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e1237cbc53 
					 
					
						
						
							
							manually merged  
						
						
						
						
					 
					
						2004-08-18 19:57:55 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6023b58b9f 
					 
					
						
						
							
							Bug  #4797  - 32 bit and 64 bit builds behave differently on int32 overflow  
						
						
						
						
					 
					
						2004-08-11 23:43:41 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						894e8fca6e 
					 
					
						
						
							
							Portability fixes  
						
						
						
						
					 
					
						2004-05-12 02:38:57 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						5914e5705c 
					 
					
						
						
							
							my_atof is deleted  
						
						... 
						
						
						
						strtod from mit-threads is restored and cleaned up 
						
						
					 
					
						2004-02-13 15:27:21 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e0cc6799ec 
					 
					
						
						
							
							Merge with 4.0.17  
						
						
						
						
					 
					
						2003-12-17 17:35:34 +02:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						124c4ca346 
					 
					
						
						
							
							cleanup: if there is return from if-part, we don't need else statement  
						
						
						
						
					 
					
						2003-12-10 22:26:31 +03:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						a60acfcfe0 
					 
					
						
						
							
							Old style charset() and set_charset() were removed.  
						
						
						
						
					 
					
						2003-08-05 12:52:37 +05:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						74b74ad5e7 
					 
					
						
						
							
							There is no Item->binary() anymore. It was remain from 4.0.  
						
						
						
						
					 
					
						2003-07-02 18:34:43 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd377bfba6 
					 
					
						
						
							
							Fixed problem when comparing a key for a multi-byte-character set. (bug 152)  
						
						... 
						
						
						
						Use 0x.... as strings if 'new' mode. (bug 152)
Don't report -max on windows when InnoDB is enabled. (bug 332)
Reset current_linfo;  This could cause a hang when doing PURGE LOGS.
Fix for row numbers in EXPLAIN (bug 322)
 Fix that USE_FRM works for all table types (bug 97) 
						
						
					 
					
						2003-04-27 22:12:08 +03:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						077d7e81c8 
					 
					
						
						
							
							Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading  
						
						... 
						
						
						
						Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files 
						
						
					 
					
						2003-04-16 11:49:52 -07:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e165845d39 
					 
					
						
						
							
							sys_var_collation is now abstract class  
						
						... 
						
						
						
						Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables. 
						
						
					 
					
						2003-04-07 16:10:27 +05:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a434bca704 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2003-03-16 19:17:54 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						026ec1d37c 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2003-03-13 13:44:03 +01:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						b4c8ecd8bc 
					 
					
						
						
							
							filesort.cc, sql_analyse.cc, item_func.cc, item_strfunc.cc, field.cc:  
						
						... 
						
						
						
						Unnesessary binary() calls have been removed 
						
						
					 
					
						2003-03-13 15:34:46 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						88f811c8a5 
					 
					
						
						
							
							NEWDATE -> DATE in anylyse() output  
						
						... 
						
						
						
						Changed that analyse(#) also affects strings 
						
						
					 
					
						2003-03-12 16:43:01 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						f95eb82934 
					 
					
						
						
							
							stringcmp() and sortcmp() have been unified  
						
						... 
						
						
						
						into the only one sortcmp() with additional
CHARSET_INFO *cmp_charset argument. 
						
						
					 
					
						2003-03-04 18:01:59 +04:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						1a2c7da8db 
					 
					
						
						
							
							sql_analyse.cc, spatial.cc:  
						
						... 
						
						
						
						Some default_charset_info were removed
sql_select.cc:
  Some default_charset_info were removed. 
						
						
					 
					
						2003-02-26 13:16:02 +04: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 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						203728ae68 
					 
					
						
						
							
							fixed memory leak in ANALIZE initialization error reporting  
						
						
						
						
					 
					
						2003-02-14 17:09:09 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d7b5238b02 
					 
					
						
						
							
							fixed memory leak in procedure with subselects  
						
						
						
						
					 
					
						2003-02-14 14:00:19 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						07daf3169e 
					 
					
						
						
							
							Merge with 4.0.8  
						
						
						
						
					 
					
						2003-01-03 00:04:33 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						6ac401b550 
					 
					
						
						
							
							thd_charset has been moved to variables structure  
						
						
						
						
					 
					
						2002-12-19 09:38:28 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d49167bae5 
					 
					
						
						
							
							Fixes for binary protocol (complement to last push)  
						
						... 
						
						
						
						Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run 
						
						
					 
					
						2002-12-14 17:43:01 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						5022e56cba 
					 
					
						
						
							
							Ensure that BEGIN / COMMIT is handled properly if slave dies  
						
						... 
						
						
						
						Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1; 
						
						
					 
					
						2002-12-11 15:46:39 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c1486c2c17 
					 
					
						
						
							
							More use of new str->num conversion routines  
						
						
						
						
					 
					
						2002-12-09 17:57:17 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						f1858ec331 
					 
					
						
						
							
							fixed bug of PROCEDURE in same query with subselects  
						
						... 
						
						
						
						prohibited using procedure inside subquery
fixed error handling of procedure analize 
						
						
					 
					
						2002-12-06 00:40:28 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						1935183975 
					 
					
						
						
							
							- Portability fixes for HP compiler on HPUX11 (backport from 4.0 tree)  
						
						... 
						
						
						
						- sql_analyse.cc: Fixed bug in decimal handling 
						
						
					 
					
						2002-12-04 16:16:06 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dac6498f9b 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2002-11-21 15:56:48 +02:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						b0fae584b9 
					 
					
						
						
							
							Portability fixes for HP compiler and HPUX11  
						
						
						
						
					 
					
						2002-11-09 13:26:46 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						9a9e7ce0f4 
					 
					
						
						
							
							Item->thd_charset() - returns a default charset which should be used  
						
						... 
						
						
						
						to compose strings appeared without charset context, for example,
in convertion from numer into string type. 
						
						
					 
					
						2002-11-06 15:49:53 +04:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						b43876b9dd 
					 
					
						
						
							
							All String->set() now have charset argument  
						
						
						
						
					 
					
						2002-10-30 16:19:43 +04:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						95aef91521 
					 
					
						
						
							
							BINARY charset is now used instead of binary_flag  
						
						
						
						
					 
					
						2002-10-25 13:58:32 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d69250a969 
					 
					
						
						
							
							Fixes and code cleanups after merge with 4.0.3  
						
						... 
						
						
						
						Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22 
						
						
					 
					
						2002-10-02 13:33:08 +03:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						fc8490a111 
					 
					
						
						
							
							merge with 4.0 to get last fixes to last merge  
						
						
						
						
					 
					
						2002-06-04 08:29:08 +03:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						4b1836ee36 
					 
					
						
						
							
							Enable LOAD DATA LOCAL INFILE in mysql_test  
						
						... 
						
						
						
						Added syntax for column comments (for compability with 4.1)
Fix of ALTER TABLE RENAME 
						
						
					 
					
						2002-06-04 00:40:27 +03:00 
						 
				 
			
				
					
						
							
							
								bar@gw.udmsearch.izhnet.ru 
							
						 
					 
					
						
						
							
						
						196aa19cf6 
					 
					
						
						
							
							Now string values are created and filled with charset field  
						
						... 
						
						
						
						SELECT func(charset2) FROM t ORDER BY 1 works in correct charset 
						
						
					 
					
						2002-05-17 16:29:52 +05:00 
						 
				 
			
				
					
						
							
							
								bar@gw.udmsearch.izhnet.ru 
							
						 
					 
					
						
						
							
						
						eab2893dac 
					 
					
						
						
							
							RB-Tree indexes support in HEAP tables  
						
						... 
						
						
						
						Renamed _hp_func  ->  hp_func
mi_key_cmp moved to /mysys/my_handler.c
New tests for HEAP tables 
						
						
					 
					
						2002-04-25 13:36:55 +05:00 
						 
				 
			
				
					
						
							
							
								bar@gw.udmsearch.izhnet.ru 
							
						 
					 
					
						
						
							
						
						b37ce8e769 
					 
					
						
						
							
							New ctype functions/macros to support many charsets at a time  
						
						
						
						
					 
					
						2002-03-12 21:37:58 +04:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						df5f8c18eb 
					 
					
						
						
							
							Move HA_EXTRA_NO_READCHECK to ha_open  
						
						... 
						
						
						
						Fixed bug in multi-table-delete 
						
						
					 
					
						2002-01-16 23:02:26 +02:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						b658662ae4 
					 
					
						
						
							
							Update copyright  
						
						... 
						
						
						
						Fixed memory leak on shutdown (Affects the embedded version & MyODBC) 
						
						
					 
					
						2001-12-06 14:10:51 +02:00 
						 
				 
			
				
					
						
							
							
								monty@tik.mysql.fi 
							
						 
					 
					
						
						
							
						
						b13d453d50 
					 
					
						
						
							
							Fix UNION  
						
						... 
						
						
						
						New faster list iterators
Change list code to be simpler and faster
Optimize count(distinct)
New error messages for UNION
Make create_tmp_table more general to be usable by UNION 
						
						
					 
					
						2001-08-02 06:29:50 +03:00 
						 
				 
			
				
					
						
							
							
								sasha@mysql.sashanet.com 
							
						 
					 
					
						
						
							
						
						a12117f036 
					 
					
						
						
							
							change tree to use qsort_cmp2 - compare function with 3 instead of 2 arguments  
						
						
						
						
					 
					
						2001-05-10 18:14:15 -06:00 
						 
				 
			
				
					
						
							
							
								monty@donna.mysql.com 
							
						 
					 
					
						
						
							
						
						0fcdce7bc4 
					 
					
						
						
							
							Fix for snprintf  
						
						
						
						
					 
					
						2000-08-22 00:55:45 +03:00 
						 
				 
			
				
					
						
							
							
								monty@donna.mysql.com 
							
						 
					 
					
						
						
							
						
						f0952ce3e1 
					 
					
						
						
							
							FLUSH TABLE table_list  
						
						... 
						
						
						
						Fixes for RENAME TABLE
Portability fixes 
						
						
					 
					
						2000-08-22 00:18:32 +03:00 
						 
				 
			
				
					
						
							
							
								bk@work.mysql.com 
							
						 
					 
					
						
						
							
						
						f4c589ff6c 
					 
					
						
						
							
							Import changeset  
						
						
						
						
					 
					
						2000-07-31 21:29:14 +02:00