monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0de4777187 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2004-12-06 11:38:56 +02:00 
						 
				 
			
				
					
						
							
							
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						2bbdf2403d 
					 
					
						
						
							
							Bug#6391 (binlog-do-db rules ignored)  
						
						... 
						
						
						
						CREATE DATABASE statement used the current database instead of the
  database created when checking conditions for replication.
  CREATE/DROP/ALTER DATABASE statements are now replicated based on
  the manipulated database. 
						
						
					 
					
						2004-12-03 12:13:51 +01:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a1cac9687e 
					 
					
						
						
							
							spelling fixed/comments added (postreview fixes)  
						
						
						
						
					 
					
						2004-11-25 09:28:32 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1e3d8b0839 
					 
					
						
						
							
							post-merge fix  
						
						
						
						
					 
					
						2004-11-25 02:23:13 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						072d38eb12 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-11-21 20:08:12 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d76db8b999 
					 
					
						
						
							
							marge  
						
						
						
						
					 
					
						2004-11-13 19:45:36 +02: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 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						18f033b771 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-5.0-bg5890 
						
						
					 
					
						2004-11-12 17:21:24 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						e7a2466024 
					 
					
						
						
							
							Fix for bug  #5890  "Triggers fail for DELETE without WHERE".  
						
						... 
						
						
						
						If we have DELETE with always true WHERE clause we should not use 
optimized delete_all_rows() method for tables with DELETE triggers,
because in this case we will lose side-effect of deletion. 
						
						
					 
					
						2004-11-12 17:04:07 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1555469b64 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-11-12 15:36:31 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						31f7811183 
					 
					
						
						
							
							post-review fixes  
						
						
						
						
					 
					
						2004-11-12 14:34:00 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						0ef0b030a5 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-11-11 21:18:10 +02:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						6ccdd6c454 
					 
					
						
						
							
							Cleanup: thd->lex->select_lex -> select_lex (sql_delete.cc)  
						
						
						
						
					 
					
						2004-11-11 22:16:46 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7eae926e26 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0 
						
						
					 
					
						2004-11-06 12:46:46 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						afbe601302 
					 
					
						
						
							
							merge with 4.1  
						
						
						
						
					 
					
						2004-10-29 19:26:52 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3d389a038e 
					 
					
						
						
							
							fixed detection of updating table on which we select (BUG#6032)  
						
						
						
						
					 
					
						2004-10-25 17:32:28 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4714a6e744 
					 
					
						
						
							
							errors without code removed  
						
						... 
						
						
						
						net_printf/send_error calls replaced by my_error family functions
-1/1 (sent/unsent) error reporting removed
(WL#2133) 
						
						
					 
					
						2004-10-20 04:04:37 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						62f3cd6a31 
					 
					
						
						
							
							Merge with 4.0 for 4.1 release  
						
						... 
						
						
						
						Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied 
						
						
					 
					
						2004-10-06 19:14:33 +03:00 
						 
				 
			
				
					
						
							
							
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						62a42f7f57 
					 
					
						
						
							
							A fix (Bug  #5415 : Table marked as crashed after DELETE queries).  
						
						
						
						
					 
					
						2004-09-19 16:15:01 +05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						67fcac7a87 
					 
					
						
						
							
							support of join view updateability (WL#1809)  
						
						
						
						
					 
					
						2004-09-15 23:42:56 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						f797298fc5 
					 
					
						
						
							
							fixed merged view fields names (BUG#5147)  
						
						... 
						
						
						
						support of merged VIEW over several tables added (WL#1809) 
						
						
					 
					
						2004-09-14 19:28:29 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						763c57d41f 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0 
						
						
					 
					
						2004-09-10 02:26:09 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						c46e640009 
					 
					
						
						
							
							Yet another manual merge with main tree for patch for WL#1218 "Triggers"  
						
						
						
						
					 
					
						2004-09-09 19:52:10 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						336cb5f8be 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-09-09 16:52:22 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						49cd04b510 
					 
					
						
						
							
							Merge on pull  
						
						
						
						
					 
					
						2004-09-09 07:26:28 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						9b1bc6a4d5 
					 
					
						
						
							
							Merge of changes from the main tree to tree for WL#1218 "Triggers".  
						
						
						
						
					 
					
						2004-09-08 13:29:21 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						425857f5b2 
					 
					
						
						
							
							test of updating and fetching from the same table check (BUG##5157)  
						
						
						
						
					 
					
						2004-09-08 10:18:04 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						9ed038dd6f 
					 
					
						
						
							
							WL#1218 "Triggers". Some very preliminary version of patch.  
						
						... 
						
						
						
						Mostly needed for Monty for him getting notion what needed for triggers 
from new .FRM format. 
Things to be done:
- Right placement of trigger's invocations
- Right handling of errors in triggers (including transaction rollback)
- Support for priviliges
- Right handling of DROP/RENAME table (hope that it will be handled automatically
  with merging of .TRG into .FRM file)
- Saving/restoring some information critical for trigger creation and replication
  with their definitions (e.g. sql_mode, creator, ...)
- Replication
Already has some known bugs so probably not for general review. 
						
						
					 
					
						2004-09-07 16:29:46 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						31122efde7 
					 
					
						
						
							
							Merge with 4.1  
						
						... 
						
						
						
						(Includes merge of arena code in 4.1 and 5.0) 
						
						
					 
					
						2004-09-06 15:14:10 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						161662ba4c 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0 
						
						
					 
					
						2004-09-04 15:32:13 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cbd67f49e1 
					 
					
						
						
							
							Cleanup of new code pushed into 5.0 since last pull  
						
						... 
						
						
						
						Merged the different find_xxxx_table_in_list functions to one + some inline functions 
						
						
					 
					
						2004-09-03 21:43:04 +03:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.(none) 
							
						 
					 
					
						
						
							
						
						caf79dacfe 
					 
					
						
						
							
							renamed ha_recovery_logging to ha_enable_transaction  
						
						... 
						
						
						
						added tests to alter table for "large" alter tables and truncates in ndbcluster
added debug printout in restart() in ndbcluster
added flag THD::transaction.on to enable/disable transaction 
						
						
					 
					
						2004-09-03 15:11:09 +00:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						392c306969 
					 
					
						
						
							
							fixed open_and_lock_tables result processing (all open_and_lock_tables revision)  
						
						... 
						
						
						
						fixed printing of COLLATE operation
(BUG#5155) 
						
						
					 
					
						2004-08-31 10:06:38 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8f2d92c56a 
					 
					
						
						
							
							manually merged  
						
						
						
						
					 
					
						2004-08-24 17:24:23 +02:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						252ebd2b30 
					 
					
						
						
							
							Fix for BUG#5033 "When using temporary tables truncate does NOT reset the auto_increment counter"  
						
						... 
						
						
						
						(ok'd by CTO to fix it in 4.0).
Fix to make mysql-test-run work with all Valgrind versions. 
						
						
					 
					
						2004-08-23 16:15:57 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9336d36cf8 
					 
					
						
						
							
							VIEW  
						
						... 
						
						
						
						two TABLE_LIST copy eliminated 
						
						
					 
					
						2004-07-16 01:15:55 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1e31199995 
					 
					
						
						
							
							Merge with 4.1.3-beta  
						
						
						
						
					 
					
						2004-07-07 11:29:39 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c03addab79 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2004-06-23 12:36:07 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3f1c4ba745 
					 
					
						
						
							
							handler interface cleanups:  
						
						... 
						
						
						
						more logical table/index_flags
  return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
  max_keys and other limits renamed to max_supported_keys/etc
  max_keys/etc are now wrappers to max_supported_keys/etc 
  ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing 
						
						
					 
					
						2004-06-23 12:29:05 +02:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						2b20e84ff8 
					 
					
						
						
							
							Making DROP TABLE IF EXISTS, DROP DATABASE IF EXISTS, DELETE FROM, UPDATE be logged to  
						
						... 
						
						
						
						binlog even if they changed nothing, and a test for this.
This is useful when users use these commands to clean up their master and slave by issuing
one command on master (assume master and slave have slightly different data for some
reason and you want to clean up both).
Note that I have not changed multi-table DELETE and multi-table UPDATE because their
error-reporting mechanism is more complicated. 
						
						
					 
					
						2004-06-09 16:07:01 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						5843eec521 
					 
					
						
						
							
							Manual merge  
						
						
						
						
					 
					
						2004-05-29 20:55:46 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c7396f8d20 
					 
					
						
						
							
							PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug  #2266 )  
						
						
						
						
					 
					
						2004-05-20 02:02:49 +03:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						3b29cad05c 
					 
					
						
						
							
							Manual merge  
						
						
						
						
					 
					
						2004-05-13 01:49:47 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						a46d7542c9 
					 
					
						
						
							
							This is first cset for WL#1394 "Optimize index merge when all involved index ranges include only values with equal keys"  
						
						... 
						
						
						
						The main idea is to exploit the fact that key scans for "key=const" return ordered sequences of rowids. 
						
						
					 
					
						2004-05-13 01:38:40 +04:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						bf45960eef 
					 
					
						
						
							
							Merge 4.1 -> 5.0  
						
						
						
						
					 
					
						2004-05-07 18:52:06 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						296ba0ea57 
					 
					
						
						
							
							WL#1567: Add ROW_COUNT() Function to retrieve count of rows updated/inserted/deleted  
						
						
						
						
					 
					
						2004-05-04 13:45:20 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7d9a9fd93a 
					 
					
						
						
							
							Added missing return statement  
						
						
						
						
					 
					
						2004-04-12 03:26:32 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a535342d57 
					 
					
						
						
							
							after review PS fixes  
						
						
						
						
					 
					
						2004-04-10 01:14:32 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						dfd59e296e 
					 
					
						
						
							
							Merge 4.1 -> 5.0.  
						
						
						
						
					 
					
						2004-04-07 19:07:44 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						350b433569 
					 
					
						
						
							
							merge with 4.0  
						
						
						
						
					 
					
						2004-03-16 22:41:30 +02:00