pem@mysql.com 
							
						 
					 
					
						
						
							
						
						337238b78a 
					 
					
						
						
							
							Merging 4.1->5.0  
						
						 
						
						
						
						
					 
					
						2003-10-22 16:10:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b93c83ee2a 
					 
					
						
						
							
							Bug#1271 - RAND_TABLE_BIT in expression and only const_tables in join  
						
						 
						
						
						
						
					 
					
						2003-10-21 17:34:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						f944fd4a65 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-10-21 11:58:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9d294b869e 
					 
					
						
						
							
							correct table name assigned to temporary table field:  
						
						 
						
						... 
						
						
						
						- correct table name shown in EXPLAIN Iindex reference)
 - pointer on freed memmory (reallocation of table name in reusing table entry) can't be used in EXPLAIN
(BUG#1584) 
						
						
					 
					
						2003-10-19 14:25:33 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						c7d8977f43 
					 
					
						
						
							
							fix for one of the bugs spotted by  #1274  
						
						 
						
						
						
						
					 
					
						2003-10-16 17:00:09 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a7bdd19707 
					 
					
						
						
							
							subqueries made printable  
						
						 
						
						... 
						
						
						
						new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274) 
						
						
					 
					
						2003-10-16 15:54:47 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						50d9b95b77 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-10-15 12:25:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						461d1627b3 
					 
					
						
						
							
							merge with 4.0 for more memory allocation variables.  
						
						 
						
						
						
						
					 
					
						2003-10-13 15:50:30 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c60a75e9ba 
					 
					
						
						
							
							Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)  
						
						 
						
						
						
						
					 
					
						2003-10-11 23:26:39 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c95d142f8f 
					 
					
						
						
							
							Add new user variables for tuning memory usage:  
						
						 
						
						... 
						
						
						
						query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization 
						
						
					 
					
						2003-10-11 22:00:24 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8cc3951c8f 
					 
					
						
						
							
							key_map with more that 64 bits width  
						
						 
						
						
						
						
					 
					
						2003-10-11 13:06:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@laptop.sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						99fe76453e 
					 
					
						
						
							
							samall optimisation (any independent query will not save data for rexecution)  
						
						 
						
						... 
						
						
						
						saving/restoring join_tab array (to save it of chnging by create_sort_index() before reexecuting)
(BUG#1523) 
						
						
					 
					
						2003-10-10 21:49:48 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						d37a5c4dd7 
					 
					
						
						
							
							Indentation cleanups  
						
						 
						
						... 
						
						
						
						Remove wait_if_global_read_lock on commit as this can cause deadlocks 
						
						
					 
					
						2003-10-08 21:50:05 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dc6f07256c 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into narttu.mysql.fi:/my/mysql-4.1 
						
						
					 
					
						2003-10-08 18:55:34 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						9e57c12b5a 
					 
					
						
						
							
							Fixed bug in error handling of CREATE ... SELECT  
						
						 
						
						... 
						
						
						
						More tests cases
After merge fixes 
						
						
					 
					
						2003-10-08 18:53:31 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						359d40f2f5 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-10-07 21:41:07 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						1f8e38d03a 
					 
					
						
						
							
							Merge with 4.0 to get fix for mysqlbinlog  
						
						 
						
						
						
						
					 
					
						2003-10-07 21:41:06 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@laptop.sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1324a97f63 
					 
					
						
						
							
							Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1 
						
						
					 
					
						2003-10-07 21:01:57 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						6112853cda 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						Multiple tablespaces for InnoDB
sql_table.cc:
  Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
sql_update.cc, sql_select.cc, my_base.h:
  More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS 
						
						
					 
					
						2003-10-07 17:28:59 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						6056cfadfc 
					 
					
						
						
							
							Merge with 4.0.16  
						
						 
						
						
						
						
					 
					
						2003-10-07 15:42:26 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4b491cb788 
					 
					
						
						
							
							Simple optimization  
						
						 
						
						
						
						
					 
					
						2003-10-07 13:26:56 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						795e14871d 
					 
					
						
						
							
							Fixed bug  #1323  (varchar fields becoming char fields adter create ... select)  
						
						 
						
						
						
						
					 
					
						2003-10-03 17:54:32 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						8d884c02bb 
					 
					
						
						
							
							Merging 4.1 -> 5.0  
						
						 
						
						
						
						
					 
					
						2003-09-24 11:29:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@laptop.sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a947a2bf53 
					 
					
						
						
							
							fixed processing aggregate functions with static tables (BUG#1318)  
						
						 
						
						
						
						
					 
					
						2003-09-20 18:30:36 +03: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						6fba16eabf 
					 
					
						
						
							
							Applied Monty corrections to the FULL SCAN  
						
						 
						
						... 
						
						
						
						optimiser bug patch. 
						
						
					 
					
						2003-09-17 21:52:05 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						de3019c61a 
					 
					
						
						
							
							comment made more explanatory  
						
						 
						
						
						
						
					 
					
						2003-09-16 21:20:16 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						29eec6c738 
					 
					
						
						
							
							join buffer cache usage/not usage is taken  
						
						 
						
						... 
						
						
						
						into account to increase the cost of FULL SCAN 
						
						
					 
					
						2003-09-16 04:04:54 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						ab576328f0 
					 
					
						
						
							
							Fixed bug in the optimiser for FULL TABLE SCAN case:  
						
						 
						
						... 
						
						
						
						to estimate correctly cost of full table scan we should take into
account rows read and skipped on each iteration. 
						
						
					 
					
						2003-09-15 22:21:39 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						46b8c3ea8b 
					 
					
						
						
							
							renamed join_types (as was suggested by Peter Gulutzan)  
						
						 
						
						
						
						
					 
					
						2003-09-14 09:40:57 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						0662489344 
					 
					
						
						
							
							removed double procedure deletetion  
						
						 
						
						
						
						
					 
					
						2003-09-13 10:30:41 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						462dba1b5b 
					 
					
						
						
							
							fixed memory leak (now JOIN cleaning procedure always called)  
						
						 
						
						
						
						
					 
					
						2003-09-13 02:07:06 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						04c43fca8e 
					 
					
						
						
							
							Optimize thai character handling  
						
						 
						
						... 
						
						
						
						Remove sel000xxxx tests
After merge fixes 
						
						
					 
					
						2003-09-12 04:18:07 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7538242e4f 
					 
					
						
						
							
							merge with 4.1 tree  
						
						 
						
						
						
						
					 
					
						2003-09-11 20:31:40 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						73f66f68fd 
					 
					
						
						
							
							merge with 4.0.15  
						
						 
						
						
						
						
					 
					
						2003-09-11 20:24:14 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						45aa92c574 
					 
					
						
						
							
							After merge fixes.  
						
						 
						
						... 
						
						
						
						Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code) 
						
						
					 
					
						2003-09-11 19:06:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						813d81c726 
					 
					
						
						
							
							removing additional IN subquery condition  
						
						 
						
						... 
						
						
						
						fixed IN optimisation bug 
						
						
					 
					
						2003-09-08 21:58:09 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						493d5f9504 
					 
					
						
						
							
							bug#926 fix undone - it caused suboptimal execution plan for "range ON, no WHERE" query  
						
						 
						
						... 
						
						
						
						Another fix applied 
						
						
					 
					
						2003-09-05 11:42:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4b3b4b9250 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-09-03 19:53:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						755455e15c 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-09-03 12:07:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b2c83e7f03 
					 
					
						
						
							
							workaround for IN's special treatment of first argument. Not for 4.1  
						
						 
						
						
						
						
					 
					
						2003-09-01 14:18:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						334841d902 
					 
					
						
						
							
							tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg)  
						
						 
						
						
						
						
					 
					
						2003-08-29 16:24:03 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						77a70a0a24 
					 
					
						
						
							
							merge with 4.0.15  
						
						 
						
						
						
						
					 
					
						2003-08-29 13:44:35 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						96cb167d28 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1 
						
						
					 
					
						2003-08-28 20:38:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						4808a6d9f2 
					 
					
						
						
							
							oom protection  
						
						 
						
						
						
						
					 
					
						2003-08-28 12:37:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@laptop.sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ec8d6d05de 
					 
					
						
						
							
							enum renamed (asked for compilation under windows)  
						
						 
						
						
						
						
					 
					
						2003-08-28 13:21:30 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@laptop.sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3d2a3804a1 
					 
					
						
						
							
							reset() split in 2 function clear() & add()  
						
						 
						
						... 
						
						
						
						aggregate function reinitialization (if no rows was found) made with help of clear()
(fixed BUG#860) 
						
						
					 
					
						2003-08-28 03:10:14 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						566ebb63ce 
					 
					
						
						
							
							merge fixes  
						
						 
						
						
						
						
					 
					
						2003-08-27 14:36:38 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						1d0b539263 
					 
					
						
						
							
							Fix for bug in ROLLUP when all tables where 'const' tables (Bug  #714 )  
						
						 
						
						
						
						
					 
					
						2003-08-26 20:23:48 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						7f158dd12a 
					 
					
						
						
							
							Merge 4.1 into 5.0  
						
						 
						
						
						
						
					 
					
						2003-08-26 11:51:09 +02:00