acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						9d4d1e81b8 
					 
					
						
						
							
							Merge xiphis.org:/home/antony/work2/mysql-5.1  
						
						 
						
						... 
						
						
						
						into  xiphis.org:/home/antony/work3/mysql-5.1-plugable-2 
						
						
					 
					
						2005-12-21 10:26:39 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						13a776778c 
					 
					
						
						
							
							Finalize storage engine plugins  
						
						 
						
						... 
						
						
						
						Give BerkeleyDB savepoints
Remove "enum db_type" from most of the code 
						
						
					 
					
						2005-12-21 10:18:40 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3d2d9c2259 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1 
						
						
					 
					
						2005-12-03 08:56:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								evgen@moonbone.local 
							
						 
					 
					
						
						
							
						
						f2559fbcc3 
					 
					
						
						
							
							Merge moonbone.local:/work/15028-bug-5.0-mysql  
						
						 
						
						... 
						
						
						
						into moonbone.local:/work/15028-bug-5.1-new-mysql 
						
						
					 
					
						2005-12-02 22:07:10 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								evgen@moonbone.local 
							
						 
					 
					
						
						
							
						
						70abb812fb 
					 
					
						
						
							
							sql_cache.cc:  
						
						 
						
						... 
						
						
						
						After merge fix 
						
						
					 
					
						2005-12-02 22:04:22 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								evgen@moonbone.local 
							
						 
					 
					
						
						
							
						
						00b902b065 
					 
					
						
						
							
							Manually merged  
						
						 
						
						
						
						
					 
					
						2005-12-02 19:42:14 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7796a79477 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0 
						
						
					 
					
						2005-12-01 14:38:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						12d1bf1231 
					 
					
						
						
							
							We should skip beggining '(' characters when test query on possibility  
						
						 
						
						... 
						
						
						
						to be in the query cache. (BUG#14652) 
						
						
					 
					
						2005-12-01 14:26:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						39689634ac 
					 
					
						
						
							
							We should not skip temptable view along with other derived  
						
						 
						
						... 
						
						
						
						tables during query tables registration. (BUG#15119) 
						
						
					 
					
						2005-12-01 12:01:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e42c980967 
					 
					
						
						
							
							Table definition cache, part 2  
						
						 
						
						... 
						
						
						
						The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
  object and open a handler to the table object
Other noteworthy changes:
- In TABLE_SHARE the most common strings are now LEX_STRING's
- Better error message when table is not found
- Variable table_cache is now renamed 'table_open_cache'
- New variable 'table_definition_cache' that is the number of table defintions that will be cached
- strxnmov() calls are now fixed to avoid overflows
- strxnmov() will now always add one end \0 to result
- engine objects are now created with a TABLE_SHARE object instead of a TABLE object.
- After creating a field object one must call field->init(table) before using it
- For a busy system this change will give you:
 - Less memory usage for table object
 - Faster opening of tables (if it's has been in use or is in table definition cache)
 - Allow you to cache many table definitions objects
 - Faster drop of table 
						
						
					 
					
						2005-11-23 22:45:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a6f5375cb0 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.1 
						
						
					 
					
						2005-11-05 01:32:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						6143c6543e 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0 
						
						
					 
					
						2005-10-28 00:24:13 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1b164c7b83 
					 
					
						
						
							
							support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787)  
						
						 
						
						
						
						
					 
					
						2005-10-28 00:18:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						de26178f75 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/usr/home/ram/work/5.0.b10303 
						
						
					 
					
						2005-10-24 11:36:29 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						620b7bafb0 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-10-06 10:54:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						92b1d080c9 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231 
						
						
					 
					
						2005-09-30 16:51:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						88fcf45d94 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231  
						
						 
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/bug13231/my51-bug13231 
						
						
					 
					
						2005-09-30 16:48:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						9b7a3bec70 
					 
					
						
						
							
							Bug  #13231   	mysqltest: fails to dectect when mysql_next_result fails  
						
						 
						
						... 
						
						
						
						- Packets out of order when reading cached data stored by a normal select from a ps or vice versa.
 - Add pkt_nr to query cache flags 
						
						
					 
					
						2005-09-29 10:25:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								evgen@moonbone.local 
							
						 
					 
					
						
						
							
						
						0032165acf 
					 
					
						
						
							
							Fix bug  #13424  locking view with query cache enabled crashes server  
						
						 
						
						... 
						
						
						
						For LOCK view is opened but not prepared thus leaving 'table' field set to
NULL. invalidate_locked_for_write() wasn't checking that and call to 
invalidate_table(NULL) crashes server.
To invalidate_locked_for_write() added check that ensures that table is
completely opened. 
						
						
					 
					
						2005-09-26 19:08:26 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						4f4b6f1e76 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-5.1 
						
						
					 
					
						2005-09-07 09:39:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						352c7b9cbc 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1  
						
						 
						
						... 
						
						
						
						into  sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0 
						
						
					 
					
						2005-09-06 20:51:15 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						68acf8fdea 
					 
					
						
						
							
							fix (bug  #10303 : Misleading Last_query_cost value).  
						
						 
						
						
						
						
					 
					
						2005-09-06 15:00:35 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1bff548cb3 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0  
						
						 
						
						... 
						
						
						
						into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 
						
						
					 
					
						2005-09-06 12:18:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						10c0ef69e7 
					 
					
						
						
							
							support of concurent query cache resizing (BUG#12848)  
						
						 
						
						
						
						
					 
					
						2005-09-06 11:16:53 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						02056f8e3a 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1 
						
						
					 
					
						2005-08-25 13:11:38 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						c79ba8e346 
					 
					
						
						
							
							BUG#12532: Added more memory in malloc for slave query cache  
						
						 
						
						
						
						
					 
					
						2005-08-19 16:25:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						b9476f7d50 
					 
					
						
						
							
							Merge xiphis.org:/usr/home/antony/work2/mysql-4.1  
						
						 
						
						... 
						
						
						
						into  xiphis.org:/usr/home/antony/work2/merge-5.0 
						
						
					 
					
						2005-08-11 12:18:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@51.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						4f26fa5184 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-08-11 10:20:06 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@52.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						1dff783854 
					 
					
						
						
							
							block using QC in case of having tables locked by LOCK... (BUG#12385)  
						
						 
						
						
						
						
					 
					
						2005-08-10 18:58:55 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						69acde961f 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1 
						
						
					 
					
						2005-08-05 18:01:34 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						f5833989ba 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0 
						
						
					 
					
						2005-07-23 07:55:07 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						bfdb6ca3cf 
					 
					
						
						
							
							store SERVER_MORE_RESULTS_EXISTS in key of query cache  (BUG#6897)  
						
						 
						
						
						
						
					 
					
						2005-07-23 07:51:25 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tulin@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						a6c21a0791 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-07-19 21:56:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						2278e0319c 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mishka.local:/home/my/mysql-5.0 
						
						
					 
					
						2005-07-18 19:03:01 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						78c65b5adc 
					 
					
						
						
							
							Cleanups during review  
						
						 
						
						... 
						
						
						
						Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while ( 
						
						
					 
					
						2005-07-18 15:33:18 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						674b6bb151 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-07-12 20:01:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						2e96c47a82 
					 
					
						
						
							
							post-merge fixes  
						
						 
						
						
						
						
					 
					
						2005-07-05 12:23:13 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						15d02e60e1 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-07-05 11:38:05 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						28a93877ca 
					 
					
						
						
							
							temporary tables of subquery in the from clause just skipped during processing QC tables (BUG#11522)  
						
						 
						
						
						
						
					 
					
						2005-06-23 20:06:35 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						4f1e27ed00 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean 
						
						
					 
					
						2005-05-03 00:10:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						7bab94f36b 
					 
					
						
						
							
							Clean up merge from 4.1  
						
						 
						
						
						
						
					 
					
						2005-05-02 10:19:37 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						2193fd8666 
					 
					
						
						
							
							All changes for change to all storage engines being under storage directory.  
						
						 
						
						
						
						
					 
					
						2005-04-26 19:04:36 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						1476213e52 
					 
					
						
						
							
							Fix crash in embedded server due to incorrect storage of results  
						
						 
						
						... 
						
						
						
						in the query cache. (Bug #9549 ) 
						
						
					 
					
						2005-03-31 19:17:45 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						ee2b4ec959 
					 
					
						
						
							
							Eliminate warnings noticed by VC7. This includes fixing my_mmap() on  
						
						 
						
						... 
						
						
						
						Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826 ) 
						
						
					 
					
						2005-03-18 16:12:25 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@51.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						67f9b28bcb 
					 
					
						
						
							
							postreview changes  
						
						 
						
						
						
						
					 
					
						2005-02-21 17:07:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@51.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						950b7db381 
					 
					
						
						
							
							Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0 
						
						
					 
					
						2005-02-21 13:16:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								georg@beethoven.site 
							
						 
					 
					
						
						
							
						
						26e3685b02 
					 
					
						
						
							
							Changes and fixes for windows compilation  
						
						 
						
						
						
						
					 
					
						2005-02-18 15:17:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						38d1a42481 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2005-02-15 17:12:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						961d8b0ebf 
					 
					
						
						
							
							Merge hundin.mysql.fi:/home/heikki/mysql-4.0  
						
						 
						
						... 
						
						
						
						into hundin.mysql.fi:/home/heikki/mysql-4.1 
						
						
					 
					
						2005-02-13 21:05:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						8f95f5a595 
					 
					
						
						
							
							Fixed mistyping (thnx to Konstantin)  
						
						 
						
						
						
						
					 
					
						2005-02-11 21:57:37 +02:00