monty@mysql.com 
							
						 
					 
					
						
						
							
						
						04f8e164fb 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-04 16:45:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						fc1e7b07d6 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-5.0-trg3 
						
						
					 
					
						2005-04-03 17:02:13 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						7b294bdc8d 
					 
					
						
						
							
							Merge of patch for bug  #3891  into 5.0 tree.  
						
						 
						
						
						
						
					 
					
						2005-04-03 10:36:18 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						7ba99ee324 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2005-04-02 20:28:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3098b93ef8 
					 
					
						
						
							
							bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names  
						
						 
						
						... 
						
						
						
						sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s) 
						
						
					 
					
						2005-04-02 20:13:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						201ee3eb78 
					 
					
						
						
							
							Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug  #5902 )  
						
						 
						
						... 
						
						
						
						CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912 )
ALTER TABLE now fails in STRICT mode if it generates warnings.
Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933 ) 
						
						
					 
					
						2005-04-01 15:04:50 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						d4b20f4a86 
					 
					
						
						
							
							Fix for bugs  #5859  "DROP TABLE does not drop triggers" and  
						
						 
						
						... 
						
						
						
						#6559  "DROP DATABASE forgets to drop triggers".
If we drop table we should also drop all triggers associated with it.
To do this we have to check for existence of .TRG file when we are 
dropping table and delete it too. 
						
						
					 
					
						2005-03-27 16:15:21 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cc56005130 
					 
					
						
						
							
							Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if the row type is dynamic  
						
						 
						
						... 
						
						
						
						(For 4.1 tables old 'VARCHAR' fields are converted to true VARCHAR in the next ALTER TABLE)
This ensures that one can use MySQL 5.0 privilege tables with MySQL 4.1 
						
						
					 
					
						2005-03-22 15:48:06 +02: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						41997cf263 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-03-17 08:46:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						aa6ab3b49c 
					 
					
						
						
							
							Move handler dependent tests to the specific handler (myisam, bdb, innodb)  
						
						 
						
						... 
						
						
						
						Enabled VARCHAR testing for innodb
NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP 
						
						
					 
					
						2005-03-17 01:22:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						594ef41b2d 
					 
					
						
						
							
							Cleanup during reviews  
						
						 
						
						... 
						
						
						
						Removed some optional arguments
Fixed portability problem in federated tests 
						
						
					 
					
						2005-03-16 16:11:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d7b2d4c541 
					 
					
						
						
							
							global read lock code now uses a dedicated mutex  
						
						 
						
						... 
						
						
						
						(otherwise a deadlock when ALTER writes to
binlog holding LOCK_open, it causes binlog rotation,
binlog waits for prepared transactions to commit, and commit
needs LOCK_open to check for global read lock) 
						
						
					 
					
						2005-03-16 08:40:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						eaea82d3af 
					 
					
						
						
							
							Merge query_cache tests  
						
						 
						
						
						
						
					 
					
						2005-03-11 12:38:38 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						50f9fc3368 
					 
					
						
						
							
							Merge test and results  
						
						 
						
						
						
						
					 
					
						2005-03-11 11:07:32 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						be3c863ba0 
					 
					
						
						
							
							Merge in fix Bug#3788  
						
						 
						
						
						
						
					 
					
						2005-03-08 22:32:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						df84c534dd 
					 
					
						
						
							
							Flush entries from the query cache for tables used in  
						
						 
						
						... 
						
						
						
						administrative statements that may alter the table, such
as REPAIR TABLE. (Bug #8480 ) 
						
						
					 
					
						2005-03-07 18:15:19 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						5e1d2ad68c 
					 
					
						
						
							
							Bug#3788  
						
						 
						
						... 
						
						
						
						Crashes with stored procedure return non-string values
  Also fixes Bug#2773 
						
						
					 
					
						2005-03-04 21:14:35 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0a6b7aedb2 
					 
					
						
						
							
							Remove compiler warnings and remove not used variables  
						
						 
						
						... 
						
						
						
						(Found during build process) 
						
						
					 
					
						2005-02-25 16:53:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cd78e701a5 
					 
					
						
						
							
							Show all generated warnings in SHOW ERROR  
						
						 
						
						... 
						
						
						
						Previously we only stored the first given error (the error sent to the client) 
						
						
					 
					
						2005-02-24 23:33:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f5acf0be01 
					 
					
						
						
							
							Generate warning in ha_delete_table() if files is missing in handler  
						
						 
						
						
						
						
					 
					
						2005-02-21 20:41:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cab35adf7e 
					 
					
						
						
							
							Review of new pushed code (XA & other)  
						
						 
						
						... 
						
						
						
						Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command() 
						
						
					 
					
						2005-02-21 14:47:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1235e6d2c7 
					 
					
						
						
							
							Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa 
						
						
					 
					
						2005-02-18 13:38:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.homeip.net 
							
						 
					 
					
						
						
							
						
						a004533a76 
					 
					
						
						
							
							BUG#8547: Wrong errormessage when dropping table that does not exist in NDB  
						
						 
						
						... 
						
						
						
						- Added tescases
 - Added handling of HA_ERR_NO_SUCH_TABLE in mysql_rm_table_part2 so that 
   error messages now are consistent 
						
						
					 
					
						2005-02-17 14:22:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						fd828e5b4d 
					 
					
						
						
							
							manually merged  
						
						 
						
						
						
						
					 
					
						2005-02-14 21:50:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						b94a482ee9 
					 
					
						
						
							
							Precision Math implementation  
						
						 
						
						
						
						
					 
					
						2005-02-09 02:50:45 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						422c2eb868 
					 
					
						
						
							
							4.1 -> 5.0 merge  
						
						 
						
						
						
						
					 
					
						2005-02-03 13:18:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3936edd7fa 
					 
					
						
						
							
							Fixed during review of new pulled code  
						
						 
						
						
						
						
					 
					
						2005-02-02 20:28:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								reggie@bob.(none) 
							
						 
					 
					
						
						
							
						
						fe675641eb 
					 
					
						
						
							
							Merge bob.(none):/home/reggie/bk/mysql41  
						
						 
						
						... 
						
						
						
						into bob.(none):/home/reggie/bk/mysql5.0 
						
						
					 
					
						2005-01-31 22:24:04 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								reggie@bob.(none) 
							
						 
					 
					
						
						
							
						
						16334eb414 
					 
					
						
						
							
							Bug  #6607   	Create table... LIKE... with Windows Symlinks  
						
						 
						
						... 
						
						
						
						sql_table.cc:
  use fn_format to resolve symlinks in mysql_create_like_table 
						
						
					 
					
						2005-01-31 17:24:18 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3c5060981f 
					 
					
						
						
							
							query_id and my_xid -> ulonglong  
						
						 
						
						... 
						
						
						
						fix for binlog+autocommit+tclog
comments, style fixes 
						
						
					 
					
						2005-01-27 22:38:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3350a7ec6d 
					 
					
						
						
							
							Merge gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261  
						
						 
						
						... 
						
						
						
						into gw.mysql.r18.ru:/usr/home/ram/work/5.0 
						
						
					 
					
						2005-01-25 13:05:15 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8c043a299b 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261 
						
						
					 
					
						2005-01-25 11:06:12 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c76405a7ee 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2005-01-24 19:41:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						67ba2e367a 
					 
					
						
						
							
							fixes/cleanups according to Coverity report  
						
						 
						
						
						
						
					 
					
						2005-01-24 15:48:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						9c3c566fcb 
					 
					
						
						
							
							A fix (bug  #7261 : Alter table loses temp table with lower_case_table_names=2).  
						
						 
						
						
						
						
					 
					
						2005-01-21 15:14:31 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						56fb6f31ba 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2005-01-10 15:28:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						10f41d7cc4 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-01-10 11:49:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						4ddd79fb69 
					 
					
						
						
							
							bug#7761 - ndb does not autcommit - postreview fixes  
						
						 
						
						
						
						
					 
					
						2005-01-10 11:33:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						c9f7f0ffcf 
					 
					
						
						
							
							bug#7761 - ndb does not autocommit during alter table  
						
						 
						
						
						
						
					 
					
						2005-01-10 11:17:01 +01: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3c6d5e43f9 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-01-04 13:23:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						309b1a2b6c 
					 
					
						
						
							
							Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY  
						
						 
						
						
						
						
					 
					
						2005-01-03 23:04:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						f5d54d58b5 
					 
					
						
						
							
							typo fixed  
						
						 
						
						
						
						
					 
					
						2005-01-02 15:23:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						a04fc26c54 
					 
					
						
						
							
							manually merged  
						
						 
						
						
						
						
					 
					
						2004-12-31 15:26:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						78da7196ad 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2004-12-31 12:05:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1bd22faa05 
					 
					
						
						
							
							Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag  
						
						 
						
						... 
						
						
						
						This allows use to use INSERT IGNORE ... ON DUPLICATE ... 
						
						
					 
					
						2004-12-31 12:04:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						fdffb4b849 
					 
					
						
						
							
							sql_table.cc:  
						
						 
						
						... 
						
						
						
						Return a sensible error code from DISCARD TABLESPACE, if it fails because the table is referenced by a FOREIGN KEY 
						
						
					 
					
						2004-12-27 05:03:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						4f4bbfc279 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-12-22 13:54:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f37fd31ddc 
					 
					
						
						
							
							Merge with global tree  
						
						 
						
						
						
						
					 
					
						2004-12-18 06:05:16 +02:00