msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						697cfe7f07 
					 
					
						
						
							
							Merge from 4.1  
						
						
						
						
					 
					
						2005-05-26 21:01:55 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						83d430353e 
					 
					
						
						
							
							Add ifdefs to control when "#pragma implementation" should be used  
						
						... 
						
						
						
						Added some more ifdefs for "#pragma interface" 
						
						
					 
					
						2005-05-26 12:09:14 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						ef9ef1f958 
					 
					
						
						
							
							Fix partial keys when converting VARCHAR to TEXT. (Bug  #10543 )  
						
						
						
						
					 
					
						2005-05-25 18:11:47 -07:00 
						 
				 
			
				
					
						
							
							
								ndbdev@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						4b47828478 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-05-19 18:37:33 +02:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						44a2007111 
					 
					
						
						
							
							a fix (bug  #10539 : When inserting out of range value in BIT, different engines behaves differently).  
						
						
						
						
					 
					
						2005-05-18 17:30:11 +05:00 
						 
				 
			
				
					
						
							
							
								tulin@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						23f79bd1f2 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-05-17 10:17:53 +02:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						524b988260 
					 
					
						
						
							
							a fix (bug  #6961 : Traditional: assignment of string to numeric column should fail).  
						
						
						
						
					 
					
						2005-05-13 13:22:27 +05:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						187ee4712b 
					 
					
						
						
							
							Fixed bug 10465.  
						
						
						
						
					 
					
						2005-05-12 17:37:38 +03:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						c33a0673a6 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1  
						
						... 
						
						
						
						into mysql.com:/Users/mikron/wl1682 
						
						
					 
					
						2005-05-12 12:01:01 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						c18a302577 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1  
						
						... 
						
						
						
						into mysql.com:/Users/mikron/wl1682 
						
						
					 
					
						2005-05-07 11:23:09 +02:00 
						 
				 
			
				
					
						
							
							
								holyfoot@hf-ibm.(none) 
							
						 
					 
					
						
						
							
						
						2c8e9df232 
					 
					
						
						
							
							A lot of fixes to Precision math  
						
						... 
						
						
						
						Mostly about precision/decimals of the results of the operations 
						
						
					 
					
						2005-05-05 20:06:49 +05:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						054463f975 
					 
					
						
						
							
							Fix for  #6553  and  #8776  (no errors on bad spatial data)  
						
						
						
						
					 
					
						2005-04-29 20:23:02 +05:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						21347433cf 
					 
					
						
						
							
							WL 1682: Use bitvector instead of query_id to tell handler which fields  
						
						... 
						
						
						
						to read and write
Changed Server code, added new interface to handler and changed the
NDB handler, InnoDB handler and Federated handler that previously used
query_id
Bug#10202 fix (one-liner fix for memory leak) 
						
						
					 
					
						2005-04-28 14:45:27 +02:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						b2dbaea394 
					 
					
						
						
							
							Bit type: fix for create_field::create_field().  
						
						
						
						
					 
					
						2005-04-14 14:32:25 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						eae4d9c073 
					 
					
						
						
							
							Bit type: code cleanup.  
						
						
						
						
					 
					
						2005-04-12 19:36:21 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						3b1c3d8c68 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/usr/home/ram/work/5.0.bit_class 
						
						
					 
					
						2005-04-12 12:30:09 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						c4376b2bc6 
					 
					
						
						
							
							Bit type support for non-MyISAM tables.  
						
						
						
						
					 
					
						2005-04-12 12:27:43 +05:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						9b4f106045 
					 
					
						
						
							
							Fix warning and error when compiling on Windows.  
						
						
						
						
					 
					
						2005-04-09 03:05:47 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e1e5b97dea 
					 
					
						
						
							
							manually merged  
						
						... 
						
						
						
						Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually 
						
						
					 
					
						2005-04-06 21:19:20 +02:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						1c46a02069 
					 
					
						
						
							
							Minor clean-ups for the previous commit.  
						
						
						
						
					 
					
						2005-04-06 15:12:44 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						0134a2b286 
					 
					
						
						
							
							Adding a new parameter for well_formed_length to  
						
						... 
						
						
						
						return error. We'll use it for better warnign reporting. 
						
						
					 
					
						2005-04-06 11:53:15 +05:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c796ea598c 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-04-05 13:23:11 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						52770e8682 
					 
					
						
						
							
							XID SQL syntax  
						
						... 
						
						
						
						minor cleanups
XA tests 
						
						
					 
					
						2005-04-04 00:50:05 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						9616c9a80d 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-01 15:06:35 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						201ee3eb78 
					 
					
						
						
							
							Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug  #5902 )  
						
						... 
						
						
						
						CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912 )
ALTER TABLE now fails in STRICT mode if it generates warnings.
Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933 ) 
						
						
					 
					
						2005-04-01 15:04:50 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						45a79c9056 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-5.0 
						
						
					 
					
						2005-04-01 02:15:40 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1029e533df 
					 
					
						
						
							
							postmerge 4.1->5.0 fixes  
						
						
						
						
					 
					
						2005-04-01 02:14:30 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						05d4ed14e4 
					 
					
						
						
							
							merge 4.1->5.0  
						
						
						
						
					 
					
						2005-03-31 10:39:48 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b43b7dc128 
					 
					
						
						
							
							Enabled more tests of STR_TO_DATE()  
						
						... 
						
						
						
						Fixed that datetime gives warning for zero dates in traditional mode 
						
						
					 
					
						2005-03-30 23:41:42 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						332b7ed4a1 
					 
					
						
						
							
							Give warnings if wrong date/time/datetime argument for STR_TO_DATE  
						
						... 
						
						
						
						Small fixes while doing review of new pushed code
More test cases for decimal 
						
						
					 
					
						2005-03-30 16:00:31 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d6bedfa8e0 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2005-03-23 09:42:24 +01:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4554b1f263 
					 
					
						
						
							
							fixed union types merging and table related metadata (BUG#8824)  
						
						
						
						
					 
					
						2005-03-23 08:36:48 +02:00 
						 
				 
			
				
					
						
							
							
								serg@mysql.com 
							
						 
					 
					
						
						
							
						
						f7cbe9a2cc 
					 
					
						
						
							
							BUG#9339 - Updating a column does not work if the table has a UTF-8 VARCHAR primary key  
						
						... 
						
						
						
						fixed my_charpos() call in Field_varstring::get_key_image 
						
						
					 
					
						2005-03-22 20:13:49 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						f4d4df2ca4 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-03-21 13:43:25 +01:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						ee2b4ec959 
					 
					
						
						
							
							Eliminate warnings noticed by VC7. This includes fixing my_mmap() on  
						
						... 
						
						
						
						Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826 ) 
						
						
					 
					
						2005-03-18 16:12:25 -08:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						376a4ee03b 
					 
					
						
						
							
							Field::quote_data():  
						
						... 
						
						
						
						don't call escape_string_for_mysql() unnecesary
  don't overwrite local buffer
escape_string_for_mysql():
  take a length of the destination buffer as an argument 
						
						
					 
					
						2005-03-17 12:27:45 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						594ef41b2d 
					 
					
						
						
							
							Cleanup during reviews  
						
						... 
						
						
						
						Removed some optional arguments
Fixed portability problem in federated tests 
						
						
					 
					
						2005-03-16 16:11:01 +02:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						22915b3ad5 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/media/sda1/mysql/mysql-5.0-926 
						
						
					 
					
						2005-03-13 23:53:30 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						983c75f05e 
					 
					
						
						
							
							WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) and  
						
						... 
						
						
						
						implementation of AVG(DISTINCT) which utilizes the approach with Fields.
The patch implemented in October is portede to the up-to-date tree 
containing DECIMAL type.
Tests for AVG(DISTINCT) (although there is not much to test provided
that SUM(DISTINCT) works), cleanups for COUNT(DISTINCT) and GROUP_CONCAT()
will follow in another changeset. 
						
						
					 
					
						2005-03-13 23:50:43 +03:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						ec06f3e762 
					 
					
						
						
							
							a fix (bug  #9029  Traditional: Wrong SQLSTATE returned for string truncation).  
						
						
						
						
					 
					
						2005-03-10 17:08:45 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						fbbb58c6ae 
					 
					
						
						
							
							Fix for bug  #8935  CAST(time AS DECIMAL) crashes  
						
						
						
						
					 
					
						2005-03-07 20:53:51 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0a6b7aedb2 
					 
					
						
						
							
							Remove compiler warnings and remove not used variables  
						
						... 
						
						
						
						(Found during build process) 
						
						
					 
					
						2005-02-25 16:53:22 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e2ea35ec67 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-02-22 15:47:00 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						22a76c1dfb 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2005-02-22 12:51:54 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e2dc9b4099 
					 
					
						
						
							
							Backport my_strntod() from 5.0  
						
						... 
						
						
						
						Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740 ) 
						
						
					 
					
						2005-02-22 12:51:23 +02:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						c709ad87db 
					 
					
						
						
							
							field.cc:  
						
						... 
						
						
						
						optimize test_if_minus() when not UCS2 support is compiled. 
						
						
					 
					
						2005-02-22 08:35:15 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f3b00a0413 
					 
					
						
						
							
							use dbug_print_decimal instead of DBUG_EXECUTE  
						
						... 
						
						
						
						Portability fix
Note: rpl_trunc_binlog fails, but Sergei has promised to fix it, so I will ignore it for now 
						
						
					 
					
						2005-02-20 00:24:30 +02:00 
						 
				 
			
				
					
						
							
							
								georg@beethoven.site 
							
						 
					 
					
						
						
							
						
						26e3685b02 
					 
					
						
						
							
							Changes and fixes for windows compilation  
						
						
						
						
					 
					
						2005-02-18 15:17:17 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						71e4859389 
					 
					
						
						
							
							After merge fixes  
						
						
						
						
					 
					
						2005-02-15 19:25:42 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						38d1a42481 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-02-15 17:12:13 +02:00