tulin@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						07b4a42e18 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-06-18 09:21:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						51dd521dfc 
					 
					
						
						
							
							Bug#6877 MySQL should give an error if the requested table type is not available  
						
						 
						
						... 
						
						
						
						Implement new SQL mode - NO_ENGINE_SUBSTITUTION 
						
						
					 
					
						2005-06-17 22:14:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ndbdev@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						8d44b54295 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-06-10 07:22:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						1055c36000 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.0-10543  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-06-09 19:29:55 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						3b8c3bd7e1 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-06-09 17:15:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						304bb0c66d 
					 
					
						
						
							
							Bug#11028 Crash on create table like  
						
						 
						
						... 
						
						
						
						Report error instead of crashing 
						
						
					 
					
						2005-06-09 16:06:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ndbdev@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						2fb1fb5877 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-06-07 06:50:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						775f17667b 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2005-06-07 00:31:53 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						29fd1f2fd9 
					 
					
						
						
							
							Move USE_PRAGMA_IMPLEMENTATION to proper place  
						
						 
						
						... 
						
						
						
						Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable 
						
						
					 
					
						2005-06-03 23:46:03 +03: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						bef102ec90 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1 
						
						
					 
					
						2005-06-02 09:50:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						8b0daa8445 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-06-01 16:13:25 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5a271e2c12 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-06-01 16:13:24 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						f5f88703b2 
					 
					
						
						
							
							Fix compile error when HAVE_BERKELEY_DB  
						
						 
						
						
						
						
					 
					
						2005-06-01 16:03:41 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						b8f3c515ba 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-9660  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-4.1-clean 
						
						
					 
					
						2005-06-01 13:02:26 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						0a2d95e983 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-8135  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-4.1-clean 
						
						
					 
					
						2005-06-01 12:59:11 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						c82cb2c26a 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1 
						
						
					 
					
						2005-06-01 17:41:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						0a1e38b7ed 
					 
					
						
						
							
							Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.  
						
						 
						
						... 
						
						
						
						Manual merge from 4.1. 
						
						
					 
					
						2005-06-01 11:15:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						c420599581 
					 
					
						
						
							
							Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.  
						
						 
						
						... 
						
						
						
						Hand merged from 4.0. 
						
						
					 
					
						2005-05-31 19:37:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						5088b28d09 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-05-31 14:37:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						51d80960ea 
					 
					
						
						
							
							Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.  
						
						 
						
						... 
						
						
						
						1.) Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Used the new option in create_table_from_items().
It is necessary to prevent the SELECT table from being reopend.
It would get new storage assigned for its fields, while the
SELECT part of the command would still use the old (freed) storage.
2.) Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
3.) Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling. 
						
						
					 
					
						2005-05-31 11:08:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						1cc23599c2 
					 
					
						
						
							
							Cleanups to patch for bug  #9660  after review by Monty.  
						
						 
						
						
						
						
					 
					
						2005-05-26 10:01:26 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						aac55df4f4 
					 
					
						
						
							
							Fix table renaming to not lowercase table names for all storage  
						
						 
						
						... 
						
						
						
						engines when lower_case_table_names == 2, as it did previously
for InnoDB and MEMORY. (Bug #9660 ) 
						
						
					 
					
						2005-05-25 20:26:40 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						ef9ef1f958 
					 
					
						
						
							
							Fix partial keys when converting VARCHAR to TEXT. (Bug  #10543 )  
						
						 
						
						
						
						
					 
					
						2005-05-25 18:11:47 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cb7cd33222 
					 
					
						
						
							
							Fix that we can read tables with the 'older' decimal format used in 5.0.3 & 5.0.4  
						
						 
						
						... 
						
						
						
						We will however give a warning when opening such a table that users should use ALTER TABLE ... FORCE to fix
the table. In future release we will fix that REPAIR TABLE will be able to handle this case 
						
						
					 
					
						2005-05-25 18:33:36 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						2fde78052b 
					 
					
						
						
							
							Fix error reporting for 'OPTIMIZE TABLE' on InnoDB tables. (Bug  #8135 )  
						
						 
						
						
						
						
					 
					
						2005-05-24 11:11:40 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tulin@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						23f79bd1f2 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-05-17 10:17:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d06bb6fa39 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						
						
						
					 
					
						2005-05-16 15:21:35 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						9db45adb60 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2005-05-14 18:31:22 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						beb5867dfb 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						
						
						
					 
					
						2005-05-14 16:24:36 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b4e92e6360 
					 
					
						
						
							
							Merge with 4.0  
						
						 
						
						
						
						
					 
					
						2005-05-14 00:01:40 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						20f969b256 
					 
					
						
						
							
							Change create_field->offset to store offset from start of fields, independent of null bits.  
						
						 
						
						... 
						
						
						
						Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236  
						
						
					 
					
						2005-05-13 11:11:50 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						152f751831 
					 
					
						
						
							
							fix (Bug  #8295  and  #8296 : varchar and varbinary conversion)  
						
						 
						
						... 
						
						
						
						select, gis & gis-tree tests fails at the moment, but
I will push this CS because it was tested before and I'm absolutely
sure it's right. 
						
						
					 
					
						2005-05-12 15:56:04 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						c33a0673a6 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/Users/mikron/wl1682 
						
						
					 
					
						2005-05-12 12:01:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								antony@ltantony.mysql.com 
							
						 
					 
					
						
						
							
						
						d51308aec4 
					 
					
						
						
							
							Bug#6236  
						
						 
						
						... 
						
						
						
						Incomplete ALTER TABLE breaks MERGE compatibility
  Fix implicit NOT NULL not set on ALTER of PK columns 
						
						
					 
					
						2005-05-08 21:03:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@mysql.com 
							
						 
					 
					
						
						
							
						
						a8febcd7d2 
					 
					
						
						
							
							Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/gluh/MySQL/Bugs/5.0.9897 
						
						
					 
					
						2005-05-07 12:21:48 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@mysql.com 
							
						 
					 
					
						
						
							
						
						d76be7ab3f 
					 
					
						
						
							
							Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement  
						
						 
						
						... 
						
						
						
						thd->lex->derived_tables should be zero(it may be changed if we open a view) 
						
						
					 
					
						2005-05-07 12:17:54 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						c18a302577 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/Users/mikron/wl1682 
						
						
					 
					
						2005-05-07 11:23:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						b4ab00df62 
					 
					
						
						
							
							WL 1682: Bitvector for updated/read fields in handler interface  
						
						 
						
						... 
						
						
						
						Fixed clear issues of bitvector and memory allocation issues 
						
						
					 
					
						2005-05-07 10:00:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						015cd1cd21 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-05-06 13:51:58 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						a9f6aab4c9 
					 
					
						
						
							
							Fixes while reviewing new code  
						
						 
						
						... 
						
						
						
						Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema 
						
						
					 
					
						2005-05-06 11:39:30 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						7bab94f36b 
					 
					
						
						
							
							Clean up merge from 4.1  
						
						 
						
						
						
						
					 
					
						2005-05-02 10:19:37 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						f7cd6b8aa1 
					 
					
						
						
							
							WL 1682: After review fixes + update bitvector class + bitvector test  
						
						 
						
						... 
						
						
						
						cases + bug fixes 
						
						
					 
					
						2005-05-02 15:45:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						8ef6ae7442 
					 
					
						
						
							
							Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_names  
						
						 
						
						... 
						
						
						
						is set on case-sensitive file systems and the source table
was specified in something other than lowercase. (Bug #9761 ) 
						
						
					 
					
						2005-04-28 15:30:42 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						21347433cf 
					 
					
						
						
							
							WL 1682: Use bitvector instead of query_id to tell handler which fields  
						
						 
						
						... 
						
						
						
						to read and write
Changed Server code, added new interface to handler and changed the
NDB handler, InnoDB handler and Federated handler that previously used
query_id
Bug#10202 fix (one-liner fix for memory leak) 
						
						
					 
					
						2005-04-28 14:45:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						f638e5cb8f 
					 
					
						
						
							
							Bug#9102 - Stored proccedures: function which returns blob causes crash  
						
						 
						
						... 
						
						
						
						Initialization of fields for sp return type was not complete. 
						
						
					 
					
						2005-04-19 09:09:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						f93ebc20ac 
					 
					
						
						
							
							Bit type: code clean-up.  
						
						 
						
						
						
						
					 
					
						2005-04-12 23:12:00 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						eae4d9c073 
					 
					
						
						
							
							Bit type: code cleanup.  
						
						 
						
						
						
						
					 
					
						2005-04-12 19:36:21 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						3b1c3d8c68 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/home/ram/work/5.0.bit_class 
						
						
					 
					
						2005-04-12 12:30:09 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						c4376b2bc6 
					 
					
						
						
							
							Bit type support for non-MyISAM tables.  
						
						 
						
						
						
						
					 
					
						2005-04-12 12:27:43 +05:00