jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						f463143158 
					 
					
						
						
							
							Update tests and test results after merge, disable broken NDB tests  
						
						 
						
						
						
						
					 
					
						2005-03-11 15:06:03 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						eaea82d3af 
					 
					
						
						
							
							Merge query_cache tests  
						
						 
						
						
						
						
					 
					
						2005-03-11 12:38:38 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						50f9fc3368 
					 
					
						
						
							
							Merge test and results  
						
						 
						
						
						
						
					 
					
						2005-03-11 11:07:32 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						df84c534dd 
					 
					
						
						
							
							Flush entries from the query cache for tables used in  
						
						 
						
						... 
						
						
						
						administrative statements that may alter the table, such
as REPAIR TABLE. (Bug #8480 ) 
						
						
					 
					
						2005-03-07 18:15:19 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						50266af38c 
					 
					
						
						
							
							wl#1629 SHOW with WHERE(final part, after review)  
						
						 
						
						... 
						
						
						
						added syntax:
  'show variables where', 'show status where', 'show open tables where' 
						
						
					 
					
						2004-12-30 15:20:40 +03: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3493f54a5e 
					 
					
						
						
							
							Merge with 4.0  
						
						 
						
						
						
						
					 
					
						2004-10-27 19:52:41 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ded12c828d 
					 
					
						
						
							
							Check of temporary tables hiding for query fetched from QC (BUG#6084)  
						
						 
						
						
						
						
					 
					
						2004-10-21 23:56:12 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5f857a7a82 
					 
					
						
						
							
							Blob support for the group_concat() function.  
						
						 
						
						... 
						
						
						
						(Bug #4315 : GROUP_CONCAT with ORDER BY returns strange results for TEXT fields
 Bug #5564 : Strange behaviour with group_concat and distinct
 Bug #5970 : group_concat doesn't print warnings) 
						
						
					 
					
						2004-10-10 12:10:53 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						24e1464d5a 
					 
					
						
						
							
							information about different variables agged to query cache (BUG#5515, BUG#5394)  
						
						 
						
						
						
						
					 
					
						2004-09-10 16:28:18 +03: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1e31199995 
					 
					
						
						
							
							Merge with 4.1.3-beta  
						
						 
						
						
						
						
					 
					
						2004-07-07 11:29:39 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								paul@kite-hub.kitebird.com 
							
						 
					 
					
						
						
							
						
						f4dbb250fd 
					 
					
						
						
							
							Language/consistency edits to error messages  
						
						 
						
						... 
						
						
						
						and affected test results. 
						
						
					 
					
						2004-06-15 15:38:36 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						71eddc362e 
					 
					
						
						
							
							Merging 4.1 to 5.0.  
						
						 
						
						
						
						
					 
					
						2004-05-26 17:04:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4c774e0c18 
					 
					
						
						
							
							fixed flags of printed query  
						
						 
						
						
						
						
					 
					
						2004-05-13 23:47:20 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						d42b145817 
					 
					
						
						
							
							Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc  
						
						 
						
						... 
						
						
						
						merged manually by guilhem. 
						
						
					 
					
						2004-04-28 12:08:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						dfd59e296e 
					 
					
						
						
							
							Merge 4.1 -> 5.0.  
						
						 
						
						
						
						
					 
					
						2004-04-07 19:07:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						e3a619f005 
					 
					
						
						
							
							null processing for character_set_results (BUG#3296)  
						
						 
						
						
						
						
					 
					
						2004-03-30 23:38:56 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						6395822932 
					 
					
						
						
							
							Fixed BUG#3117: LAST_INSERT_ID() works incorrectly inside stored procedure.  
						
						 
						
						... 
						
						
						
						This turned out to be a problem for prepared statements as well; the id was
evaluated once, at parse time. 
						
						
					 
					
						2004-03-25 17:42:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f34a642d6e 
					 
					
						
						
							
							after merge fixes  
						
						 
						
						
						
						
					 
					
						2004-03-18 00:09:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						350b433569 
					 
					
						
						
							
							merge with 4.0  
						
						 
						
						
						
						
					 
					
						2004-03-16 22:41:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d03034d306 
					 
					
						
						
							
							invalidation of locking for write tables (BUG#2693)  
						
						 
						
						... 
						
						
						
						fixed linking query_prealloc_size to query cache presence 
						
						
					 
					
						2004-03-04 18:32:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f43093ec0e 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						... 
						
						
						
						Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t) 
						
						
					 
					
						2004-02-16 10:03:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						f9e73c7716 
					 
					
						
						
							
							Post-merge fixes.  
						
						 
						
						
						
						
					 
					
						2004-02-11 18:21:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						c8585f3283 
					 
					
						
						
							
							Merge 4.1 into 5.0.  
						
						 
						
						
						
						
					 
					
						2004-02-10 18:44:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						06432eac36 
					 
					
						
						
							
							Added --compact to mysqlbinlog  
						
						 
						
						... 
						
						
						
						Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned 
						
						
					 
					
						2004-02-09 12:31:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						41323e8b76 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-drop-4.1 
						
						
					 
					
						2004-01-17 10:02:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						99e0ae85c7 
					 
					
						
						
							
							Merge 4.1 to 5.0.  
						
						 
						
						
						
						
					 
					
						2003-12-19 18:03:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e0cc6799ec 
					 
					
						
						
							
							Merge with 4.0.17  
						
						 
						
						
						
						
					 
					
						2003-12-17 17:35:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						975061bb5a 
					 
					
						
						
							
							Merge 4.1 to 5.0.  
						
						 
						
						
						
						
					 
					
						2003-12-16 16:12:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						fcf96dbb18 
					 
					
						
						
							
							WorkLog#1323  
						
						 
						
						... 
						
						
						
						Deprecate the use of TYPE=... Preferred syntax is ENGINE= 
						
						
					 
					
						2003-12-10 04:31:42 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ccb07a4fbb 
					 
					
						
						
							
							fixed length of current database name if it is dropped (BUG#1986)  
						
						 
						
						
						
						
					 
					
						2003-12-04 23:57:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a1ceb1bd04 
					 
					
						
						
							
							database invalidation invalidate queries only of given database (BUG#1898)  
						
						 
						
						
						
						
					 
					
						2003-11-20 18:12:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						5b355ea6f5 
					 
					
						
						
							
							Post-merge fixes.  
						
						 
						
						
						
						
					 
					
						2003-11-19 16:59:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						28a2c6a96b 
					 
					
						
						
							
							Merging 4.1->5.0.  
						
						 
						
						
						
						
					 
					
						2003-11-19 15:19:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c9ae785bc3 
					 
					
						
						
							
							Delete duplicate error message names  
						
						 
						
						
						
						
					 
					
						2003-11-18 17:28:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6d350964dc 
					 
					
						
						
							
							word substitution in error messages removed - can create problems for i18n  
						
						 
						
						
						
						
					 
					
						2003-11-18 10:23:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f763d4c31d 
					 
					
						
						
							
							Removed some warnings reported by valgrind  
						
						 
						
						... 
						
						
						
						After merge fixes.
Now code compiles, but there is still some valgrind warnings that needs to be fixed 
						
						
					 
					
						2003-11-04 14:09:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4e4725377d 
					 
					
						
						
							
							Merge with 4.0  
						
						 
						
						
						
						
					 
					
						2003-11-04 09:40:36 +02: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c43ac24bf7 
					 
					
						
						
							
							after-merge fix  
						
						 
						
						
						
						
					 
					
						2003-10-26 22:01:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						692609537d 
					 
					
						
						
							
							Post-merge fixes.  
						
						 
						
						
						
						
					 
					
						2003-10-23 16:06:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						337238b78a 
					 
					
						
						
							
							Merging 4.1->5.0  
						
						 
						
						
						
						
					 
					
						2003-10-22 16:10:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@laptop.sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						f836a796c4 
					 
					
						
						
							
							added worning about changing requested size of query cache (BUG#1502)  
						
						 
						
						
						
						
					 
					
						2003-10-09 00:13:15 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						9023009ae3 
					 
					
						
						
							
							query_cache.result, query_cache.test:  
						
						 
						
						... 
						
						
						
						Character set variables test 
						
						
					 
					
						2003-10-08 10:18:38 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.telia.com 
							
						 
					 
					
						
						
							
						
						6e55a3428a 
					 
					
						
						
							
							Post-merge fixes.  
						
						 
						
						
						
						
					 
					
						2003-09-24 15:26:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						8d884c02bb 
					 
					
						
						
							
							Merging 4.1 -> 5.0  
						
						 
						
						
						
						
					 
					
						2003-09-24 11:29:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						702b5ad4d6 
					 
					
						
						
							
							fixed server crash on moving query block with pointers to same table in it (BUG#988)  
						
						 
						
						... 
						
						
						
						removed server options 
						
						
					 
					
						2003-09-15 15:16:13 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						77a70a0a24 
					 
					
						
						
							
							merge with 4.0.15  
						
						 
						
						
						
						
					 
					
						2003-08-29 13:44:35 +03:00