kostja@bodhi.(none) 
							
						 
					 
					
						
						
							
						
						6044940b25 
					 
					
						
						
							
							Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime  
						
						... 
						
						
						
						into  bodhi.(none):/opt/local/work/mysql-5.1-runtime 
						
						
					 
					
						2007-06-01 20:06:13 +04:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.(none) 
							
						 
					 
					
						
						
							
						
						b9a3431048 
					 
					
						
						
							
							Fix more mysqltest warnings.  
						
						
						
						
					 
					
						2007-06-01 20:05:34 +04:00 
						 
				 
			
				
					
						
							
							
								holyfoot/hf@hfmain.(none) 
							
						 
					 
					
						
						
							
						
						44331376e7 
					 
					
						
						
							
							Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt  
						
						... 
						
						
						
						into  mysql.com:/d2/hf/mrg/mysql-5.1-opt 
						
						
					 
					
						2007-05-18 22:12:06 +05:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						11e5fa8f71 
					 
					
						
						
							
							added cleanup to some tests  
						
						
						
						
					 
					
						2007-05-18 17:48:44 +02:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@mysql.com/ramil.myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						bc1805891c 
					 
					
						
						
							
							Merge mysql.com:/home/ram/work/mysql-5.0-maint  
						
						... 
						
						
						
						into  mysql.com:/home/ram/work/b22824/my50-b22824 
						
						
					 
					
						2007-04-19 12:32:38 +05:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@ramil.myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						570aacac45 
					 
					
						
						
							
							Merge mysql.com:/home/ram/work/b22824/my50-b22824  
						
						... 
						
						
						
						into  mysql.com:/home/ram/work/b22824/my51-b22824 
						
						
					 
					
						2007-04-19 10:42:47 +05:00 
						 
				 
			
				
					
						
							
							
								igor@olga.mysql.com 
							
						 
					 
					
						
						
							
						
						e04289704d 
					 
					
						
						
							
							Merge olga.mysql.com:/home/igor/mysql-5.0-opt  
						
						... 
						
						
						
						into  olga.mysql.com:/home/igor/mysql-5.1-opt 
						
						
					 
					
						2007-04-11 15:12:49 -07:00 
						 
				 
			
				
					
						
							
							
								gluh@mysql.com/eagle.(none) 
							
						 
					 
					
						
						
							
						
						b80d373b6a 
					 
					
						
						
							
							Bug#27069 set with identical elements are created(additional fix)  
						
						... 
						
						
						
						issue an error in strict mode
if enum|set column has duplicates members in 'create table' 
						
						
					 
					
						2007-04-10 15:01:04 +05:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@mysql.com/ramil.myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						73f0c5d7c6 
					 
					
						
						
							
							Merge mysql.com:/home/ram/work/mysql-5.0-maint  
						
						... 
						
						
						
						into  mysql.com:/home/ram/work/b26359/b26359.5.0 
						
						
					 
					
						2007-03-29 11:06:15 +05:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@ramil.myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						95b58449f9 
					 
					
						
						
							
							Merge mysql.com:/home/ram/work/b26359/b26359.5.0  
						
						... 
						
						
						
						into  mysql.com:/home/ram/work/b26359/b26359.5.1 
						
						
					 
					
						2007-03-29 09:38:46 +05:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@mysql.com/ramil.myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						e3c34c9cbf 
					 
					
						
						
							
							Fix for bugs  
						
						... 
						
						
						
						#27176 : Assigning a string to an year column has unexpected results
#26359 : Strings becoming truncated and converted to numbers under STRICT mode
Problems: 
1. storing a string to an integer field we don't check 
   if strntoull10rnd() returns MY_ERRNO_EDOM error.
   Fix: check for MY_ERRNO_EDOM.
2. storing a string to an year field we use my_strntol() function.
   Fix: use strntoull10rnd() instead. 
					
						2007-03-29 09:08:30 +05:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@ramil.myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						5add691aa3 
					 
					
						
						
							
							Merge mysql.com:/home/ram/work/b25301/b25301.5.0  
						
						... 
						
						
						
						into  mysql.com:/home/ram/work/b25301/b25301.5.1 
						
						
					 
					
						2007-02-08 13:02:53 +04:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@mysql.com/ramil.myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						505ec52b04 
					 
					
						
						
							
							After merge fix.  
						
						... 
						
						
						
						Reverted fix for 19370 DateTime datatype in MySQL has two bugs in it
as it's not a bug. 
						
						
					 
					
						2007-02-08 12:53:18 +04:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@mysql.com/ramil.myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						d779739834 
					 
					
						
						
							
							Fix for bug  #22824 : strict, datetime, NULL, wrong warning  
						
						... 
						
						
						
						During optimization we replace NULL with 0 for not null 
date{time} fields, so uset MODE_NO_ZERO_DATE flag for a while 
as we don't want to give extra warnings. 
						
						
					 
					
						2006-12-21 13:53:34 +04:00 
						 
				 
			
				
					
						
							
							
								monty@nosik.monty.fi 
							
						 
					 
					
						
						
							
						
						89570bf966 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-5.0  
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.1 
						
						
					 
					
						2006-11-22 14:11:36 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com/nosik.monty.fi 
							
						 
					 
					
						
						
							
						
						e825879800 
					 
					
						
						
							
							Remove compiler warnings  
						
						... 
						
						
						
						(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #) 
						
						
					 
					
						2006-11-20 22:42:06 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3cfbe36adc 
					 
					
						
						
							
							After merge fix  
						
						
						
						
					 
					
						2006-10-03 16:00:09 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com/bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						07f9efd1e1 
					 
					
						
						
							
							Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2  
						
						... 
						
						
						
						into  mysql.com:/usr/home/bar/mysql-5.0.b6147rpl 
						
						
					 
					
						2006-09-29 16:40:18 +05:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.local 
							
						 
					 
					
						
						
							
						
						04c97488f9 
					 
					
						
						
							
							Merge bodhi.local:/opt/local/work/tmp_merge  
						
						... 
						
						
						
						into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge 
						
						
					 
					
						2006-08-12 21:06:51 +04:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com/bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						29bc5cc179 
					 
					
						
						
							
							Bug#6147: Traditional: Assigning a string to a numeric column has unexpected results  
						
						... 
						
						
						
						The problem was that when converting a string to an exact number,
rounding didn't work, because conversion didn't understand
approximate numbers notation.
Fix: a new function for string-to-number conversion was implemented,
which is aware of approxinate number notation (with decimal point
and exponent, e.g. -19.55e-1) 
						
						
					 
					
						2006-07-20 13:41:12 +05:00 
						 
				 
			
				
					
						
							
							
								gluh@myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						f76aec6d90 
					 
					
						
						
							
							Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge  
						
						... 
						
						
						
						into  myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1 
						
						
					 
					
						2006-07-18 18:43:55 +05:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@mysql.com/myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						794fe3435c 
					 
					
						
						
							
							Fix for bug  #19370 : DateTime datatype in MySQL has two bugs in it  
						
						
						
						
					 
					
						2006-07-12 11:38:11 +05:00 
						 
				 
			
				
					
						
							
							
								gluh@eagle.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						a230166f28 
					 
					
						
						
							
							Fix for bug#13934 Silent truncation of table comments  
						
						... 
						
						
						
						Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols
Table 'comment' is changed from char* to LEX_STRING 
						
						
					 
					
						2006-06-29 18:39:34 +05:00 
						 
				 
			
				
					
						
							
							
								gluh@mysql.com 
							
						 
					 
					
						
						
							
						
						023317d68a 
					 
					
						
						
							
							after merge fix  
						
						
						
						
					 
					
						2006-05-25 19:20:34 +05:00 
						 
				 
			
				
					
						
							
							
								gluh@eagle.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						474ef8ed43 
					 
					
						
						
							
							Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode  
						
						... 
						
						
						
						transfer NO_DEFAULT_VALUE_FLAG flag to new field 
						
						
					 
					
						2006-05-23 13:27:45 +05:00 
						 
				 
			
				
					
						
							
							
								gluh@eagle.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						21cc3ae561 
					 
					
						
						
							
							Fix for bug#11491 Misleading error message if not NULL column set to NULL,  
						
						... 
						
						
						
						SQL mode TRADITIONAL
  Message is chenged from 'ER_WARN_NULL_TO_NOTNULL' to 'ER_BAD_NULL_ERROR' 
						
						
					 
					
						2005-12-01 15:30:11 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f348f62cc3 
					 
					
						
						
							
							Added option --valgrind-mysqltest to mysql-test-run  
						
						... 
						
						
						
						Added flag to Field::store(longlong) to specify if value is unsigned.
This fixes bug #12750 : Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
Fixed warning from valgrind in CREATE ... SELECT
Fixed double free of mysql.options if reconnect failed 
						
						
					 
					
						2005-09-14 01:41:44 +03:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						305dc01078 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316 
						
						
					 
					
						2005-09-01 17:15:37 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						4b47ebcfc9 
					 
					
						
						
							
							mysqltest improvements, updates after merge + test for 5.0  
						
						
						
						
					 
					
						2005-09-01 17:01:23 +02:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						e43dff67f5 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into  mysql.com:/usr/home/ram/work/mysql-5.0 
						
						
					 
					
						2005-07-27 15:09:06 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						afb1ad8415 
					 
					
						
						
							
							a fix (bug  #11546 : Bad error message from inserting out of range values, SQL_MODE='tradition').  
						
						
						
						
					 
					
						2005-07-26 12:18:35 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						efc8404a40 
					 
					
						
						
							
							fix (bug  #11964 : ALTER TABLE gives wrong error message with sql-mode TRADITIONAL (timestamp)).  
						
						
						
						
					 
					
						2005-07-25 14:36:07 +05:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						d7fbff3ec5 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.0-5906  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-07-19 19:59:34 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						dd2f631ec4 
					 
					
						
						
							
							Fix number to date conversion so it always honors the NO_ZERO_DATE,  
						
						... 
						
						
						
						NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906 ) 
						
						
					 
					
						2005-07-18 16:12:44 -07:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						b11d04e50a 
					 
					
						
						
							
							a fix (bug  #9881 : ALTER TABLE gives wrong error message with sql-mode TRADITIONAL).  
						
						
						
						
					 
					
						2005-07-15 15:50:57 +05: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 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						152f751831 
					 
					
						
						
							
							fix (Bug  #8295  and  #8296 : varchar and varbinary conversion)  
						
						... 
						
						
						
						select, gis & gis-tree tests fails at the moment, but
I will push this CS because it was tested before and I'm absolutely
sure it's right. 
						
						
					 
					
						2005-05-12 15:56:04 +05:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						b95cb4e654 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-04-05 19:45:34 -07:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						b18ca48c47 
					 
					
						
						
							
							Additional fix for BUG#5907: Traditional mode: invalid value can be inserted via a stored procedure  
						
						... 
						
						
						
						... make the handler catch too. 
						
						
					 
					
						2005-04-05 15:49:10 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1be0a0c82a 
					 
					
						
						
							
							Now one gets an error if one tries to insert an invalid value via a stored procedure in STRICT mode. (Bug  #5907 )  
						
						
						
						
					 
					
						2005-04-05 00:32:48 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						5ba3f707f7 
					 
					
						
						
							
							Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly  
						
						... 
						
						
						
						Fix that mysql.proc works with new VARCHAR fields
Give warnings for wrong zero dates 
						
						
					 
					
						2005-04-04 16:43:25 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						ec06f3e762 
					 
					
						
						
							
							a fix (bug  #9029  Traditional: Wrong SQLSTATE returned for string truncation).  
						
						
						
						
					 
					
						2005-03-10 17:08:45 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ee8c7a3eb5 
					 
					
						
						
							
							After merge fixes  
						
						
						
						
					 
					
						2005-02-22 18:30:40 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						530eecbd99 
					 
					
						
						
							
							Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa 
						
						
					 
					
						2005-02-17 14:00:44 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						5ddb6354a5 
					 
					
						
						
							
							after merge fixes  
						
						
						
						
					 
					
						2005-02-16 17:34:02 +01:00 
						 
				 
			
				
					
						
							
							
								mleich@mysql.com 
							
						 
					 
					
						
						
							
						
						cb56fcaa94 
					 
					
						
						
							
							Removal of a not needed statement  
						
						
						
						
					 
					
						2005-02-14 14:20:43 +01:00 
						 
				 
			
				
					
						
							
							
								mleich@mysql.com 
							
						 
					 
					
						
						
							
						
						48bc6d477d 
					 
					
						
						
							
							Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src  
						
						... 
						
						
						
						into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-WL1420 
						
						
					 
					
						2005-02-09 11:00:15 +01:00