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 
						 
				 
			
				
					
						
							
							
								bar@eagle.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						9fbfa7a9af 
					 
					
						
						
							
							func_str.result:  
						
						... 
						
						
						
						post-merge fix.
  , 
						
						
					 
					
						2005-03-25 11:47:25 +04:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						edb4dd5366 
					 
					
						
						
							
							after merge fix  
						
						
						
						
					 
					
						2005-03-17 18:44:24 +03:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						b435d6e862 
					 
					
						
						
							
							Merge 4.1 -> 5.0  
						
						
						
						
					 
					
						2005-03-17 16:51:07 +03:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						a7b877df78 
					 
					
						
						
							
							Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()  
						
						... 
						
						
						
						not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for 
debugging purposes. 
						
						
					 
					
						2005-03-16 17:44:29 +04:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						db4ca33f52 
					 
					
						
						
							
							Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0  
						
						... 
						
						
						
						into rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
						
						
					 
					
						2005-03-09 16:53:20 -08:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						4406118cf8 
					 
					
						
						
							
							func_str.result:  
						
						... 
						
						
						
						Correction after manual merge. 
						
						
					 
					
						2005-03-09 13:20:52 -08:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						af5d21357e 
					 
					
						
						
							
							Manual merge  
						
						
						
						
					 
					
						2005-03-09 10:58:52 -08:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						4559fb998b 
					 
					
						
						
							
							func_str.result, func_str.test:  
						
						... 
						
						
						
						Added a test case for bug #8669 .
item_strfunc.cc:
  Fixed bug #8669 .
  Function AES_DECRYPT can return NULL value. 
						
						
					 
					
						2005-03-09 00:15:51 -08:00 
						 
				 
			
				
					
						
							
							
								bar@deer.(none) 
							
						 
					 
					
						
						
							
						
						42e5de1bee 
					 
					
						
						
							
							func_group.test, func_str.result, func_group.result:  
						
						... 
						
						
						
						after merge fixes 
						
						
					 
					
						2005-03-05 20:44:22 +04:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						d50d213162 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-03-05 18:20:35 +04:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						7e8e033290 
					 
					
						
						
							
							type_blob.result, func_system.result, func_str.result, ctype_collate.result:  
						
						... 
						
						
						
						fixing test results accordingly.
func_system.test:
  New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
    safe_charset_converter() was added for system constants.
item_strfunc.cc:
  safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
  Version is a system constant too. 
						
						
					 
					
						2005-03-04 14:20:49 +04:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						907c7af3ce 
					 
					
						
						
							
							Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1  
						
						... 
						
						
						
						into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0 
						
						
					 
					
						2005-02-23 18:47:00 +03:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						2b5ee94a33 
					 
					
						
						
							
							Fix for bug#6317: string function CHAR, parameter is NULL, wrong result  
						
						
						
						
					 
					
						2005-02-23 18:15:45 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b233ddba8e 
					 
					
						
						
							
							After merge fixes  
						
						
						
						
					 
					
						2005-02-03 18:00:50 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						422c2eb868 
					 
					
						
						
							
							4.1 -> 5.0 merge  
						
						
						
						
					 
					
						2005-02-03 13:18:30 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						bcac063558 
					 
					
						
						
							
							Fix merge of func_str tests (accidently duplicated a test).  
						
						
						
						
					 
					
						2005-02-02 09:05:52 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5f0c4ff140 
					 
					
						
						
							
							Merge fixes for  #8248 ,  #5569 .  
						
						
						
						
					 
					
						2005-02-02 08:21:11 -08:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						0fb0dab4ca 
					 
					
						
						
							
							func_str.result, func_str.test:  
						
						... 
						
						
						
						Added a test case for bug #7751 .
item_strfunc.cc:
  Fixed bug #7751 .
  The function Item_func_conv::val_str did not update
  the unsigned_flag value. 
						
						
					 
					
						2005-02-01 23:34:31 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						e86457cef0 
					 
					
						
						
							
							Fix QUOTE() to not reuse the input field for output, which resulted in  
						
						... 
						
						
						
						incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248 ) 
						
						
					 
					
						2005-02-01 18:29:10 -08:00 
						 
				 
			
				
					
						
							
							
								bar@deer.(none) 
							
						 
					 
					
						
						
							
						
						3b7eb23e6b 
					 
					
						
						
							
							func_str.result:  
						
						... 
						
						
						
						after merge fix 
						
						
					 
					
						2005-01-17 13:23:56 +04:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						e7e5e8b1e7 
					 
					
						
						
							
							user_var.result, func_str.result, item_strfunc.cc:  
						
						... 
						
						
						
						bug#7839 ncorrect collation for char(ascii('a')) 
						
						
					 
					
						2005-01-17 10:38:35 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1e88bdbf90 
					 
					
						
						
							
							Streamlined code for trim, ltrim and rtrim  
						
						... 
						
						
						
						Portability fixes 
						
						
					 
					
						2005-01-02 23:31:37 +02:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						a04fc26c54 
					 
					
						
						
							
							manually merged  
						
						
						
						
					 
					
						2004-12-31 15:26:24 +01:00 
						 
				 
			
				
					
						
							
							
								timour@mysql.com 
							
						 
					 
					
						
						
							
						
						064c73490b 
					 
					
						
						
							
							Fix for BUG#7455.  
						
						... 
						
						
						
						The fix checks if the trim string argument is NULL. If so, the standard
mandates that the function result must be also NULL. 
						
						
					 
					
						2004-12-28 11:57:56 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						ca74ce3398 
					 
					
						
						
							
							additional 4.0 -> 4.1 merge !!  
						
						
						
						
					 
					
						2004-12-25 00:07:22 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						f385e79ad4 
					 
					
						
						
							
							4.0 -> 4.1 merge  
						
						
						
						
					 
					
						2004-12-24 23:07:10 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						3c5a325897 
					 
					
						
						
							
							Fix for a bug  #7495  
						
						
						
						
					 
					
						2004-12-23 21:08:54 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						e409ebf143 
					 
					
						
						
							
							A fix for the bug  #7495  
						
						
						
						
					 
					
						2004-12-22 21:31:17 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						4f4bbfc279 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2004-12-22 13:54:39 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d16c9e8615 
					 
					
						
						
							
							getting rid of now() is tests  
						
						
						
						
					 
					
						2004-12-11 09:39:29 +01:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						6772f0a721 
					 
					
						
						
							
							A fix for a crashing bug  #7101 , which occures when the  
						
						... 
						
						
						
						expression involving LEFT() function is used in GROUP BY
field. 
						
						
					 
					
						2004-12-10 00:17:43 +02:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						f90caa5826 
					 
					
						
						
							
							- VARCHAR(n) with binary character set is now displayed as VARBINARY(N).  
						
						... 
						
						
						
						- CREATE TABLE t1 SELECT BINARY 'literal'
  now creates a VARBINARY() column, not a BINARY(). 
						
						
					 
					
						2004-12-08 14:03:29 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						563500994a 
					 
					
						
						
							
							Update results for new varchar handling  
						
						... 
						
						
						
						Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length 
						
						
					 
					
						2004-12-07 15:47:00 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						6cf9ea2c9a 
					 
					
						
						
							
							Add back data that bk loosed during automatic merge  
						
						
						
						
					 
					
						2004-11-12 21:42:44 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						63da075081 
					 
					
						
						
							
							Merge with 4.1 to get latest fix to client_test.c  
						
						
						
						
					 
					
						2004-11-12 21:27:52 +02:00 
						 
				 
			
				
					
						
							
							
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						fe0b00985f 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2004-11-12 20:38:58 +02:00 
						 
				 
			
				
					
						
							
							
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						98df9313c0 
					 
					
						
						
							
							A fix (bug  #6564 : QUOTE(NULL) returns NULL, not the string 'NULL')  
						
						
						
						
					 
					
						2004-11-11 18:20:40 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						47bbf768d4 
					 
					
						
						
							
							Fixes after merge with 4.1  
						
						... 
						
						
						
						FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete 
						
						
					 
					
						2004-11-03 12:39:38 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						afbe601302 
					 
					
						
						
							
							merge with 4.1  
						
						
						
						
					 
					
						2004-10-29 19:26:52 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						84d4c4eb05 
					 
					
						
						
							
							fixed printing of substring_index (BUG#5911)  
						
						
						
						
					 
					
						2004-10-21 13:11:15 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						6239edc1d1 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code 
						
						
					 
					
						2004-10-07 10:50:13 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						62f3cd6a31 
					 
					
						
						
							
							Merge with 4.0 for 4.1 release  
						
						... 
						
						
						
						Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied 
						
						
					 
					
						2004-10-06 19:14:33 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						f2941380c4 
					 
					
						
						
							
							Strict mode & better warnings  
						
						... 
						
						
						
						Under strict mode MySQL will generate an error message if there was any conversion when assigning data to a field.
Added checking of date/datetime fields.
If strict mode, give error if we have not given value to field without a default value (for INSERT) 
						
						
					 
					
						2004-09-28 20:08:00 +03:00 
						 
				 
			
				
					
						
							
							
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						2488b827de 
					 
					
						
						
							
							A fix (bug  #5498  TRIM fails with LEADING or TRAILING if remstr = str).  
						
						
						
						
					 
					
						2004-09-13 14:25:43 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e67fcee270 
					 
					
						
						
							
							Update after merge  
						
						
						
						
					 
					
						2004-09-09 14:55:28 +03:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						87537752e2 
					 
					
						
						
							
							"SELECT BINARY x" now means "SELECT CAST(x AS BINARY)".  
						
						
						
						
					 
					
						2004-08-26 16:31:37 +05:00 
						 
				 
			
				
					
						
							
							
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						74c64904c7 
					 
					
						
						
							
							A fix (Bug  #4878 : Service crashes on query execution)  
						
						
						
						
					 
					
						2004-08-12 11:28:39 +05:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						cbff743b2d 
					 
					
						
						
							
							Final patch for WL#1600(warn if max_allowed_packet used)  
						
						
						
						
					 
					
						2004-07-21 21:27:45 +05:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						5bff13bc72 
					 
					
						
						
							
							Merging  
						
						
						
						
					 
					
						2004-07-21 19:10:37 +05:00