serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						755455e15c 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2003-09-03 12:07:18 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2fcab1c2ee 
					 
					
						
						
							
							CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]  
						
						
						
						
					 
					
						2003-09-03 11:34:32 +02:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e4951147cf 
					 
					
						
						
							
							Fix for bug  #799  FLUSH TABLES WITH READ LOCK does not block CREATE TABLE  
						
						... 
						
						
						
						This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39).
Note about COMMIT&ROLLBACK:
  Only 'COMMIT' statement updates the binary log. 
  'ROLLBACK' statement doesn't update the binlog. 
						
						
					 
					
						2003-08-28 18:09:00 +05:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						eb3912c05a 
					 
					
						
						
							
							bug  #1078 . two innodb+delayed crashes  
						
						
						
						
					 
					
						2003-08-22 18:21:23 +02: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@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2263e3e51f 
					 
					
						
						
							
							Merge with 4.0.14  
						
						
						
						
					 
					
						2003-08-11 22:44:43 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						44f656708b 
					 
					
						
						
							
							absurd (and syntaxically incorrect) column definition corrected  
						
						
						
						
					 
					
						2003-07-21 00:32:35 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f259f379e4 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.0  
						
						... 
						
						
						
						into narttu.mysql.fi:/my/mysql-4.0 
						
						
					 
					
						2003-07-03 11:56:30 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						c21728f8c8 
					 
					
						
						
							
							Cleaner implementation if INSERT ... SELECT with same tables  
						
						... 
						
						
						
						Tests cleanup (put drop database first in tests) 
						
						
					 
					
						2003-07-03 11:55:36 +03:00 
						 
				 
			
				
					
						
							
							
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						7f4fe0b0f3 
					 
					
						
						
							
							innodb.result, innodb.test:  
						
						... 
						
						
						
						Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates 
						
						
					 
					
						2003-07-03 02:08:33 +03:00 
						 
				 
			
				
					
						
							
							
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						0ba742ed3b 
					 
					
						
						
							
							innodb.test, innodb.result:  
						
						... 
						
						
						
						Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit) 
						
						
					 
					
						2003-07-02 13:15:45 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dfac0fc90a 
					 
					
						
						
							
							Allow one to use MERGE tables with tables from different databases  
						
						... 
						
						
						
						Added command 'replace_column' to mysqltest 
						
						
					 
					
						2003-06-27 16:29:10 +03:00 
						 
				 
			
				
					
						
							
							
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						4da7f485b7 
					 
					
						
						
							
							Many files:  
						
						... 
						
						
						
						Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed 
						
						
					 
					
						2003-06-15 01:04:28 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6aa8929cf3 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Added initialization of all important global variables 
						
						
					 
					
						2003-05-21 21:39:58 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						a909b1b75d 
					 
					
						
						
							
							- disabled all "EXPLAIN SELECT" tests from the InnoDB test because of  
						
						... 
						
						
						
						nodeterministic results on some platforms 
						
						
					 
					
						2003-05-13 19:30:07 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						60dfb25be3 
					 
					
						
						
							
							Give warning if MySQL doesn't honor given storage engine  
						
						... 
						
						
						
						Allow syntax CREATE TABLE t1 (LIKE t2) 
						
						
					 
					
						2003-05-13 11:15:11 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						5f028be2e6 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.0  
						
						... 
						
						
						
						into narttu.mysql.fi:/my/mysql-4.0 
						
						
					 
					
						2003-05-03 16:22:56 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						7410b6cbdf 
					 
					
						
						
							
							Fix problem where key_read was not cleaned up properly, which caused assert in innodb test.  
						
						
						
						
					 
					
						2003-05-03 16:21:43 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						b086445181 
					 
					
						
						
							
							merge fix  
						
						
						
						
					 
					
						2003-04-29 14:35:10 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						89d9766fd2 
					 
					
						
						
							
							code cleanup  
						
						
						
						
					 
					
						2003-04-29 14:13:22 +03:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						ac411193b4 
					 
					
						
						
							
							- Removed two EXPLAIN SELECT statements from the InnoDB test suite  
						
						... 
						
						
						
						(the results are nondeterministic and provide different output on 32bit
  and 64bit architectures) 
						
						
					 
					
						2003-04-28 16:05:27 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						5d3df7610f 
					 
					
						
						
							
							merge fix  
						
						
						
						
					 
					
						2003-04-26 16:44:42 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f6a43bd567 
					 
					
						
						
							
							Fixes for valgrind  
						
						... 
						
						
						
						Added optimzation for clustered index
Fixed bug in UPDATE ... ORDER BY
Fixed handling of UPDATE ... LIMIT 
						
						
					 
					
						2003-04-23 21:52:16 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						adb52cfc70 
					 
					
						
						
							
							Fix for a bug record  #307 .  
						
						... 
						
						
						
						Very nasty bug.
It was caused by double free()-ing memory of join->select and 
join->quick. 
I was able to pinpoint it only after using Valgrind.
Plus better fix for bug with TMP_TABLE_PARAM.
Plus new constructor for SELECT_LEX. 
						
						
					 
					
						2003-04-21 21:03:32 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						c3db30b5f1 
					 
					
						
						
							
							Two bug fixes  
						
						
						
						
					 
					
						2003-04-11 20:09:24 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						10957fb0f3 
					 
					
						
						
							
							One test case, one bug fix and one new feature  
						
						
						
						
					 
					
						2003-04-03 20:24:15 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						112dfa5900 
					 
					
						
						
							
							Fixes for fill_help_tables.sql  
						
						
						
						
					 
					
						2003-03-21 18:53:55 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						11a810d710 
					 
					
						
						
							
							Fixed reference to uninitialized memory  
						
						
						
						
					 
					
						2003-03-21 11:49:17 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f8cd1e7906 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Fixed bug in Item::set_name()
Fix for memory leak with geometry type 
						
						
					 
					
						2003-03-20 21:35:03 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						b883a9c01c 
					 
					
						
						
							
							Merge with 4.0.12  
						
						
						
						
					 
					
						2003-03-19 22:25:44 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						386411b5ba 
					 
					
						
						
							
							Allow optimzation of multi-table-update also for InnoDB tables  
						
						... 
						
						
						
						MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
Fixed bug in multi-table-update where a row could be updated several times 
						
						
					 
					
						2003-03-19 00:45:44 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						c2fa342d53 
					 
					
						
						
							
							Merge with 3.23 to get fix for halloween problem on Update of InnoDB tables  
						
						
						
						
					 
					
						2003-03-18 03:19:20 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						052edd98d4 
					 
					
						
						
							
							Test of range optimizer in InnoDB  
						
						
						
						
					 
					
						2003-03-18 03:16:12 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						85de222334 
					 
					
						
						
							
							Fix of 'halloween bug' with UPDATE of InnoDB tables.  
						
						
						
						
					 
					
						2003-03-18 02:51:16 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a434bca704 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2003-03-16 19:17:54 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						aea4967bd5 
					 
					
						
						
							
							making sure that test works.  
						
						
						
						
					 
					
						2003-03-12 20:33:41 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						e68fba320b 
					 
					
						
						
							
							A little bit improved test case  
						
						
						
						
					 
					
						2003-03-12 14:34:07 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						40c744a3ac 
					 
					
						
						
							
							A  bug fix for multi-table updates with InnoDB storage engine  
						
						
						
						
					 
					
						2003-03-11 19:40:49 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						9a46698e1e 
					 
					
						
						
							
							Merge with 4.0.11  
						
						
						
						
					 
					
						2003-02-26 01:03:47 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						8a272349b9 
					 
					
						
						
							
							Applied Sinisa's patch:  
						
						... 
						
						
						
						"A fix for non-releasing locks for multi table updates and multi
table deletes with InnoDB tables." 
						
						
					 
					
						2003-02-19 15:08:29 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						90bf074438 
					 
					
						
						
							
							Merge with 4.0.11 tree to get latest bug fixes  
						
						
						
						
					 
					
						2003-02-17 05:43:37 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6051b2f998 
					 
					
						
						
							
							Fixed multi-table-delete for InnoDB tables  
						
						... 
						
						
						
						Novell patches 
						
						
					 
					
						2003-02-17 02:14:37 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						b14b246d38 
					 
					
						
						
							
							Merge with 4.0 to get fix for MIN/MAX  
						
						
						
						
					 
					
						2003-02-07 16:38:37 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						cf9668fd37 
					 
					
						
						
							
							Added START TRANSACTION syntax  
						
						... 
						
						
						
						Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement) 
						
						
					 
					
						2003-02-06 16:55:59 +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@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						8830eb4aa9 
					 
					
						
						
							
							Change of internal key_field=NULL handling to avoid error messages.  
						
						... 
						
						
						
						Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable 
						
						
					 
					
						2002-12-03 13:08:25 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d02d23c4c0 
					 
					
						
						
							
							Fixed some bugs from last multi-table-update push.  
						
						... 
						
						
						
						More tests for multi-table-update & timestamp handling 
						
						
					 
					
						2002-12-01 00:48:35 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						99a954f405 
					 
					
						
						
							
							InnoDB support for HANDLER  
						
						
						
						
					 
					
						2002-08-21 20:55:34 +00:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						ac6e640c4d 
					 
					
						
						
							
							Fix for SSL and new my_getopt  
						
						... 
						
						
						
						Fix for syntax error bug in SET TRANSACTION ISOLATION 
						
						
					 
					
						2002-08-09 16:47:16 +03:00