ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						18cb2e8388 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-4.1-4100  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/mydev/mysql-5.0-5000 
						
						
					 
					
						2005-09-14 13:37:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						6e725adc00 
					 
					
						
						
							
							Bug#12920 - key_read_requests counter appears to re-set  
						
						 
						
						... 
						
						
						
						After merge fix. 
						
						
					 
					
						2005-09-14 13:18:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						a3eaf4eec2 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-08-15 12:37:45 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						194360397c 
					 
					
						
						
							
							Rename rest() macro in my_list.h to list_rest(). (Bug  #12327 )  
						
						 
						
						
						
						
					 
					
						2005-08-09 18:02:36 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						a9f6aab4c9 
					 
					
						
						
							
							Fixes while reviewing new code  
						
						 
						
						... 
						
						
						
						Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema 
						
						
					 
					
						2005-05-06 11:39:30 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						36998b7cb7 
					 
					
						
						
							
							Fixed Bug#8042, "mysqld crashes on sighup".  
						
						 
						
						
						
						
					 
					
						2005-02-17 14:07:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d35140a851 
					 
					
						
						
							
							First stage of table definition cache  
						
						 
						
						... 
						
						
						
						Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name 
						
						
					 
					
						2005-01-06 13:00:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						fe23df1a2b 
					 
					
						
						
							
							Added per thread status variables, after review, patch v1.1.  
						
						 
						
						
						
						
					 
					
						2004-09-13 16:48:01 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						5843eec521 
					 
					
						
						
							
							Manual merge  
						
						 
						
						
						
						
					 
					
						2004-05-29 20:55:46 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								timour@mysql.com 
							
						 
					 
					
						
						
							
						
						40f7f58855 
					 
					
						
						
							
							poratble printing of ha_rows values  
						
						 
						
						
						
						
					 
					
						2004-05-17 15:14:19 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						df69f93ae9 
					 
					
						
						
							
							Post-merge post-merge fix (new error codes for fparser).  
						
						 
						
						
						
						
					 
					
						2004-05-14 16:10:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						3b29cad05c 
					 
					
						
						
							
							Manual merge  
						
						 
						
						
						
						
					 
					
						2004-05-13 01:49:47 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						a46d7542c9 
					 
					
						
						
							
							This is first cset for WL#1394 "Optimize index merge when all involved index ranges include only values with equal keys"  
						
						 
						
						... 
						
						
						
						The main idea is to exploit the fact that key scans for "key=const" return ordered sequences of rowids. 
						
						
					 
					
						2004-05-13 01:38:40 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								timour@mysql.com 
							
						 
					 
					
						
						
							
						
						f3dab7be12 
					 
					
						
						
							
							Merge of WL#1469 with latest bk sources.  
						
						 
						
						
						
						
					 
					
						2004-05-11 12:15:58 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								timour@mysql.com 
							
						 
					 
					
						
						
							
						
						a840d8daad 
					 
					
						
						
							
							Complete implementation of WL#1469 "Greedy algorithm to search for an optimal execution plan",  
						
						 
						
						... 
						
						
						
						consisting of pos-review fixes and improvements. 
						
						
					 
					
						2004-05-10 15:48:50 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						bf45960eef 
					 
					
						
						
							
							Merge 4.1 -> 5.0  
						
						 
						
						
						
						
					 
					
						2004-05-07 18:52:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						5a78b4c746 
					 
					
						
						
							
							WL#1700 - Properly count key_blocks_used and key_blocks_current.  
						
						 
						
						... 
						
						
						
						Introduced a new free blocks list. Free blocks are now re-used before
new blocks are allocated from the pool. There is a new status variable 
which can be queried by "show status like key_blocks_unused". 
						
						
					 
					
						2004-05-03 15:55:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						dfd59e296e 
					 
					
						
						
							
							Merge 4.1 -> 5.0.  
						
						 
						
						
						
						
					 
					
						2004-04-07 19:07:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						4bc6b551f8 
					 
					
						
						
							
							false/true -> FALSE/TRUE  
						
						 
						
						... 
						
						
						
						Fixes after last merge 
						
						
					 
					
						2004-03-30 02:32:41 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						6e717133c5 
					 
					
						
						
							
							Merge 4.1 to 5.0  
						
						 
						
						
						
						
					 
					
						2003-12-01 16:14:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						30b3c3bf1b 
					 
					
						
						
							
							Merged, most likely needs post-merge fix  
						
						 
						
						
						
						
					 
					
						2003-11-21 00:27:54 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7c6113a39f 
					 
					
						
						
							
							Merge key cache structures to one  
						
						 
						
						... 
						
						
						
						Fixed compiler warnings (IRIX C compiler and VC++) 
						
						
					 
					
						2003-11-20 22:06:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						cab1dc628c 
					 
					
						
						
							
							CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS  
						
						 
						
						... 
						
						
						
						New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag. 
						
						
					 
					
						2003-11-18 13:47:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								psergey@psergey.(none) 
							
						 
					 
					
						
						
							
						
						4894565432 
					 
					
						
						
							
							merging in index_merge (in progress, not yet working)  
						
						 
						
						
						
						
					 
					
						2003-11-13 22:14:37 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								psergey@psergey.(none) 
							
						 
					 
					
						
						
							
						
						ca6c4cc30b 
					 
					
						
						
							
							Added index_merge access method  
						
						 
						
						
						
						
					 
					
						2003-11-13 17:52:02 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4e4725377d 
					 
					
						
						
							
							Merge with 4.0  
						
						 
						
						
						
						
					 
					
						2003-11-04 09:40:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cf535556c6 
					 
					
						
						
							
							Cleanups (comments and compiler warnings)  
						
						 
						
						... 
						
						
						
						dded init of variable to fix core dump on startup errors 
						
						
					 
					
						2003-11-02 14:00:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						74551a72ec 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-4.1/  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-4.1 
						
						
					 
					
						2003-10-31 10:34:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						f29ed57531 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-10-30 10:45:28 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						f944fd4a65 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-10-21 11:58:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						b1dba93cdb 
					 
					
						
						
							
							Safety fix to detect multiple calls to my_thread_end()  
						
						 
						
						... 
						
						
						
						Portability fix (For Mac OS X) 
						
						
					 
					
						2003-10-16 20:55:15 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						e87c9f5ff8 
					 
					
						
						
							
							merge with 4.0  
						
						 
						
						
						
						
					 
					
						2003-10-16 03:08:40 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						b5849f451d 
					 
					
						
						
							
							Add more information about memory usage to debug log  
						
						 
						
						
						
						
					 
					
						2003-10-15 15:21:50 +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 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						17aecac32c 
					 
					
						
						
							
							Manual merge after improving concurrency for key cache reassignment  
						
						 
						
						
						
						
					 
					
						2003-10-01 20:16:36 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f300e3a164 
					 
					
						
						
							
							Remove 'extern' references from .cc files  
						
						 
						
						
						
						
					 
					
						2003-09-13 11:35:29 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						9306f55d8e 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						Added key cache assignment
mi_locking.c:
  Added key cache assignment: correction
my_sys.h:
  Added key cache variable structure 
						
						
					 
					
						2003-08-02 02:43:18 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						5f5c367361 
					 
					
						
						
							
							Fixed bug in allocation memory in key cache. (Memory was not properly aligned which cased core dumps on sparc CPU's)  
						
						 
						
						... 
						
						
						
						Changed keycache variables to start with my_ instead of _my_ 
						
						
					 
					
						2003-03-25 02:37:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						386411b5ba 
					 
					
						
						
							
							Allow optimzation of multi-table-update also for InnoDB tables  
						
						 
						
						... 
						
						
						
						MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
Fixed bug in multi-table-update where a row could be updated several times 
						
						
					 
					
						2003-03-19 00:45:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						7e700e3374 
					 
					
						
						
							
							sql_test.cc:  
						
						 
						
						... 
						
						
						
						Less default_charset_info 
						
						
					 
					
						2003-02-26 14:30:39 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						e0a79dc112 
					 
					
						
						
							
							Windows build fix  
						
						 
						
						
						
						
					 
					
						2003-01-18 14:04:34 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								miguel@hegel.br 
							
						 
					 
					
						
						
							
						
						f50abc4467 
					 
					
						
						
							
							Fix warnings and error VC++ compiler  
						
						 
						
						
						
						
					 
					
						2003-01-04 01:19:17 -02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						db99aeb241 
					 
					
						
						
							
							Small fix to avoid problems in building with --without-debug  
						
						 
						
						
						
						
					 
					
						2002-11-07 20:11:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						9b012db53e 
					 
					
						
						
							
							small fix when building in --without-debug  
						
						 
						
						
						
						
					 
					
						2002-10-30 19:30:57 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						1f1ed3e99d 
					 
					
						
						
							
							Small addition to COM_DEBUG  
						
						 
						
						
						
						
					 
					
						2002-10-21 14:08:37 +03: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