monty@mysql.com 
							
						 
					 
					
						
						
							
						
						2f86009c9e 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2006-06-30 19:15:18 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						2bec1b86bb 
					 
					
						
						
							
							Reverted wrong bug fix (Bug#11228)  
						
						
						
						
					 
					
						2006-06-30 18:29:27 +03:00 
						 
				 
			
				
					
						
							
							
								evgen@moonbone.local 
							
						 
					 
					
						
						
							
						
						9a9224da68 
					 
					
						
						
							
							Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql  
						
						... 
						
						
						
						into moonbone.local:/work/tmp_merge-5.0-opt-mysql 
						
						
					 
					
						2006-06-23 14:53:41 +04:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						cfb08851f7 
					 
					
						
						
							
							Bug#11228: DESC shows arbitrary column as "PRI"  
						
						... 
						
						
						
						An UNIQUE KEY consisting of NOT NULL columns
  was displayed as PRIMARY KEY in "DESC t1".
  According to the code, that was intentional
  behaviour for some reasons unknown to me.
  This code was written before bitkeeper time,
  so I cannot check who and why made this.
  After discussing on dev-public, a decision
  was made to remove this code 
						
						
					 
					
						2006-06-23 13:19:30 +05:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						b2b93f0abc 
					 
					
						
						
							
							After merge fix.  
						
						
						
						
					 
					
						2005-08-29 21:06:45 +02:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						5d41d5e0f4 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-4.1-4100  
						
						... 
						
						
						
						into  mysql.com:/home/mydev/mysql-5.0-5000 
						
						
					 
					
						2005-08-29 18:18:30 +02:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						5c14b35a7f 
					 
					
						
						
							
							Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table  
						
						... 
						
						
						
						Changed end-space comparison so that the key is not used past
its end. This is due to the new end-space behaviour in 4.1.
See also bug 6151 and 9188. 
						
						
					 
					
						2005-08-29 16:50:09 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						15d48525af 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-07-28 17:09:54 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3c12d0ae54 
					 
					
						
						
							
							Added end marker for tests to make future merges easier  
						
						
						
						
					 
					
						2005-07-28 03:22:47 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						1d19a4e737 
					 
					
						
						
							
							Fix reporting of type for unique key on VARCHAR field. (Bug  #11227 )  
						
						
						
						
					 
					
						2005-06-22 12:46:21 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						d147e69bb7 
					 
					
						
						
							
							Additional tweak to fix for bug  #10543 , to prevent a change in  
						
						... 
						
						
						
						behavior when extending fields that were fully part of a
multi-part key. 
						
						
					 
					
						2005-06-02 10:00:36 -07:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						ee933cd198 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2004-11-22 21:33:15 +01:00 
						 
				 
			
				
					
						
							
							
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						076f27147f 
					 
					
						
						
							
							Bug#6252 - Duplicate columns in keys should fail  
						
						... 
						
						
						
						Added check for duplicate column in key
  Added tests and fixed tests which exploit bug 
						
						
					 
					
						2004-11-22 18:07:04 +00:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7210195f1e 
					 
					
						
						
							
							now my_printf_error is not better then my_error, but my_error call is shorter  
						
						... 
						
						
						
						used only one implementation of format parser of (printf)
fixed multistatement 
						
						
					 
					
						2004-11-13 19:35:51 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						071001950e 
					 
					
						
						
							
							Merge with 4.1 to get in latest bug fixes  
						
						
						
						
					 
					
						2004-11-04 15:06:24 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						2185f1a56c 
					 
					
						
						
							
							Remove usage of !$ from mysql-tests  
						
						... 
						
						
						
						Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test 
						
						
					 
					
						2004-11-02 20:13:27 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						afbe601302 
					 
					
						
						
							
							merge with 4.1  
						
						
						
						
					 
					
						2004-10-29 19:26:52 +03:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						27a658b2d9 
					 
					
						
						
							
							Fix for bug  #6166 : index prefix length of 0 not rejected  
						
						
						
						
					 
					
						2004-10-26 12:16:35 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						8b6839e644 
					 
					
						
						
							
							Fixed wrong range test code for HEAP tables. This caused a crash when doing a range test with a key that didn't have lower or upper bound (Bug  #6082 )  
						
						... 
						
						
						
						More test cases 
						
						
					 
					
						2004-10-23 03:30:27 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b7a8cce4eb 
					 
					
						
						
							
							test fixed  
						
						
						
						
					 
					
						2004-10-22 23:23:02 +02:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						0d044c6869 
					 
					
						
						
							
							BUG#6151 - myisam index corruption.  
						
						... 
						
						
						
						Removed the assumption of a certain key order.
Since 4.1, keys are padded with blanks for comparison.
Hence, shorter keys sort behind longer keys, if the
data bytes have values below BLANK. 
						
						
					 
					
						2004-10-21 22:17:10 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						095f7e8740 
					 
					
						
						
							
							Removed wrong warnings in test suite (This was because select_insert / select_create results was not freed.  
						
						... 
						
						
						
						Added thd to openfrm() for initialization of TABLE->in_use. This fixed a bug in BDB handling where table->in_use was used early 
						
						
					 
					
						2004-09-17 03:08:23 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						cd7276689e 
					 
					
						
						
							
							apply UNIQUE constrain correctly for multi-byte charsets  
						
						... 
						
						
						
						only MyISAM is fixed 
						
						
					 
					
						2004-08-13 18:29:25 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f6dc9169e2 
					 
					
						
						
							
							Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug  #3666 )  
						
						... 
						
						
						
						The bug was introduced in a patch in the 4.1.2 source tree. 
						
						
					 
					
						2004-05-06 04:40:45 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7e3cf5958c 
					 
					
						
						
							
							Fixed crashing bug with alter table when table was in use (Bug  #3643 )  
						
						... 
						
						
						
						We didn't use 'only index' for tables of type 'const'. (Bug #3497 ) 
						
						
					 
					
						2004-05-05 12:31:17 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						7ff24eb01f 
					 
					
						
						
							
							longer myisam keys  
						
						
						
						
					 
					
						2004-02-20 20:38:34 +01:00 
						 
				 
			
				
					
						
							
							
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						fcf96dbb18 
					 
					
						
						
							
							WorkLog#1323  
						
						... 
						
						
						
						Deprecate the use of TYPE=... Preferred syntax is ENGINE= 
						
						
					 
					
						2003-12-10 04:31:42 +00:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						4f7512160b 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings 
						
						
					 
					
						2003-08-19 00:08:08 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						7229217f33 
					 
					
						
						
							
							Forgot to correct comment in key.test (after fixing bug 390).  
						
						
						
						
					 
					
						2003-05-13 19:19:57 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						44026b18b4 
					 
					
						
						
							
							Fix of bug 390: primary key now implies (silently) NOT NULL for key fields.  
						
						
						
						
					 
					
						2003-05-13 19:16:30 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						1f6ecc0cd3 
					 
					
						
						
							
							Changed mysql-test to print warnings for not existing table to DROP TABLE  
						
						... 
						
						
						
						Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print() 
						
						
					 
					
						2003-01-06 01:48:59 +02: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 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						4b877e0088 
					 
					
						
						
							
							Added macros for nice TIMESPEC usage.  
						
						... 
						
						
						
						Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX. 
						
						
					 
					
						2002-01-02 21:29:41 +02:00 
						 
				 
			
				
					
						
							
							
								monty@donna.mysql.fi 
							
						 
					 
					
						
						
							
						
						bda3e09935 
					 
					
						
						
							
							Merged some functions and removed some unused client functions.  
						
						... 
						
						
						
						Remember UNION for ALTER TABLE
Added test for if we are supporting transactions.
Don't allow REPLACE to replace a row when we have generated an auto_increment key
Fixed bug when using BLOB keys
Fixed bug in SET @variable=user. 
						
						
					 
					
						2001-03-06 15:24:08 +02:00 
						 
				 
			
				
					
						
							
							
								monty@donna.mysql.com 
							
						 
					 
					
						
						
							
						
						c0f40d14cc 
					 
					
						
						
							
							Added support for hex strings to mysqlimport  
						
						... 
						
						
						
						A lot of new tests to mysqltest
Fixed bug with BDB tables and autocommit 
						
						
					 
					
						2000-12-28 03:56:38 +02:00