peter@mysql.com 
							
						 
					 
					
						
						
							
						
						925155cf5a 
					 
					
						
						
							
							Merge....  
						
						
						
						
					 
					
						2002-11-24 17:26:26 +03:00 
						 
				 
			
				
					
						
							
							
								peter@mysql.com 
							
						 
					 
					
						
						
							
						
						35ccfd0b42 
					 
					
						
						
							
							SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit  
						
						... 
						
						
						
						done for merge with newer version of code. 
						
						
					 
					
						2002-11-24 17:07:53 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						065f3e572c 
					 
					
						
						
							
							lock option in table list  
						
						
						
						
					 
					
						2002-11-23 18:54:15 +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 
							
						 
					 
					
						
						
							
						
						806294c573 
					 
					
						
						
							
							Fixes after merge with 4.0  
						
						
						
						
					 
					
						2002-11-21 22:25:53 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dac6498f9b 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2002-11-21 15:56:48 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						305d16a7cb 
					 
					
						
						
							
							Automatic conversion from CHAR(length) to BLOB when length > 255  
						
						... 
						
						
						
						New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0 
						
						
					 
					
						2002-11-21 02:07:14 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						1a96948e81 
					 
					
						
						
							
							Small improvement to alloc_root  
						
						... 
						
						
						
						Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE 
						
						
					 
					
						2002-11-16 20:19:10 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7f4ee30de1 
					 
					
						
						
							
							Fixed bugs pointed by "Crash with 'big' derivated table in MySQL-4.1" bugreport  
						
						... 
						
						
						
						- fixed switching from heap to MyISAM table
 - fixed error handler 
						
						
					 
					
						2002-11-16 00:01:48 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						979f27ee4a 
					 
					
						
						
							
							fixed bug in cyclic reference refinition  
						
						
						
						
					 
					
						2002-11-14 09:43:24 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						41d9311621 
					 
					
						
						
							
							fixed cyclic reference bug  
						
						
						
						
					 
					
						2002-11-14 00:26:18 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7f514010e5 
					 
					
						
						
							
							fixed possible bug  
						
						
						
						
					 
					
						2002-11-13 13:07:58 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d8f1d74fe5 
					 
					
						
						
							
							fixed bug of derived table in subselect  
						
						... 
						
						
						
						fixed bug in error handling 
						
						
					 
					
						2002-11-13 11:59:03 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						abec0225fc 
					 
					
						
						
							
							small fix  
						
						
						
						
					 
					
						2002-11-12 17:41:31 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7e7939ee03 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1 
						
						
					 
					
						2002-11-12 15:27:11 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						7bd4fb813a 
					 
					
						
						
							
							some code cleanup as per CTO's instructions plus  a small bug fix with  
						
						... 
						
						
						
						a corresponding test case.... 
						
						
					 
					
						2002-11-12 14:40:32 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7187fa9ed4 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1 
						
						
					 
					
						2002-11-12 14:00:38 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						c6b0d33619 
					 
					
						
						
							
							some bug fixes related to derived tables  
						
						
						
						
					 
					
						2002-11-11 17:45:23 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						62e4aca91b 
					 
					
						
						
							
							fixed select_lex & max_join_size parameters with BIG_TABLES  
						
						
						
						
					 
					
						2002-11-11 17:28:58 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						876f3f4d30 
					 
					
						
						
							
							Fixed that NULL and 0 returns 0 instead of NULL  
						
						... 
						
						
						
						This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL 
						
						
					 
					
						2002-11-11 15:57:35 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						89adb79aad 
					 
					
						
						
							
							small bug fix  
						
						
						
						
					 
					
						2002-11-11 14:04:50 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						d96c670c70 
					 
					
						
						
							
							Some code optimisations related to EXPLAIN of derived tables and the  
						
						... 
						
						
						
						resulting code cleanup in our main loop. 
						
						
					 
					
						2002-11-09 15:40:46 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c78ae20589 
					 
					
						
						
							
							ALL/ANY/SOME  
						
						... 
						
						
						
						decreasing number of rules in sql_yacc.yy to satisfy bison limitation
fixed subselect Items initializer methods 
						
						
					 
					
						2002-11-07 23:45:19 +02:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						aa4e165808 
					 
					
						
						
							
							Portability fix extern "C" static -> extern "C"  
						
						
						
						
					 
					
						2002-11-07 12:49:02 +02:00 
						 
				 
			
				
					
						
							
							
								monty@butch. 
							
						 
					 
					
						
						
							
						
						890b39bb68 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2002-11-07 12:49:01 +02:00 
						 
				 
			
				
					
						
							
							
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						25bd1e9a37 
					 
					
						
						
							
							Merged by hands  
						
						
						
						
					 
					
						2002-11-07 12:20:08 +04:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						db6cbba239 
					 
					
						
						
							
							Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0  
						
						
						
						
					 
					
						2002-11-07 04:03:44 +02: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 
						 
				 
			
				
					
						
							
							
								monty@butch. 
							
						 
					 
					
						
						
							
						
						a2bdf9265f 
					 
					
						
						
							
							Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.  
						
						
						
						
					 
					
						2002-11-07 03:54:00 +02:00 
						 
				 
			
				
					
						
							
							
								peter@mysql.com 
							
						 
					 
					
						
						
							
						
						21066bde1b 
					 
					
						
						
							
							Merge mysql.com:/home/pz/mysql/mysql-4.1-root  
						
						... 
						
						
						
						into mysql.com:/home/pz/mysql/mysql-4.1 
						
						
					 
					
						2002-11-06 12:51:07 +03:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.(none) 
							
						 
					 
					
						
						
							
						
						98579955d6 
					 
					
						
						
							
							Merge sgluhov@work.mysql.com:/home/bk/mysql-4.0  
						
						... 
						
						
						
						into gluh.(none):/home/gluh/mysql-4.0.bklast 
						
						
					 
					
						2002-11-06 12:19:06 +04:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8229d282f7 
					 
					
						
						
							
							Extensions to support this:  
						
						... 
						
						
						
						SHOW CREATE DATABASE [IF NOT EXISTS] dbname
Version dependant parts are displayed in appropriative comments:
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `ucs` /*!40100 DEFAULT CHARACTER SET ucs2*/ 
						
						
					 
					
						2002-11-06 12:01:38 +04:00 
						 
				 
			
				
					
						
							
							
								peter@mysql.com 
							
						 
					 
					
						
						
							
						
						8bcace7043 
					 
					
						
						
							
							Merge mysql.com:/home/pz/mysql/mysql-4.1-root  
						
						... 
						
						
						
						into mysql.com:/home/pz/mysql/mysql-4.1 
						
						
					 
					
						2002-11-05 21:31:03 +03:00 
						 
				 
			
				
					
						
							
							
								peter@mysql.com 
							
						 
					 
					
						
						
							
						
						ecedc7ac35 
					 
					
						
						
							
							More work on secure authentication. Commit for merge  
						
						
						
						
					 
					
						2002-11-05 20:21:55 +03:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.(none) 
							
						 
					 
					
						
						
							
						
						7bf903ea10 
					 
					
						
						
							
							Error code for ssl connection  
						
						... 
						
						
						
						Fix bug when server hang(with SSL, with modified libmysql)
Add options master-ssl-capath and master-ssl-cipher
Add some error checking(SSL) 
						
						
					 
					
						2002-11-05 12:05:58 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						45f098bf60 
					 
					
						
						
							
							moved similar code to function  
						
						... 
						
						
						
						onversion with check 
						
						
					 
					
						2002-11-04 22:12:45 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						bb49de5ff5 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1 
						
						
					 
					
						2002-11-04 15:45:54 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c94b39134f 
					 
					
						
						
							
							Fixed error handling bug  
						
						
						
						
					 
					
						2002-11-04 00:56:25 +02:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						2bcd60e113 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2002-10-31 10:44:20 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						26c6d970d9 
					 
					
						
						
							
							Merge sinisa@work.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into sinisa.nasamreza.org:/mnt/work/mysql-4.1 
						
						
					 
					
						2002-10-30 16:59:49 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						5fbd7b63c5 
					 
					
						
						
							
							changes for mysqladmin debug  
						
						... 
						
						
						
						and a bug fix for derived tables 
						
						
					 
					
						2002-10-30 16:52:12 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1f20cf3b42 
					 
					
						
						
							
							removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM)  
						
						... 
						
						
						
						fixed some possible bugs 
						
						
					 
					
						2002-10-30 13:18:52 +02:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						1e0538324d 
					 
					
						
						
							
							Added back old LARGEFILE handling  
						
						... 
						
						
						
						Fixed reference to freed memory in acl_init()/grant_init()
Fixed possible memory leak. (Could only happen in very strange circumstances)
Fixed bug in ALTER TABLE with BDB tables
Updated mysql-test for valgrind 
						
						
					 
					
						2002-10-29 21:59:03 +02:00 
						 
				 
			
				
					
						
							
							
								vva@genie.(none) 
							
						 
					 
					
						
						
							
						
						9adf688be6 
					 
					
						
						
							
							add help command on server side  
						
						
						
						
					 
					
						2002-10-28 17:44:19 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c3127c7eb8 
					 
					
						
						
							
							code cleanup  
						
						... 
						
						
						
						fixed subselect error handling bug
fixed subselect UNION ALL bug
fixed thd->lex.select restoring
explain UNION subselect bug 
						
						
					 
					
						2002-10-26 20:18:37 +03:00 
						 
				 
			
				
					
						
							
							
								nick@mysql.com 
							
						 
					 
					
						
						
							
						
						6c22ca4454 
					 
					
						
						
							
							Added Rand_log_event  
						
						
						
						
					 
					
						2002-10-24 16:48:34 -06:00 
						 
				 
			
				
					
						
							
							
								nick@mysql.com 
							
						 
					 
					
						
						
							
						
						d749b832b2 
					 
					
						
						
							
							Added Rand_log_event  
						
						
						
						
					 
					
						2002-10-22 15:17:17 -06: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 
							
						 
					 
					
						
						
							
						
						e37639814b 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2002-10-17 11:39:11 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						6561faa10e 
					 
					
						
						
							
							Some small accelerations ...  
						
						... 
						
						
						
						I intend to do some more accelerations in mysql_execute_command and
in SQLCOM_SELECT part for which I need to fix EXPLAIN with derived
tables plus few additional items. If this proves to be much I wil
just make it a new SCRUM task 
						
						
					 
					
						2002-10-16 21:17:57 +03:00