lars@mysql.com 
							
						 
					 
					
						
						
							
						
						630dd9a0b7 
					 
					
						
						
							
							Merge mysql.com:/home/bkroot/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/bk/b6883-mysql-4.1 
						
						
					 
					
						2005-06-07 11:54:31 +02: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 
						 
				 
			
				
					
						
							
							
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						54bf811ada 
					 
					
						
						
							
							BUG#6883: Added implicit commit for CREATE TABLE, TRUNCATE TABLE and DROP/CREATE DATABASE  
						
						
						
						
					 
					
						2005-05-27 04:17:33 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b4e92e6360 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2005-05-14 00:01:40 +03:00 
						 
				 
			
				
					
						
							
							
								svoj@mysql.com 
							
						 
					 
					
						
						
							
						
						fc3ff35be6 
					 
					
						
						
							
							Test fix. DROP TABLE added.  
						
						
						
						
					 
					
						2005-05-07 21:37:27 +05:00 
						 
				 
			
				
					
						
							
							
								svoj@mysql.com 
							
						 
					 
					
						
						
							
						
						c7f0fcab23 
					 
					
						
						
							
							BUG#7709 fix - Boolean fulltext query against unsupported engines does not  
						
						... 
						
						
						
						fail. 
						
						
					 
					
						2005-05-07 15:48:56 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@ram-book.(none) 
							
						 
					 
					
						
						
							
						
						bec93d485b 
					 
					
						
						
							
							fix for bug  #4082 : Integer lengths cause truncation with DISTINCT CONCAT and InnoDB  
						
						
						
						
					 
					
						2005-05-06 20:11:01 +05:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						4757803662 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2005-04-14 21:31:22 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						533e0551f2 
					 
					
						
						
							
							TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode  
						
						... 
						
						
						
						bug#8151 
						
						
					 
					
						2005-04-14 18:14:54 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						bfa7520356 
					 
					
						
						
							
							Clean up InnoDB testing with embedded server.  
						
						
						
						
					 
					
						2005-03-29 16:10:43 -08: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 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						d6dadac46c 
					 
					
						
						
							
							Merge mysql.com:/home/wax/mysql/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/wax/mysql/mysql-4.1mysqltest 
						
						
					 
					
						2004-09-16 00:50:05 +06:00 
						 
				 
			
				
					
						
							
							
								wax@kishkin.ru 
							
						 
					 
					
						
						
							
						
						eb7515366b 
					 
					
						
						
							
							WL#964  
						
						... 
						
						
						
						porting mysql_test_run on Linux and Windows 
						
						
					 
					
						2004-09-16 00:47:45 +06:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1f0cd873c5 
					 
					
						
						
							
							manual merged (blame me!)  
						
						
						
						
					 
					
						2004-07-20 00:53:24 +02:00 
						 
				 
			
				
					
						
							
							
								marko@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						20b60510e9 
					 
					
						
						
							
							InnoDB: limit the recursion depth for ON (UPDATE|DELETE) CASCADE  
						
						... 
						
						
						
						(Bug #4446 ) 
						
						
					 
					
						2004-07-15 15:46:22 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						067b2e3bb0 
					 
					
						
						
							
							Moved testing of binlog_cache_use/binlog_cache_disk_use statistical variables from  
						
						... 
						
						
						
						rpl_relayrotate.test to innodb.test since this test requires innodb support. 
						
						
					 
					
						2004-05-19 17:43:50 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						0dc8aacf7d 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2004-05-15 11:26:58 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e0a4b51215 
					 
					
						
						
							
							Better fix for bug  #3749  (bug in deleting automatic generated foreign keys)  
						
						
						
						
					 
					
						2004-05-15 11:57:40 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						67f1c04ffc 
					 
					
						
						
							
							better fix for bug#3749 - do not consider already removed keys in key removal process  
						
						
						
						
					 
					
						2004-05-14 12:49:18 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						116f61c656 
					 
					
						
						
							
							Don't automaticly generate a new key for a foreign key constraint if there is already a usable key.  
						
						... 
						
						
						
						Prefer not automatic keys before automatic keys. If there is two conf 
						
						
					 
					
						2004-05-12 00:29:52 +03:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						daba6b63b8 
					 
					
						
						
							
							Fix for bug  #2160 : Extra error message for CREATE TABLE LIKE with InnoDB  
						
						
						
						
					 
					
						2004-03-31 14:29:01 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						43451f3e5b 
					 
					
						
						
							
							Merge with 4.0 to get fixed tests  
						
						
						
						
					 
					
						2004-02-22 10:04:08 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						fa882fd73c 
					 
					
						
						
							
							Move tests that uses innodb to innodb.test  
						
						
						
						
					 
					
						2004-02-22 09:58:51 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e9315f984d 
					 
					
						
						
							
							Changed wellformedlen to well_formed_len  
						
						... 
						
						
						
						Fixed that blobs >16M can be inserted/updated
Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE 
						
						
					 
					
						2004-02-17 01:35:17 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f43093ec0e 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t) 
						
						
					 
					
						2004-02-16 10:03:25 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ce14578909 
					 
					
						
						
							
							Merge with 4.0.18  
						
						
						
						
					 
					
						2004-02-11 00:06:46 +01:00 
						 
				 
			
				
					
						
							
							
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						77d60aa63c 
					 
					
						
						
							
							innodb.result, innodb.test:  
						
						... 
						
						
						
						Change tests so that tables are dropped in an order respecting the FOREIGN KEY constraints 
						
						
					 
					
						2004-02-02 01:30:59 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ed44e769ba 
					 
					
						
						
							
							Fixed parsing of column names and foreign key constraints in Innobase to handle quoted identifiers and identifiers with space. (Bug  #1725 )  
						
						... 
						
						
						
						Fix optimizer tuning bug when first used key part was a constant. (Bug #1679 ) 
						
						
					 
					
						2004-01-30 10:46:30 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						031390a9a4 
					 
					
						
						
							
							Fixes after merge with 4.0  
						
						... 
						
						
						
						Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work) 
						
						
					 
					
						2003-12-19 16:25:50 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e0cc6799ec 
					 
					
						
						
							
							Merge with 4.0.17  
						
						
						
						
					 
					
						2003-12-17 17:35:34 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f995a5f4aa 
					 
					
						
						
							
							Fix autoincrement for signed columns (Bug  #1366 )  
						
						... 
						
						
						
						Fixed problem with char > 128 in QUOTE() function. (Bug #1868 )
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651 )
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711 )
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998 )
Fixed timestamp.test 
						
						
					 
					
						2003-12-12 22:26:58 +02: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@mysql.com 
							
						 
					 
					
						
						
							
						
						e36fd28447 
					 
					
						
						
							
							Allow space in service names  
						
						... 
						
						
						
						move bdb/innodb tests to right places 
						
						
					 
					
						2003-12-04 19:48:10 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						01e1161676 
					 
					
						
						
							
							cleanup  
						
						
						
						
					 
					
						2003-11-15 12:30:32 +01:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						d37a5c4dd7 
					 
					
						
						
							
							Indentation cleanups  
						
						... 
						
						
						
						Remove wait_if_global_read_lock on commit as this can cause deadlocks 
						
						
					 
					
						2003-10-08 21:50:05 +03:00 
						 
				 
			
				
					
						
							
							
								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