acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						445bc1336e 
					 
					
						
						
							
							Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3  
						
						 
						
						... 
						
						
						
						into  xiphis.org:/usr/home/antony/work2/p2-bug10109.4 
						
						
					 
					
						2005-08-10 22:17:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						015447b211 
					 
					
						
						
							
							Bug#10109  
						
						 
						
						... 
						
						
						
						"INSERT .. SELECT ... ON DUPLICATE KEY UPDATE fails"
  Ensure that check_insert_fields() is only called once when
  doing an INSERT..SELECT 
						
						
					 
					
						2005-08-07 03:16:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						86d7b02199 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2005-07-03 14:17:52 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						83f90e060e 
					 
					
						
						
							
							Better bug fix for:  
						
						 
						
						... 
						
						
						
						#9728   'Decreased functionality in "on duplicate key update
#8147   'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'
This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part 
						
						
					 
					
						2005-06-27 16:46:41 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								evgen@moonbone.local 
							
						 
					 
					
						
						
							
						
						dc65464688 
					 
					
						
						
							
							insert_update.result, insert_update.test, sql_base.cc:  
						
						 
						
						... 
						
						
						
						Fix for bugfix #9728  merge 
						
						
					 
					
						2005-06-23 03:51:10 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						9db45adb60 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2005-05-14 18:31:22 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						beb5867dfb 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						
						
						
					 
					
						2005-05-14 16:24:36 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								antony@ltantony.mysql.com 
							
						 
					 
					
						
						
							
						
						4fe845e8d0 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-05-07 16:50:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								antony@ltantony.mysql.com 
							
						 
					 
					
						
						
							
						
						1ebc9e37ea 
					 
					
						
						
							
							Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update"  
						
						 
						
						... 
						
						
						
						INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
  Fix so that protocol doesn't break by properly ignoring dups. 
						
						
					 
					
						2005-05-07 13:31:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						647eaaea1d 
					 
					
						
						
							
							Bug#8147  
						
						 
						
						... 
						
						
						
						Merge from 4.1 
						
						
					 
					
						2005-02-17 17:38:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						a1bf1c926e 
					 
					
						
						
							
							Bug#8147  
						
						 
						
						... 
						
						
						
						Fix ambigious table error for INSERT..SELECT..UPDATE 
						
						
					 
					
						2005-02-17 01:33:59 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						4f4bbfc279 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-12-22 13:54:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						9818cadd1b 
					 
					
						
						
							
							WL#2274 - INSERT..SELECT..UPDATE  
						
						 
						
						... 
						
						
						
						UPDATE clause conflicts with SELECT for use of item_list field.
  Alter UPDATE clause to use new lex field update_list
  Tests included 
						
						
					 
					
						2004-12-13 12:26:28 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1e3f10a4b1 
					 
					
						
						
							
							mark subquery in the FROM clause like derived and quoate all identifiers (BUG#4609)  
						
						 
						
						
						
						
					 
					
						2004-07-20 08:48:28 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4c774e0c18 
					 
					
						
						
							
							fixed flags of printed query  
						
						 
						
						
						
						
					 
					
						2004-05-13 23:47:20 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						189761bcd3 
					 
					
						
						
							
							actions for bug  
						
						 
						
						... 
						
						
						
						#2709  Affected Rows for ON DUPL. KEY undocumented, perheps illogical 
1. added COPY_INFO::updated to work with it in
   'insert .. on duplicate' instead of COPY_INFO::deleted
2. added affected rows to output of "info:" in mysqltest.c 
						
						
					 
					
						2004-03-15 21:36:16 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						33346e26af 
					 
					
						
						
							
							added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()  
						
						 
						
						... 
						
						
						
						added string length for more speed
made code covarage for print() method of Item
fixed printability of some items (SCRUM) (WL#1274) 
						
						
					 
					
						2003-10-30 12:57:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						23145cfed7 
					 
					
						
						
							
							Added SQLSTATE to client/server protocol  
						
						 
						
						... 
						
						
						
						bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86 
						
						
					 
					
						2003-06-04 18:28:51 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						784fb81426 
					 
					
						
						
							
							INSERT ... UPDATE ... VALUES()  
						
						 
						
						
						
						
					 
					
						2003-05-03 01:16:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						564487d7c0 
					 
					
						
						
							
							it's INSERT ... ON DUPLICATE KEY UPDATE , not INSERT ON DUPLICATE KEY UPDATE SET  
						
						 
						
						
						
						
					 
					
						2002-12-02 22:04:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						451440f930 
					 
					
						
						
							
							one more test  
						
						 
						
						
						
						
					 
					
						2002-12-02 21:12:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						2320923a7b 
					 
					
						
						
							
							INSERT ... ON DUPLICATE KEY UPDATE ...  
						
						 
						
						
						
						
					 
					
						2002-12-02 20:38:00 +01:00