msvensson@shellback.(none) 
							
						 
					 
					
						
						
							
						
						359b2ef4dc 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new  
						
						... 
						
						
						
						into  shellback.(none):/home/msvensson/mysql/mysql-5.1 
						
						
					 
					
						2006-02-28 11:00:47 +01:00 
						 
				 
			
				
					
						
							
							
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						1e66bc0d16 
					 
					
						
						
							
							Merge mysql.com:/home/bkroot/mysql-5.1-new  
						
						... 
						
						
						
						into  mysql.com:/home/bk/w3023-mysql-5.1-new 
						
						
					 
					
						2006-02-28 10:06:58 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@shellback.(none) 
							
						 
					 
					
						
						
							
						
						6c35d51cb8 
					 
					
						
						
							
							Bug#17721 Test 'exampledb' hangs on Windows  
						
						... 
						
						
						
						- Removed ifdefs from handler class
- The handler class is an external interface to dynamically loadable storage engine and should not be changed by defines. This is especially important for the virtual functions. 
						
						
					 
					
						2006-02-27 14:21:48 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e6a98314a7 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new  
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.1 
						
						
					 
					
						2006-02-26 15:12:56 +02:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						0071749595 
					 
					
						
						
							
							WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement),  
						
						... 
						
						
						
						and new binlog format called "mixed" (which is statement-based except if only row-based is correct,
in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release):
SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default;
the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha.
It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE
TEMPORARY TABLE was not binlogged so temp table is not known on slave),  or if NDB is enabled (because
NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below).
The added tests test the possibility or impossibility to SET, their effects, and the mixed mode,
including in prepared statements and in stored procedures and functions.
Caveats:
a) The mixed mode will not work for stored functions: in mixed mode, a stored function will
always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()).
b) for the same reason, changing the thread's binlog format inside a stored function is
refused with an error message.
c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask
Dmitri).
Additionally, as the binlog format is now changeable by each user for his session, I remove the implication
which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1
(not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically
set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled
phantom protection).
Plus fixes for compiler warnings. 
						
						
					 
					
						2006-02-25 22:21:03 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1e2e9e2856 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-5.0  
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.1 
						
						
					 
					
						2006-02-25 21:54:34 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						54274976e7 
					 
					
						
						
							
							Fixed compiler warnings from gcc 4.0.2:  
						
						... 
						
						
						
						- Added empty constructors and virtual destructors to many classes and structs
- Removed some usage of the offsetof() macro to instead use C++ class pointers 
						
						
					 
					
						2006-02-25 17:46:30 +02:00 
						 
				 
			
				
					
						
							
							
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						13a61982a9 
					 
					
						
						
							
							Merge mysqldev@production.mysql.com:my/mysql-5.1-release  
						
						... 
						
						
						
						into  mysql.com:/home/bk/w3023-mysql-5.1-new 
						
						
					 
					
						2006-02-24 16:31:38 +01:00 
						 
				 
			
				
					
						
							
							
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						101edab125 
					 
					
						
						
							
							WL#3023 (RBR: Use locks in a statement-like manner):  
						
						... 
						
						
						
						Adaptions to make it work with NDB. 
						
						
					 
					
						2006-02-24 16:19:55 +01:00 
						 
				 
			
				
					
						
							
							
								reggie@linux.site 
							
						 
					 
					
						
						
							
						
						336c0ba4cb 
					 
					
						
						
							
							Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new  
						
						... 
						
						
						
						into  linux.site:/home/reggie/work/mysql-5.1-bug15408 
						
						
					 
					
						2006-02-21 10:29:41 -06:00 
						 
				 
			
				
					
						
							
							
								pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						dd17f48630 
					 
					
						
						
							
							Merge c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-bugs  
						
						... 
						
						
						
						into  c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826 
						
						
					 
					
						2006-02-20 16:41:46 -05:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						9495f8c56a 
					 
					
						
						
							
							Bug  #17210  Create temp table call to ha_ndbcluster::create_handler_files caused core  
						
						... 
						
						
						
						- do not try to create ndb temp tables even if default storage is ndb 
						
						
					 
					
						2006-02-17 17:12:35 +01:00 
						 
				 
			
				
					
						
							
							
								holyfoot@mysql.com 
							
						 
					 
					
						
						
							
						
						be02944df6 
					 
					
						
						
							
							Merging 5.0->5.1  
						
						
						
						
					 
					
						2006-02-17 11:26:03 +04:00 
						 
				 
			
				
					
						
							
							
								holyfoot@deer.(none) 
							
						 
					 
					
						
						
							
						
						053d90a234 
					 
					
						
						
							
							WL#2645 (CHECK TABLE FOR UPGRADE)  
						
						... 
						
						
						
						necessary implementation in the server
mysql_upgrade script added 
						
						
					 
					
						2006-02-17 10:52:32 +04:00 
						 
				 
			
				
					
						
							
							
								reggie@big_geek. 
							
						 
					 
					
						
						
							
						
						3ce0880d3f 
					 
					
						
						
							
							Merge reggie@192.168.0.9:/home/reggie/work/mysql-5.1-bug15408  
						
						... 
						
						
						
						into  big_geek.:C:/Work/mysql/mysql-5.1-bug15408 
						
						
					 
					
						2006-02-16 11:07:21 -06:00 
						 
				 
			
				
					
						
							
							
								reggie@big_geek. 
							
						 
					 
					
						
						
							
						
						466a5bb399 
					 
					
						
						
							
							BUG#15408: Partitions: subpartition names are not unique  
						
						... 
						
						
						
						Also, moved some of the code out of handler.h and into partition specific files for better 
separation.
Also, moved some of the C funcs into partition_info as formal C++ methods 
						
						
					 
					
						2006-02-16 10:38:33 -06:00 
						 
				 
			
				
					
						
							
							
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						43bc3c4068 
					 
					
						
						
							
							Merge mysql.com:/home/bkroot/mysql-5.1-new  
						
						... 
						
						
						
						into  mysql.com:/home/bk/w3023-mysql-5.1-new 
						
						
					 
					
						2006-02-16 08:46:45 +01:00 
						 
				 
			
				
					
						
							
							
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						2884408c75 
					 
					
						
						
							
							WL#3023 (Use locks in a statement-like manner):  
						
						... 
						
						
						
						Table maps are now written on aquiring locks to tables and released
  at the end of each logical statement. 
						
						
					 
					
						2006-02-16 08:30:53 +01:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						5230866f59 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new  
						
						... 
						
						
						
						into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work 
						
						
					 
					
						2006-02-14 11:51:44 +01:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						efd6779c80 
					 
					
						
						
							
							Bug  #17340   	SHOW CREATE TABLE from second session crashes the server  
						
						... 
						
						
						
						- no check was made that ndb thd object was allocated 
						
						
					 
					
						2006-02-13 21:55:49 +01:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						1e85c05d67 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new  
						
						... 
						
						
						
						into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work 
						
						
					 
					
						2006-02-13 14:56:45 +01:00 
						 
				 
			
				
					
						
							
							
								mikron@mikael-ronstr-ms-dator.local 
							
						 
					 
					
						
						
							
						
						5a20f2d0b4 
					 
					
						
						
							
							WL 2826: Error handling of ALTER TABLE for partitioning  
						
						... 
						
						
						
						Introduce log entry to handle replace of frm file 
						
						
					 
					
						2006-02-13 13:52:23 +01:00 
						 
				 
			
				
					
						
							
							
								brian@zim.tangent.org 
							
						 
					 
					
						
						
							
						
						eeefb8ba7c 
					 
					
						
						
							
							Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new  
						
						... 
						
						
						
						into  zim.tangent.org:/home/brian/raid/mysql-5.1-new 
						
						
					 
					
						2006-02-11 17:26:32 -08:00 
						 
				 
			
				
					
						
							
							
								brian@zim.tangent.org 
							
						 
					 
					
						
						
							
						
						9485856f1a 
					 
					
						
						
							
							This patch is to further remove the RAID code. We removed support for people creating tables with RAID. This patch remove most of the source for this.  
						
						
						
						
					 
					
						2006-02-11 17:21:01 -08:00 
						 
				 
			
				
					
						
							
							
								pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						12647d736b 
					 
					
						
						
							
							Compile fixes  
						
						
						
						
					 
					
						2006-02-11 00:41:52 -05:00 
						 
				 
			
				
					
						
							
							
								mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						10c5b8f3ba 
					 
					
						
						
							
							WL 2826: Error handling of ALTER TABLE for partitioning  
						
						... 
						
						
						
						Make lots of fixes to handle the most complex case of reorganising
of partitions where two-phased processes are needed in some cases. 
						
						
					 
					
						2006-02-10 22:36:01 +01:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						5c2c52b0cb 
					 
					
						
						
							
							Added partition pruning checks (WL#2987)  
						
						
						
						
					 
					
						2006-02-10 17:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						dd59559597 
					 
					
						
						
							
							WL 2826: Error handling of ALTER TABLE for partitioning  
						
						... 
						
						
						
						A number of fixes 
						
						
					 
					
						2006-02-09 14:13:22 -05:00 
						 
				 
			
				
					
						
							
							
								mikron@c-e90be253.1238-1-64736c10.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						d9ef322c5f 
					 
					
						
						
							
							WL 2826: Error handling for ALTER TABLE for partitioning  
						
						... 
						
						
						
						Step 14: First version of table log for add/Drop partition 
						
						
					 
					
						2006-02-09 11:05:05 +01:00 
						 
				 
			
				
					
						
							
							
								anozdrin@mysql.com 
							
						 
					 
					
						
						
							
						
						e24336b0c8 
					 
					
						
						
							
							Fix compilation failure.  
						
						
						
						
					 
					
						2006-02-08 12:51:28 +03:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						a8f1cffd95 
					 
					
						
						
							
							Bug  #17038 , distribution of schema operation to multiple binlogs missing/multiple entries, partial fix  
						
						... 
						
						
						
						- log alter table directly in server instead of in handler
- acknowledge alter table _after_ all binlog events have been processed 
						
						
					 
					
						2006-02-06 11:47:12 +01:00 
						 
				 
			
				
					
						
							
							
								stewart@mysql.com 
							
						 
					 
					
						
						
							
						
						72b9f287df 
					 
					
						
						
							
							Merge mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359  
						
						... 
						
						
						
						into  mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge 
						
						
					 
					
						2006-02-02 00:52:32 +11:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						de2c7c72d9 
					 
					
						
						
							
							MySQL Bugs:  #16466 : DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK  
						
						
						
						
					 
					
						2006-02-01 11:56:20 +01:00 
						 
				 
			
				
					
						
							
							
								mikron@c-4d08e253.1238-1-64736c10.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						08e12cada9 
					 
					
						
						
							
							WL 2826: First step in error handling of ALTER TABLE for partitioning  
						
						
						
						
					 
					
						2006-02-01 10:06:07 +01:00 
						 
				 
			
				
					
						
							
							
								stewart@mysql.com 
							
						 
					 
					
						
						
							
						
						7458f115ed 
					 
					
						
						
							
							Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new  
						
						... 
						
						
						
						into  mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359 
						
						
					 
					
						2006-02-01 18:23:34 +11:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						f4f0f1d66c 
					 
					
						
						
							
							Bug  #16466   	DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK  
						
						
						
						
					 
					
						2006-01-31 18:46:44 +01:00 
						 
				 
			
				
					
						
							
							
								knielsen@mysql.com 
							
						 
					 
					
						
						
							
						
						56d44ff1f9 
					 
					
						
						
							
							Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes  
						
						... 
						
						
						
						into  mysql.com:/usr/local/mysql/x/mysql-5.1-new 
						
						
					 
					
						2006-01-30 17:57:20 +01:00 
						 
				 
			
				
					
						
							
							
								knielsen@mysql.com 
							
						 
					 
					
						
						
							
						
						899fc2653d 
					 
					
						
						
							
							Windows compile fixes in preparation for 5.1.6 beta.  
						
						
						
						
					 
					
						2006-01-30 13:09:08 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						cb354667ff 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.1 
						
						
					 
					
						2006-01-29 09:53:26 +01:00 
						 
				 
			
				
					
						
							
							
								patg@govinda.patg.net 
							
						 
					 
					
						
						
							
						
						437368e417 
					 
					
						
						
							
							WL# 2986  
						
						... 
						
						
						
						Final patch
-----------
This WL is about using this bitmap in all parts of the partition handler.
Thus for:
rnd_init/rnd_next
index_init/index_next and all other variants of index scans
read_range_... the various range scans implemented in the partition handler.
Also use those bitmaps in the various other calls that currently loop over all
partitions. 
						
						
					 
					
						2006-01-28 16:22:32 -08:00 
						 
				 
			
				
					
						
							
							
								stewart@mysql.com 
							
						 
					 
					
						
						
							
						
						5c3d5e28af 
					 
					
						
						
							
							WL#1359 NDB: Add table handler and table information available from SQL commands  
						
						... 
						
						
						
						add a FILES table that allows the user to run SQL queries on the files used
to store their tables.
Currently supports NDB 
						
						
					 
					
						2006-01-28 16:16:23 +13:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						4d2173d997 
					 
					
						
						
							
							gcc295 fixes for embedded  
						
						
						
						
					 
					
						2006-01-26 20:56:56 +01:00 
						 
				 
			
				
					
						
							
							
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						5f7956094c 
					 
					
						
						
							
							WL#3023 (RBR: Use locks in a statment-like manner):  
						
						... 
						
						
						
						Interface changes pushed early.
  Separation of public and implementation interface for external_lock()
  in preparation for implementation. 
						
						
					 
					
						2006-01-26 09:25:37 +01:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						8223334008 
					 
					
						
						
							
							Compile failure fix for gcc 2.95x: Don't use unnamed union of unnamed  
						
						... 
						
						
						
						structs in PARTITION_ITERATOR 
						
						
					 
					
						2006-01-25 06:01:54 +03:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						2e458b0928 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new  
						
						... 
						
						
						
						into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5 
						
						
					 
					
						2006-01-20 19:38:11 +03:00 
						 
				 
			
				
					
						
							
							
								cps@outpost.site 
							
						 
					 
					
						
						
							
						
						c08d4aa703 
					 
					
						
						
							
							Fix the tree: plugin-related changes, necessary for  
						
						... 
						
						
						
						CSV storage engine to be statically compiled.
Derived from antony's patch. 
						
						
					 
					
						2006-01-20 00:40:56 +03:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						09004c2a03 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new  
						
						... 
						
						
						
						into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5 
						
						
					 
					
						2006-01-19 17:05:57 +03:00 
						 
				 
			
				
					
						
							
							
								cps@outpost.site 
							
						 
					 
					
						
						
							
						
						ce2eb6d8cb 
					 
					
						
						
							
							WL1019: complete patch. Reapplied patch to the clean  
						
						... 
						
						
						
						tree to get rid of multiple typos in CS comments and
unify the patch. 
						
						
					 
					
						2006-01-19 05:56:06 +03:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						55380631cc 
					 
					
						
						
							
							Manual merge  
						
						
						
						
					 
					
						2006-01-18 14:09:08 +03:00 
						 
				 
			
				
					
						
							
							
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						802c94dd9f 
					 
					
						
						
							
							Merge mysql.com:/home/bkroot/mysql-5.1-new  
						
						... 
						
						
						
						into  mysql.com:/home/bk/w3023-mysql-5.1-new 
						
						
					 
					
						2006-01-18 11:16:30 +01:00