bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						44d8a8cdab 
					 
					
						
						
							
							merging  
						
						
						
						
					 
					
						2003-01-25 13:19:46 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d56e23f64e 
					 
					
						
						
							
							fixed subselects with temporary tables (SCRUM)  
						
						... 
						
						
						
						fixed memory leacks 
						
						
					 
					
						2003-01-25 02:25:52 +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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						529e4a76c5 
					 
					
						
						
							
							Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1  
						
						
						
						
					 
					
						2003-01-18 19:31:37 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c66302c23b 
					 
					
						
						
							
							Superfluous prepare_for_resend bugfix  
						
						
						
						
					 
					
						2003-01-18 16:20:22 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						76f146a175 
					 
					
						
						
							
							Merge with 4.0.9  
						
						
						
						
					 
					
						2003-01-18 03:13:37 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f4b950df96 
					 
					
						
						
							
							Merge with 3.23  
						
						
						
						
					 
					
						2003-01-16 20:47:46 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						96089e2b3a 
					 
					
						
						
							
							resolving conflicts  
						
						
						
						
					 
					
						2003-01-15 13:15:35 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c59bff7c96 
					 
					
						
						
							
							SCRUM  
						
						... 
						
						
						
						embedded library trimming 
						
						
					 
					
						2003-01-15 12:11:44 +04: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 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f9772317ee 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-01-04 15:40:55 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6d6f051178 
					 
					
						
						
							
							Added support for DROP TEMPORARY TABLE  
						
						... 
						
						
						
						Removed mysql_warnings() API function.
Post merge fixes. 
						
						
					 
					
						2003-01-04 15:37:20 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7c0a074614 
					 
					
						
						
							
							merging  
						
						
						
						
					 
					
						2002-12-31 12:55:03 +02:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						c26dfb9bd6 
					 
					
						
						
							
							Merge work.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into myvenu.com:/home/venu/bk/src-4.1 
						
						
					 
					
						2002-12-30 15:16:12 -08:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						d5631610db 
					 
					
						
						
							
							pure coverage test updates  
						
						
						
						
					 
					
						2002-12-30 15:10:10 -08:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						6ab60981e8 
					 
					
						
						
							
							Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1  
						
						... 
						
						
						
						into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1 
						
						
					 
					
						2002-12-30 01:59:08 +04:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						1dcca480e8 
					 
					
						
						
							
							processing thread specific queries  
						
						
						
						
					 
					
						2002-12-30 01:46:48 +04:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						2e0b01b315 
					 
					
						
						
							
							sql_table.cc:  
						
						... 
						
						
						
						Fix CREATE LIKE TABLE .. temporary case 
						
						
					 
					
						2002-12-28 01:38:29 -08:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						fe9e139056 
					 
					
						
						
							
							postreview fix (SCRUM)  
						
						... 
						
						
						
						fixed layout 
						
						
					 
					
						2002-12-28 01:01:05 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						afa028dc01 
					 
					
						
						
							
							Updated comment  
						
						
						
						
					 
					
						2002-12-26 16:35:15 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						d8c700891e 
					 
					
						
						
							
							Merging&testing  
						
						
						
						
					 
					
						2002-12-17 19:33:25 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c1e69d2cca 
					 
					
						
						
							
							Merging  
						
						
						
						
					 
					
						2002-12-16 18:58:55 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3517febe97 
					 
					
						
						
							
							Resolving merge conflicts  
						
						
						
						
					 
					
						2002-12-12 12:49:56 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						dcb5293576 
					 
					
						
						
							
							Some fixes  
						
						
						
						
					 
					
						2002-12-12 12:16:34 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d3eb993a27 
					 
					
						
						
							
							rename of net_pkg.cc to protocol.cc  
						
						... 
						
						
						
						Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements. 
						
						
					 
					
						2002-12-11 09:17:51 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f1d35b29bc 
					 
					
						
						
							
							merge fix  
						
						
						
						
					 
					
						2002-12-06 21:15:05 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						859b688476 
					 
					
						
						
							
							Merge with 4.0.6  
						
						
						
						
					 
					
						2002-12-05 19:38:42 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2435dce96d 
					 
					
						
						
							
							Merge with 3.23  
						
						
						
						
					 
					
						2002-12-05 03:52:53 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						5331a7ef8e 
					 
					
						
						
							
							some code cleanup  
						
						
						
						
					 
					
						2002-12-04 21:39:15 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						d527bfbd59 
					 
					
						
						
							
							A fix for double free'd pointer bug ...  
						
						
						
						
					 
					
						2002-12-04 20:51:18 +02:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						91558620e0 
					 
					
						
						
							
							Return a warning for DROP DATABASE/TABLE IF EXISTS <non_existing_db/table(s)>  
						
						
						
						
					 
					
						2002-12-04 03:19:08 -08:00 
						 
				 
			
				
					
						
							
							
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						5e8b27c0d3 
					 
					
						
						
							
							Pull conflicts resolutions  
						
						
						
						
					 
					
						2002-11-29 12:35:48 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dac6498f9b 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2002-11-21 15:56:48 +02:00 
						 
				 
			
				
					
						
							
							
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						4b73222d5a 
					 
					
						
						
							
							row0mysql.c, row0mysql.h, ha_innodb.cc, sql_table.cc, handler.h:  
						
						... 
						
						
						
						Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp 
						
						
					 
					
						2002-11-19 16:27:26 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						4e6f5f2d12 
					 
					
						
						
							
							few small bug fixes ...  
						
						
						
						
					 
					
						2002-11-15 16:37:44 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						eb96421a11 
					 
					
						
						
							
							corrected error message for OPTIMIZE/ANALYZE/etc,  
						
						... 
						
						
						
						also for InnoDB that supports CHECK table but not REPAIR 
						
						
					 
					
						2002-11-08 22:22:23 +01:00 
						 
				 
			
				
					
						
							
							
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						25bd1e9a37 
					 
					
						
						
							
							Merged by hands  
						
						
						
						
					 
					
						2002-11-07 12:20:08 +04:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						65badfff1a 
					 
					
						
						
							
							Put temporary files in binlog cache when using BEGIN/COMMIT  
						
						... 
						
						
						
						Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE 
						
						
					 
					
						2002-11-07 04:02:37 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						1a1cafce63 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2002-10-25 22:07:04 +00:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						dede6634f6 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2002-10-25 21:15:52 +00:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						440db4c1dc 
					 
					
						
						
							
							ENUM/SET fields now have charset too  
						
						
						
						
					 
					
						2002-10-25 15:08:47 +05:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						95aef91521 
					 
					
						
						
							
							BINARY charset is now used instead of binary_flag  
						
						
						
						
					 
					
						2002-10-25 13:58:32 +05:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						36afa9a96e 
					 
					
						
						
							
							Fixed problem with BDB tables and ALTER TABLE  
						
						
						
						
					 
					
						2002-10-24 01:29:29 +03:00 
						 
				 
			
				
					
						
							
							
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						a6b0579fcd 
					 
					
						
						
							
							Some code improvements  
						
						
						
						
					 
					
						2002-10-23 16:55:35 +05:00 
						 
				 
			
				
					
						
							
							
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						8a88791fb1 
					 
					
						
						
							
							Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into genie.(none):/home/hf/work/mysql-4.1 
						
						
					 
					
						2002-10-18 15:55:21 +05:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						b1f99ce4a2 
					 
					
						
						
							
							Added THD as parameter to filesort.  Removed not used 'special' argument.  
						
						
						
						
					 
					
						2002-10-16 17:21:47 +03:00 
						 
				 
			
				
					
						
							
							
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						55866b0615 
					 
					
						
						
							
							Huge pull  
						
						
						
						
					 
					
						2002-10-07 15:38:07 +05:00