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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3fb088a075 
					 
					
						
						
							
							Add 0x before pointers (to help with debugging)  
						
						 
						
						... 
						
						
						
						Add support for VARCHAR with 1 or 2 length bytes
Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly)
Give error if we got problems in temporary tables during a SELECT
Don't use new table generated by ALTER TABLE if index generation fails
Fixed wrong call by range_end() (Could cause an ASSERT in debug mode) 
						
						
					 
					
						2004-12-18 05:19:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						92f89369ae 
					 
					
						
						
							
							bit type  
						
						 
						
						
						
						
					 
					
						2004-12-17 18:06:05 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						563500994a 
					 
					
						
						
							
							Update results for new varchar handling  
						
						 
						
						... 
						
						
						
						Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length 
						
						
					 
					
						2004-12-07 15:47:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						069438d1bb 
					 
					
						
						
							
							Fix for bug  #6840 :  Default value is not checked in ALTER column SET DEFAULT 'x'  
						
						 
						
						
						
						
					 
					
						2004-12-07 14:08:56 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						77207d19f2 
					 
					
						
						
							
							Merge with new VARCHAR code  
						
						 
						
						
						
						
					 
					
						2004-12-06 19:18:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						75d0958dc3 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						... 
						
						
						
						Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld 
						
						
					 
					
						2004-12-06 17:15:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0de4777187 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-12-06 11:38:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						67ce247965 
					 
					
						
						
							
							Add support for up to VARCHAR (size up to 65535)  
						
						 
						
						... 
						
						
						
						Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short 
						
						
					 
					
						2004-12-06 02:00:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						48fc4cbc6b 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-12-03 17:48:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						fe70f8c747 
					 
					
						
						
							
							Merge mysql.com:/space/bkroot/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/space/bk/b6391-mysql-4.1 
						
						
					 
					
						2004-12-03 12:15:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						2bbdf2403d 
					 
					
						
						
							
							Bug#6391 (binlog-do-db rules ignored)  
						
						 
						
						... 
						
						
						
						CREATE DATABASE statement used the current database instead of the
  database created when checking conditions for replication.
  CREATE/DROP/ALTER DATABASE statements are now replicated based on
  the manipulated database. 
						
						
					 
					
						2004-12-03 12:13:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						4b8e96d5ca 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-12-03 00:39:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						13649d90ae 
					 
					
						
						
							
							Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the  
						
						 
						
						... 
						
						
						
						insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682 )
(Original fix reimplemented after review by Serg and Guilhem.) 
						
						
					 
					
						2004-12-03 00:05:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						55cc515c8f 
					 
					
						
						
							
							merged on pull  
						
						 
						
						
						
						
					 
					
						2004-12-02 14:47:14 +02:00