bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						71a374dc13 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2004-05-14 13:33:02 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						116f61c656 
					 
					
						
						
							
							Don't automaticly generate a new key for a foreign key constraint if there is already a usable key.  
						
						... 
						
						
						
						Prefer not automatic keys before automatic keys. If there is two conf 
						
						
					 
					
						2004-05-12 00:29:52 +03:00 
						 
				 
			
				
					
						
							
							
								timour@mysql.com 
							
						 
					 
					
						
						
							
						
						f3dab7be12 
					 
					
						
						
							
							Merge of WL#1469 with latest bk sources.  
						
						
						
						
					 
					
						2004-05-11 12:15:58 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						bf45960eef 
					 
					
						
						
							
							Merge 4.1 -> 5.0  
						
						
						
						
					 
					
						2004-05-07 18:52:06 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3aae50e8c0 
					 
					
						
						
							
							EXPLAIN UNION using same routing which used for execution which allow return correct bug messages (Bug  #3639 )  
						
						... 
						
						
						
						EXPLAIN of hidden SELECT of UNION 
						
						
					 
					
						2004-05-06 20:40:21 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						e1182c5226 
					 
					
						
						
							
							Correction of WL#1567: row_count() is -1 following non-insert/update/delete  
						
						... 
						
						
						
						statements. 
						
						
					 
					
						2004-05-04 17:18:47 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						296ba0ea57 
					 
					
						
						
							
							WL#1567: Add ROW_COUNT() Function to retrieve count of rows updated/inserted/deleted  
						
						
						
						
					 
					
						2004-05-04 13:45:20 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						d4e9522962 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge 
						
						
					 
					
						2004-04-28 19:27:56 +04:00 
						 
				 
			
				
					
						
							
							
								marko@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						df5336a3cc 
					 
					
						
						
							
							Introduce keys in child tables corresponding to FOREIGN KEYs  
						
						... 
						
						
						
						Remove redundant keys in CREATE TABLE and ALTER TABLE 
						
						
					 
					
						2004-04-21 13:15:43 +03:00 
						 
				 
			
				
					
						
							
							
								magnus@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						7c2c408cb8 
					 
					
						
						
							
							Added NDB storage engine  
						
						
						
						
					 
					
						2004-04-15 09:14:14 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						a314cbefa1 
					 
					
						
						
							
							WL#1622 "SQL Syntax for Prepared Statements": post-review fixes:  
						
						... 
						
						
						
						Moved PS name to Statement class, Statement_map now handles name-to-statement resolution.
  Both named and unnamed statements are now executed in one function (sql_prepare.cc:execute_stmt)
  Fixed a problem: Malformed sequence of commands from client could cause server to use previously deleted objects.
  Some code cleanup and small fixes 
						
						
					 
					
						2004-04-13 01:58:48 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						ac563b1b8e 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2004-04-08 17:08:56 +04:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						dfd59e296e 
					 
					
						
						
							
							Merge 4.1 -> 5.0.  
						
						
						
						
					 
					
						2004-04-07 19:07:44 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						1f8505d66f 
					 
					
						
						
							
							Post-merge fixes  
						
						
						
						
					 
					
						2004-04-05 19:52:10 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						a8386d01c2 
					 
					
						
						
							
							Many files:  
						
						... 
						
						
						
						SQL Syntax for Prepared Statements (WL#1622)
ps.test, ps.result:
  new file 
						
						
					 
					
						2004-04-05 19:43:37 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1e4af935c1 
					 
					
						
						
							
							removed old way to prevent using stack tables for caching Items in PS  
						
						... 
						
						
						
						fixed error code in union test 
						
						
					 
					
						2004-04-04 03:05:44 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						de502e1df2 
					 
					
						
						
							
							removed unused field  
						
						... 
						
						
						
						layout fised
debug information added 
						
						
					 
					
						2004-04-01 23:27:22 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						5568155e04 
					 
					
						
						
							
							fix for table/field caching mechanism  
						
						... 
						
						
						
						save moving ON/USING tables conditions to WHERE clause (BUG#2794) 
						
						
					 
					
						2004-04-01 03:00:38 +03:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						90a5e244be 
					 
					
						
						
							
							To save 32KB memory per thread when --log-bin is not used, we do not  
						
						... 
						
						
						
						init the binlog_cache (THD::transaction.trans_log).
I have checked all places where trans_log is used, because as now
it may not be inited in some cases, we have to be cautious
(will forward this commit mail to Heikki). 
						
						
					 
					
						2004-03-26 19:11:37 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						53c810cda4 
					 
					
						
						
							
							merge fixes (use old code)  
						
						
						
						
					 
					
						2004-03-18 00:16:04 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						350b433569 
					 
					
						
						
							
							merge with 4.0  
						
						
						
						
					 
					
						2004-03-16 22:41:30 +02:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8d5430ef73 
					 
					
						
						
							
							Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into eagle.mysql.r18.ru:/home/vva/work/BUG_2709/mysql-4.1 
						
						
					 
					
						2004-03-16 17:14:09 +04:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						36120d420a 
					 
					
						
						
							
							Fix of compilation failure of latest 4.1 tree: new constants in mysqld.cc  
						
						... 
						
						
						
						exceed unsigned long limit. 
						
						
					 
					
						2004-03-15 22:39:36 +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 
							
						 
					 
					
						
						
							
						
						4c78e46351 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0 
						
						
					 
					
						2004-03-04 20:30:29 +02:00 
						 
				 
			
				
					
						
							
							
								jani@ua72d24.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						58a978b900 
					 
					
						
						
							
							Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog (replication is ok)  
						
						... 
						
						
						
						Setting insert delayed threads = 0 at mysql_init_command. 
						
						
					 
					
						2004-03-04 17:58:36 +00: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 
						 
				 
			
				
					
						
							
							
								konstantin@oak.local 
							
						 
					 
					
						
						
							
						
						8cc8b0ea5c 
					 
					
						
						
							
							Desperate attempt to push part of prepared statements cleanup which was  
						
						... 
						
						
						
						reviewed in Saint-Petersbourg (including post-review fixes). 
						
						
					 
					
						2004-03-02 22:39:50 +03:00 
						 
				 
			
				
					
						
							
							
								lenz@kallisto.local 
							
						 
					 
					
						
						
							
						
						24143abecf 
					 
					
						
						
							
							- fixed another HP-UX compile error ("Member 'set_item_arena' not declared  
						
						... 
						
						
						
						in class Statement") 
						
						
					 
					
						2004-02-28 17:34:22 +01:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c6c1efba7e 
					 
					
						
						
							
							after review changes  
						
						
						
						
					 
					
						2004-02-20 16:24:03 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a66b398eb8 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-02-17 11:12:55 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						f4d1ee971b 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-02-17 01:52:33 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3f86f10a57 
					 
					
						
						
							
							ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure  
						
						
						
						
					 
					
						2004-02-17 01:14:51 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						050af89dd8 
					 
					
						
						
							
							Merge with public tree  
						
						
						
						
					 
					
						2004-02-16 10:31:05 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						eb83bb374a 
					 
					
						
						
							
							Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into sinisa.nasamreza.org:/mnt/work/mysql-4.1 
						
						
					 
					
						2004-02-14 15:08:32 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						44b37b089a 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-02-14 13:31:39 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						5faf244b30 
					 
					
						
						
							
							Merge mysql.com:/home/pem/work/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/pem/work/mysql-5.0-merge 
						
						
					 
					
						2004-02-13 17:39:00 +01:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						c25fc5c664 
					 
					
						
						
							
							Another fix for  #2208  
						
						... 
						
						
						
						previous one had error 
						
						
					 
					
						2004-02-13 11:56:36 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						f20b775c63 
					 
					
						
						
							
							PS fixed to be compatible with derived tables (BUG#2641)  
						
						
						
						
					 
					
						2004-02-12 18:50:00 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						6777120d85 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-02-12 11:12:16 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						272bd74abb 
					 
					
						
						
							
							memory leacks in PS with subqueries fixed (adddition to fix of BUG#2462)  
						
						
						
						
					 
					
						2004-02-12 03:10:26 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						125fb04b87 
					 
					
						
						
							
							merge fixes  
						
						
						
						
					 
					
						2004-02-11 19:15:02 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ce14578909 
					 
					
						
						
							
							Merge with 4.0.18  
						
						
						
						
					 
					
						2004-02-11 00:06:46 +01:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						451e423be4 
					 
					
						
						
							
							Fixes for bugs  #2508  and  #2552  
						
						
						
						
					 
					
						2004-02-10 21:34:25 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						c8585f3283 
					 
					
						
						
							
							Merge 4.1 into 5.0.  
						
						
						
						
					 
					
						2004-02-10 18:44:02 +01:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						d7e3b89ce9 
					 
					
						
						
							
							Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-4.1.2208 
						
						
					 
					
						2004-02-10 19:33:04 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						348bd98e48 
					 
					
						
						
							
							Fix for  #2208  (multi-query returns wrong result in embedded library)  
						
						... 
						
						
						
						now we execute only one first select during mysql_real_query
others - during 'mysql_next_result' 
						
						
					 
					
						2004-02-10 17:09:59 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						cefdd4fec6 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-02-09 15:49:11 +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 
							
						 
					 
					
						
						
							
						
						69e2460bd4 
					 
					
						
						
							
							fixed subquery with PS (BUG#2462)  
						
						... 
						
						
						
						fixed UNION preparation 
						
						
					 
					
						2004-02-08 20:14:13 +02:00