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 
						 
				 
			
				
					
						
							
							
								pem@mysql.telia.com 
							
						 
					 
					
						
						
							
						
						08e5a7e135 
					 
					
						
						
							
							Post-merge fixes.  
						
						
						
						
					 
					
						2003-08-26 17:41:40 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						7f158dd12a 
					 
					
						
						
							
							Merge 4.1 into 5.0  
						
						
						
						
					 
					
						2003-08-26 11:51:09 +02: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 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						19efafcc13 
					 
					
						
						
							
							allow to look up queries with leading comments  
						
						
						
						
					 
					
						2003-07-18 16:34:50 +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 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4d87fd0346 
					 
					
						
						
							
							fixed bug 209 (SQL_SELECT_LIMIT and query cache incompatibility)  
						
						
						
						
					 
					
						2003-03-31 09:49:09 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						e4bc744d9b 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-qcvar-4.1 
						
						
					 
					
						2003-03-28 16:18:26 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						439ac36d52 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-show-4.0 
						
						
					 
					
						2003-03-28 15:36:42 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7d09120105 
					 
					
						
						
							
							After merge fixes  
						
						
						
						
					 
					
						2003-03-27 14:15:42 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						3bed7a6131 
					 
					
						
						
							
							Merge with 4.0.13  
						
						
						
						
					 
					
						2003-03-26 18:37:38 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8103c4c537 
					 
					
						
						
							
							CONVERT class was removed  
						
						
						
						
					 
					
						2003-03-18 17:01:32 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						95c4b297b6 
					 
					
						
						
							
							do not allow to cache queries with INTO clause  
						
						
						
						
					 
					
						2003-03-06 17:37:12 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						b2f27a155c 
					 
					
						
						
							
							made variable query_cache_min_res_unit from QUERY_CACHE_MIN_RESULT_DATA_SIZE (SCRUM)  
						
						
						
						
					 
					
						2003-03-02 21:39:03 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4352b9953a 
					 
					
						
						
							
							fixed SQL_SELECT option with UNIONs  
						
						
						
						
					 
					
						2003-02-27 22:26:09 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						9a46698e1e 
					 
					
						
						
							
							Merge with 4.0.11  
						
						
						
						
					 
					
						2003-02-26 01:03:47 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						05bbea4b25 
					 
					
						
						
							
							fixed invalidation of query cache on LOAD DATA  
						
						
						
						
					 
					
						2003-02-14 22:20:38 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						023d6dd39b 
					 
					
						
						
							
							Merge with 4.0.11  
						
						
						
						
					 
					
						2003-02-04 21:52:14 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9ec97f2c08 
					 
					
						
						
							
							fixed table invalidation in simple renaming  
						
						
						
						
					 
					
						2003-01-24 01:54:39 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						1f6ecc0cd3 
					 
					
						
						
							
							Changed mysql-test to print warnings for not existing table to DROP TABLE  
						
						... 
						
						
						
						Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print() 
						
						
					 
					
						2003-01-06 01:48:59 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						1e2bec8009 
					 
					
						
						
							
							aliases with multi-table updates / deletes  
						
						... 
						
						
						
						fix for a bug with derived tables and query cache
ix for a charset bug in timestamp 
						
						
					 
					
						2002-12-28 21:34:17 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						64047ea9a7 
					 
					
						
						
							
							new status variable (number of queries deleted because of low memory)  
						
						
						
						
					 
					
						2002-11-17 20:41:25 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						8d252004dc 
					 
					
						
						
							
							fixed query cache with system database  
						
						... 
						
						
						
						FN_NO_CASE_SENCE used instead of __WIN__ in table name handling of quary cache 
						
						
					 
					
						2002-10-08 00:26:15 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						011fed6059 
					 
					
						
						
							
							Fixed bug in query cache after temporary table creation.  
						
						
						
						
					 
					
						2002-08-07 15:29:49 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						fd0989e76a 
					 
					
						
						
							
							fixed query cahe resize bug  
						
						
						
						
					 
					
						2002-07-28 22:36:34 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dddc20d9d1 
					 
					
						
						
							
							New SET syntax & system variables.  
						
						... 
						
						
						
						Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups 
						
						
					 
					
						2002-07-23 18:31:22 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						11920dbbe7 
					 
					
						
						
							
							New result block allocation strategy  
						
						
						
						
					 
					
						2002-01-12 15:40:52 +02:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						4b877e0088 
					 
					
						
						
							
							Added macros for nice TIMESPEC usage.  
						
						... 
						
						
						
						Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX. 
						
						
					 
					
						2002-01-02 21:29:41 +02:00