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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						1d32e06be9 
					 
					
						
						
							
							Few more places with thd->lex replaced with lex (mysql_update,  
						
						 
						
						... 
						
						
						
						check_simple_select). This change was inspired by Monty in December 2003
when thd->lex became a pointer in 4.1. 
						
						
					 
					
						2004-11-11 22:37:48 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						0ef0b030a5 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-11-11 21:18:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a41ef77b7b 
					 
					
						
						
							
							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-08 03:33:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9d0bb7426a 
					 
					
						
						
							
							postreview fixes  
						
						 
						
						
						
						
					 
					
						2004-11-08 01:54:23 +02: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						064b02203f 
					 
					
						
						
							
							new lock for multiupdate:  
						
						 
						
						... 
						
						
						
						- open and create derived tables
- detect which tables should be locked for write
- lock and fill derived tables
some unitialized variables fixed 
						
						
					 
					
						2004-11-05 17:29:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						47bbf768d4 
					 
					
						
						
							
							Fixes after merge with 4.1  
						
						 
						
						... 
						
						
						
						FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete 
						
						
					 
					
						2004-11-03 12:39:38 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c287345cb8 
					 
					
						
						
							
							fixed incorrect type custing (fixed problem with runing tests with --debug (thanks, Sergei Gluhov spoted it))  
						
						 
						
						
						
						
					 
					
						2004-10-09 18:51:19 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c8d5f8991d 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-10-07 11:36:46 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						6239edc1d1 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						... 
						
						
						
						Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code 
						
						
					 
					
						2004-10-07 10:50:13 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3ef0b19cd3 
					 
					
						
						
							
							fixed & added comments (according to Igor's review and a bit more)  
						
						 
						
						
						
						
					 
					
						2004-10-07 01:45:06 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						c27d22b44e 
					 
					
						
						
							
							Reverted patch for new usage of open_count as it caused more problems than it solved  
						
						 
						
						... 
						
						
						
						Cleaned up patch for checking locks for multi-table updates 
						
						
					 
					
						2004-10-06 01:24:21 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a78f817d20 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-10-05 13:41:51 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						5eca078b19 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-10-05 01:10:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						0fa62b691b 
					 
					
						
						
							
							Fixed bug in strict mode (A state was not properly cleared on successful insert/update's)  
						
						 
						
						
						
						
					 
					
						2004-10-05 01:05:15 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9062e99ee6 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-10-04 13:56:48 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						2973a047ea 
					 
					
						
						
							
							Bug#4118: multi-table UPDATE takes WRITE lock on read table  
						
						 
						
						... 
						
						
						
						Ensures that WRITE lock is not obtained on all tables referenced. 
						
						
					 
					
						2004-10-03 00:20:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						be4ca46fbe 
					 
					
						
						
							
							More fixes for strict mode:  
						
						 
						
						... 
						
						
						
						More tests.
Better error messages.
Fixed bug when checking if we updated all needed columns for INSERT.
Give an error if we encounter a wrong float value during parsing.
Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS.
Fixed UPDATE IGNORE when using STRICT mode. 
						
						
					 
					
						2004-10-02 22:20:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						2511990c97 
					 
					
						
						
							
							Support for TIMESTAMP columns holding NULL values. Unlike all other  
						
						 
						
						... 
						
						
						
						column types TIMESTAMP is NOT NULL by default, so in order to have 
TIMESTAMP column holding NULL valaues you have to specify NULL as
one of its attributes (this needed for backward compatibility).
Main changes:
Replaced TABLE::timestamp_default_now/on_update_now members with
TABLE::timestamp_auto_set_type flag which is used everywhere
for determining if we should auto-set value of TIMESTAMP field 
during this operation or not. We are also use Field_timestamp::set_time()
instead of handler::update_timestamp() in handlers. 
						
						
					 
					
						2004-10-01 18:54:06 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						013512abab 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-09-29 17:10:17 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						392292a46b 
					 
					
						
						
							
							post review changes:  
						
						 
						
						... 
						
						
						
						CHECK OPTION moved to one function
view name added to error messages 
						
						
					 
					
						2004-09-29 16:35:01 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						1fc7e6af85 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mishka.local:/home/my/mysql-5.0 
						
						
					 
					
						2004-09-28 20:19:03 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						f2941380c4 
					 
					
						
						
							
							Strict mode & better warnings  
						
						 
						
						... 
						
						
						
						Under strict mode MySQL will generate an error message if there was any conversion when assigning data to a field.
Added checking of date/datetime fields.
If strict mode, give error if we have not given value to field without a default value (for INSERT) 
						
						
					 
					
						2004-09-28 20:08:00 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						0b6dc49388 
					 
					
						
						
							
							Bug#5553 - Multi table UPDATE IGNORE fails on dup key  
						
						 
						
						... 
						
						
						
						We don't want the update to abort when IGNORE is specified 
						
						
					 
					
						2004-09-17 12:07:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						09b316f051 
					 
					
						
						
							
							updateability of field with collation support (BUG#5506)  
						
						 
						
						
						
						
					 
					
						2004-09-16 23:45:20 +03: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						0badc913bb 
					 
					
						
						
							
							check that table used in multi-update is unique added (BUG#5455)  
						
						 
						
						
						
						
					 
					
						2004-09-08 13:39:15 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ee03178f01 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-09-06 15:56:38 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						6d8e178523 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-09-05 22:14:27 +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 
							
						 
					 
					
						
						
							
						
						46ff90738b 
					 
					
						
						
							
							Merge with pulled code  
						
						 
						
						
						
						
					 
					
						2004-09-03 22:38:45 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						bd2c119176 
					 
					
						
						
							
							CHECK OPTIONs added (WL#1983)  
						
						 
						
						
						
						
					 
					
						2004-09-03 15:18:40 +03: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a27b1e54d5 
					 
					
						
						
							
							fixed using VIEW fields (BUG#4617)  
						
						 
						
						
						
						
					 
					
						2004-07-23 09:20:58 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								miguel@hegel.txg 
							
						 
					 
					
						
						
							
						
						b3b598d19c 
					 
					
						
						
							
							Fixes for bug  #4571  (Windows compabilities)  
						
						 
						
						
						
						
					 
					
						2004-07-16 03:47:17 -03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9336d36cf8 
					 
					
						
						
							
							VIEW  
						
						 
						
						... 
						
						
						
						two TABLE_LIST copy eliminated 
						
						
					 
					
						2004-07-16 01:15:55 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						31fe2837f9 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-07-12 08:20:24 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						db7efa2780 
					 
					
						
						
							
							New handler::index_flags() definition to make it easy to check the full used key and a specific key part.  
						
						 
						
						... 
						
						
						
						Added key part to optimize_range() to fix problems when using fields in key parts. 
						
						
					 
					
						2004-07-08 15:45:25 +03:00