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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						fc475dbfa7 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl1280-part1 
						
						
					 
					
						2003-10-28 23:24:57 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						c7688a3a85 
					 
					
						
						
							
							Worklog  #1280 , (Stage 1 Implementation)  
						
						 
						
						... 
						
						
						
						This is a starting work to remove handler name dependencies 
from the Lex/Parser. 
						
						
					 
					
						2003-10-28 21:39:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6e17f4f20d 
					 
					
						
						
							
							fixes to Bitmap class  
						
						 
						
						
						
						
					 
					
						2003-10-24 22:44:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						df69309593 
					 
					
						
						
							
							MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax  
						
						 
						
						
						
						
					 
					
						2003-10-22 17:57:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						f944fd4a65 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-10-21 11:58:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						e87c9f5ff8 
					 
					
						
						
							
							merge with 4.0  
						
						 
						
						
						
						
					 
					
						2003-10-16 03:08:40 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						84d9d98078 
					 
					
						
						
							
							Better fix for CREATE TABLE IF NOT EXISTS ... SELECT  
						
						 
						
						... 
						
						
						
						Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems) 
						
						
					 
					
						2003-10-15 21:41:13 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						50d9b95b77 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-10-15 12:25:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						5ec87f2449 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						ALTER TABLE ... DISCARD/IMPORT TABLESPACE
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x 
						
						
					 
					
						2003-10-13 11:20:19 +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 
							
						 
					 
					
						
						
							
						
						f12cbd4bb8 
					 
					
						
						
							
							Manual merge after improving concurrency for key cache reassignment  
						
						 
						
						
						
						
					 
					
						2003-10-01 20:20:17 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						755455e15c 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-09-03 12:07:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2263e3e51f 
					 
					
						
						
							
							Merge with 4.0.14  
						
						 
						
						
						
						
					 
					
						2003-08-11 22:44:43 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						79922d946a 
					 
					
						
						
							
							table checksum background:  
						
						 
						
						... 
						
						
						
						my_checksum() mysys function
   NISAM checksum code moved from mysys to isam/ - it's obsolete
   MyISAM checksum code moved to mysys
   table's checksum accessible from sql layer
   SHOW TABLE STATUS shows checksum (WL#646)
code cleanup 
						
						
					 
					
						2003-08-05 21:14:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						34919a03c4 
					 
					
						
						
							
							Added thread variable max_seeks_for_key  
						
						 
						
						... 
						
						
						
						Change optimizer to prefer key lookups before table scan
Change table scans to be done after tables with constrains on scanned table 
						
						
					 
					
						2003-06-27 03:04:54 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						95ffe2d0ca 
					 
					
						
						
							
							handler.h, ha_innodb.h, ha_innodb.cc:  
						
						 
						
						... 
						
						
						
						Cleanup; remove compiler warning on Windows 
						
						
					 
					
						2003-06-15 23:23:04 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						4da7f485b7 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed 
						
						
					 
					
						2003-06-15 01:04:28 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						a0f3dcc3c8 
					 
					
						
						
							
							Merge rurik.mysql.com:/home/igor/mysql-4.1  
						
						 
						
						... 
						
						
						
						into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
						
						
					 
					
						2003-06-12 06:22:35 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						f547f2769f 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						New feature: preload indexes into key cache.
mi_preload.c:
  new file
Many files:
  Added preload statement. 
						
						
					 
					
						2003-06-12 04:29:02 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						 
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						35fd869e51 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released 
						
						
					 
					
						2003-05-03 02:29:40 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						5dc8dbea5f 
					 
					
						
						
							
							merge fix  
						
						 
						
						
						
						
					 
					
						2003-04-26 15:26:28 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f6a43bd567 
					 
					
						
						
							
							Fixes for valgrind  
						
						 
						
						... 
						
						
						
						Added optimzation for clustered index
Fixed bug in UPDATE ... ORDER BY
Fixed handling of UPDATE ... LIMIT 
						
						
					 
					
						2003-04-23 21:52:16 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						5ea922aab0 
					 
					
						
						
							
							merging  
						
						 
						
						
						
						
					 
					
						2003-04-16 20:35:29 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						f79cabdc8f 
					 
					
						
						
							
							a fix for a crashing bug when attempting to create InnoDB table  
						
						 
						
						... 
						
						
						
						with GEOMETRY field type. 
						
						
					 
					
						2003-04-08 20:39:50 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						b883a9c01c 
					 
					
						
						
							
							Merge with 4.0.12  
						
						 
						
						
						
						
					 
					
						2003-03-19 22:25:44 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a434bca704 
					 
					
						
						
							
							Merge with 4.0  
						
						 
						
						
						
						
					 
					
						2003-03-16 19:17:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						77eb6e5063 
					 
					
						
						
							
							Better fix for "Halloween" effect ...  
						
						 
						
						
						
						
					 
					
						2003-03-12 17:11:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						6ef0f4ad41 
					 
					
						
						
							
							ha_innodb.h, ha_innodb.cc, handler.h, handler.cc, sql_class.cc:  
						
						 
						
						... 
						
						
						
						Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time 
						
						
					 
					
						2003-03-03 19:31:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3103bca9b2 
					 
					
						
						
							
							merging  
						
						 
						
						
						
						
					 
					
						2002-12-11 19:53:57 +02: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7a70332836 
					 
					
						
						
							
							Portability fix when using -DBIG_TABLES  
						
						 
						
						
						
						
					 
					
						2002-11-14 12:21:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4307363079 
					 
					
						
						
							
							new innodb query cache behaviour (recommit because of problem with 4.1 repository pushing)  
						
						 
						
						... 
						
						
						
						fixed bug in quqry cache dbd transaction processing 
						
						
					 
					
						2002-11-03 10:15:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						0f39457613 
					 
					
						
						
							
							Merge with 4.0.4  
						
						 
						
						
						
						
					 
					
						2002-10-02 17:55:12 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						2d66b2f519 
					 
					
						
						
							
							Revert change to use ha_rows for number of rows as other code depend of this  
						
						 
						
						
						
						
					 
					
						2002-09-30 14:54:16 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						3a9eb4f621 
					 
					
						
						
							
							Fix some ORDER BY ... DESC problems with InnoDB  
						
						 
						
						
						
						
					 
					
						2002-09-27 08:23:51 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@build.mysql2.com 
							
						 
					 
					
						
						
							
						
						7a7a0ae842 
					 
					
						
						
							
							COUNT(*) for merge can be longlong even if it's long for MyISAM  
						
						 
						
						
						
						
					 
					
						2002-09-26 17:52:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						7134ffec21 
					 
					
						
						
							
							Merge with 4.0.3  
						
						 
						
						... 
						
						
						
						Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed) 
						
						
					 
					
						2002-08-30 12:40:40 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						99a954f405 
					 
					
						
						
							
							InnoDB support for HANDLER  
						
						 
						
						
						
						
					 
					
						2002-08-21 20:55:34 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dddc20d9d1 
					 
					
						
						
							
							New SET syntax & system variables.  
						
						 
						
						... 
						
						
						
						Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups 
						
						
					 
					
						2002-07-23 18:31:22 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@gw.udmsearch.izhnet.ru 
							
						 
					 
					
						
						
							
						
						6f5f47855a 
					 
					
						
						
							
							Default table character set has been added:  
						
						 
						
						... 
						
						
						
						CREATE TABLE a (field,...) TYPE=type CHARSET=cset; 
						
						
					 
					
						2002-06-19 21:21:30 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						0d8e13979d 
					 
					
						
						
							
							Made keyread (key scanning) a key specific attribute.  
						
						 
						
						... 
						
						
						
						This avoids using fulltext keys for table scanning.
This also reverts Sinisa's original fix for this problem. 
						
						
					 
					
						2002-06-19 00:22:30 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						6e54cc492c 
					 
					
						
						
							
							Extension of .frm file (not yet ready for push)  
						
						 
						
						
						
						
					 
					
						2002-06-02 21:22:20 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@tik.mysql.fi 
							
						 
					 
					
						
						
							
						
						056175a1ce 
					 
					
						
						
							
							Update for BTREE keys in HEAP tables  
						
						 
						
						... 
						
						
						
						Split handler->option_flag() to handler->table_flags() and handler->index_flags() 
						
						
					 
					
						2002-04-12 21:35:46 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						727e507bca 
					 
					
						
						
							
							merge with 3.23.50  
						
						 
						
						
						
						
					 
					
						2002-03-27 01:56:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						1f142262a1 
					 
					
						
						
							
							sql_show.cc, handler.h, handler.cc:  
						
						 
						
						... 
						
						
						
						Add foreign key defs to SHOW CREATE TABLE 
						
						
					 
					
						2002-03-21 18:05:46 +02:00