hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						5f8e7fef27 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-09-26 15:40:26 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						ba8fa76fa2 
					 
					
						
						
							
							SCRUM:  
						
						 
						
						... 
						
						
						
						WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server 
						
						
					 
					
						2003-09-26 15:33:13 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						a2dbfaefa3 
					 
					
						
						
							
							SCRUM  
						
						 
						
						... 
						
						
						
						embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea? 
						
						
					 
					
						2003-09-19 14:44:31 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@laptop.sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7a86c7df28 
					 
					
						
						
							
							Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1 
						
						
					 
					
						2003-08-26 16:42:49 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						7f158dd12a 
					 
					
						
						
							
							Merge 4.1 into 5.0  
						
						 
						
						
						
						
					 
					
						2003-08-26 11:51:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						6250e76381 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1 
						
						
					 
					
						2003-08-12 23:45:53 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						57bb575d49 
					 
					
						
						
							
							fixed query cache intercommunication with innodb engine  
						
						 
						
						
						
						
					 
					
						2003-08-12 23:45:04 +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 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.telia.com 
							
						 
					 
					
						
						
							
						
						a8a29a39d2 
					 
					
						
						
							
							Merging 4.1 into 5.0 (second pass; post-merge fixes).  
						
						 
						
						... 
						
						
						
						One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-( 
						
						
					 
					
						2003-07-09 17:07:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.telia.com 
							
						 
					 
					
						
						
							
						
						9c3a7a6ba3 
					 
					
						
						
							
							Merge 4.1 into 5.0 (first pass).  
						
						 
						
						
						
						
					 
					
						2003-07-08 17:50:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a3fe7c0959 
					 
					
						
						
							
							Remove compiler warnings  
						
						 
						
						... 
						
						
						
						Simple cleanup of previous pull 
						
						
					 
					
						2003-07-04 23:06:19 +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@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						 
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						afd581edd3 
					 
					
						
						
							
							made lex a pointer in THD  
						
						 
						
						
						
						
					 
					
						2003-05-05 14:54:37 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						35c82164f6 
					 
					
						
						
							
							Merged 4.1 to 5.0.  
						
						 
						
						
						
						
					 
					
						2003-04-29 12:06:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						12181f6f6e 
					 
					
						
						
							
							fixed bug in processing transaction in query cache (inserted lost lines)  
						
						 
						
						
						
						
					 
					
						2003-04-20 22:18:32 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						64da2fff67 
					 
					
						
						
							
							Post post-merge fix.  
						
						 
						
						
						
						
					 
					
						2003-04-17 00:34:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						5ea922aab0 
					 
					
						
						
							
							merging  
						
						 
						
						
						
						
					 
					
						2003-04-16 20:35:29 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5d4e9f95f2 
					 
					
						
						
							
							Merging  
						
						 
						
						
						
						
					 
					
						2003-04-08 19:43:24 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mysql@home.(none) 
							
						 
					 
					
						
						
							
						
						6a948b8363 
					 
					
						
						
							
							sql_cache.cc:  
						
						 
						
						... 
						
						
						
						Cast to unsigned char 
						
						
					 
					
						2003-04-05 07:59:10 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						688aaf4152 
					 
					
						
						
							
							sql_cache.cc:  
						
						 
						
						... 
						
						
						
						Windows compilation fix 
						
						
					 
					
						2003-04-03 14:52:12 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						0ee0589e93 
					 
					
						
						
							
							Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into genie.(none):/home/hf/work/mysql-5.0.kil 
						
						
					 
					
						2003-03-31 13:42:37 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						f8f0b70380 
					 
					
						
						
							
							SCRUM  
						
						 
						
						... 
						
						
						
						two KILL commands implementation (version 2) 
						
						
					 
					
						2003-03-31 13:39:46 +05: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8103c4c537 
					 
					
						
						
							
							CONVERT class was removed  
						
						 
						
						
						
						
					 
					
						2003-03-18 17:01:32 +04: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1de8a5996f 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1 
						
						
					 
					
						2003-02-18 16:28:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						316097e17b 
					 
					
						
						
							
							aftermerging fix  
						
						 
						
						
						
						
					 
					
						2003-02-18 16:27:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						e327393e9d 
					 
					
						
						
							
							Fixed a lot of wrong memory references as reported by valgrind  
						
						 
						
						... 
						
						
						
						Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now. 
						
						
					 
					
						2003-02-12 21:55:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7467708611 
					 
					
						
						
							
							fixed compiler error  
						
						 
						
						
						
						
					 
					
						2003-01-29 21:17:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7436e9ec97 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-01-21 21:28:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						25c393a12e 
					 
					
						
						
							
							Portability fixes (for windows)  
						
						 
						
						... 
						
						
						
						Some changes to the prepared statement protocol to make it easier to use and faster. 
						
						
					 
					
						2003-01-21 21:07:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						389680e04e 
					 
					
						
						
							
							Conflicts resolving  
						
						 
						
						
						
						
					 
					
						2003-01-20 18:59:45 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						1f6b615677 
					 
					
						
						
							
							SCRUM  
						
						 
						
						... 
						
						
						
						embedded-related changes 
						
						
					 
					
						2003-01-20 18:47:25 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1dde85db7c 
					 
					
						
						
							
							using internal name conversion in query cache as it was suggested by Shurik  
						
						 
						
						
						
						
					 
					
						2003-01-17 15:36:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						96089e2b3a 
					 
					
						
						
							
							resolving conflicts  
						
						 
						
						
						
						
					 
					
						2003-01-15 13:15:35 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						5988ae5ca5 
					 
					
						
						
							
							Many fixes.  
						
						 
						
						... 
						
						
						
						I still have to make a test case for :
UPDATE from sub-select with derived table 
						
						
					 
					
						2002-12-24 13:58:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e3b3b68307 
					 
					
						
						
							
							Big purge about embedded library (scrum)  
						
						 
						
						
						
						
					 
					
						2002-12-16 17:33:29 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3103bca9b2 
					 
					
						
						
							
							merging  
						
						 
						
						
						
						
					 
					
						2002-12-11 19:53:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						ae2192ed53 
					 
					
						
						
							
							Moved safe_to_cache_query from thd to lex.  
						
						 
						
						... 
						
						
						
						This is required for prepared statements and stored procedures. 
						
						
					 
					
						2002-11-22 14:50:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dac6498f9b 
					 
					
						
						
							
							Merge with 4.0  
						
						 
						
						
						
						
					 
					
						2002-11-21 15:56:48 +02:00