jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						ac8f9d3864 
					 
					
						
						
							
							Fix test cases  
						
						
						
						
					 
					
						2005-07-05 15:19:04 -07:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						54662b4487 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-07-04 01:36:06 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						b49b5805eb 
					 
					
						
						
							
							abort storing query to query cache if warnings appeared (BUG#9414)  
						
						
						
						
					 
					
						2005-06-28 00:52:21 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						28a93877ca 
					 
					
						
						
							
							temporary tables of subquery in the from clause just skipped during processing QC tables (BUG#11522)  
						
						
						
						
					 
					
						2005-06-23 20:06:35 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						78ff49437f 
					 
					
						
						
							
							Manually resolve merge  
						
						
						
						
					 
					
						2005-04-29 08:46:03 -07:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						b0dd388190 
					 
					
						
						
							
							Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796  
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-4.1-merges 
						
						
					 
					
						2005-04-11 09:53:54 +04:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						06e3647274 
					 
					
						
						
							
							Fix for bug  #9796  "Query Cache caches queries with CURRENT_USER()  
						
						... 
						
						
						
						function".
We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function. 
						
						
					 
					
						2005-04-11 00:30:23 +04:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						1476213e52 
					 
					
						
						
							
							Fix crash in embedded server due to incorrect storage of results  
						
						... 
						
						
						
						in the query cache. (Bug #9549 ) 
						
						
					 
					
						2005-03-31 19:17:45 -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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								paul@kite-hub.kitebird.com 
							
						 
					 
					
						
						
							
						
						f4dbb250fd 
					 
					
						
						
							
							Language/consistency edits to error messages  
						
						... 
						
						
						
						and affected test results. 
						
						
					 
					
						2004-06-15 15:38:36 -05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4c774e0c18 
					 
					
						
						
							
							fixed flags of printed query  
						
						
						
						
					 
					
						2004-05-13 23:47:20 +03: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e0cc6799ec 
					 
					
						
						
							
							Merge with 4.0.17  
						
						
						
						
					 
					
						2003-12-17 17:35:34 +02: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						efa85aad49 
					 
					
						
						
							
							Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files.  
						
						
						
						
					 
					
						2003-08-22 04:07:40 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2263e3e51f 
					 
					
						
						
							
							Merge with 4.0.14  
						
						
						
						
					 
					
						2003-08-11 22:44:43 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ddd3ee8b27 
					 
					
						
						
							
							rewritten test using loop (BUG#930)  
						
						... 
						
						
						
						removed unused field (now it is in variables) 
						
						
					 
					
						2003-08-08 23:27:22 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						86e6cf399e 
					 
					
						
						
							
							support of more then 255 tables dependence in query cache (fixed BUG#930)  
						
						
						
						
					 
					
						2003-07-30 14:59:56 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						376f026550 
					 
					
						
						
							
							tabe & query hashes made case insensitive (BUG#933)  
						
						
						
						
					 
					
						2003-07-28 18:28:44 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						c21728f8c8 
					 
					
						
						
							
							Cleaner implementation if INSERT ... SELECT with same tables  
						
						... 
						
						
						
						Tests cleanup (put drop database first in tests) 
						
						
					 
					
						2003-07-03 11:55:36 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f5bb1e0907 
					 
					
						
						
							
							After merge fix  
						
						
						
						
					 
					
						2003-06-04 23:17:01 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						40109c574a 
					 
					
						
						
							
							Merge with 4.0.13  
						
						
						
						
					 
					
						2003-06-04 19:21:51 +03: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 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						2848e6c0d4 
					 
					
						
						
							
							fixed bug 549 - incorect query cache memory formating on very small query cache sizes  
						
						
						
						
					 
					
						2003-05-31 01:41:11 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6aa8929cf3 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Added initialization of all important global variables 
						
						
					 
					
						2003-05-21 21:39:58 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00