monty@mysql.com 
							
						 
					 
					
						
						
							
						
						77207d19f2 
					 
					
						
						
							
							Merge with new VARCHAR code  
						
						 
						
						
						
						
					 
					
						2004-12-06 19:18:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						878dd8ba0a 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5823 
						
						
					 
					
						2004-12-06 20:45:31 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						0282d03215 
					 
					
						
						
							
							Syntax extention: 'ALTER DATABASE' without db name (after review)  
						
						 
						
						
						
						
					 
					
						2004-12-06 19:01:51 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						75d0958dc3 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						... 
						
						
						
						Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld 
						
						
					 
					
						2004-12-06 17:15:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						bd247e3d56 
					 
					
						
						
							
							A fix (bug  #5823 : mysql_install_db fails due to incorrect max_allowed_packet).  
						
						 
						
						
						
						
					 
					
						2004-12-06 18:45:41 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0de4777187 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-12-06 11:38:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						67ce247965 
					 
					
						
						
							
							Add support for up to VARCHAR (size up to 65535)  
						
						 
						
						... 
						
						
						
						Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short 
						
						
					 
					
						2004-12-06 02:00:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						734ffb8452 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1 
						
						
					 
					
						2004-12-03 22:13:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						fe70f8c747 
					 
					
						
						
							
							Merge mysql.com:/space/bkroot/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/space/bk/b6391-mysql-4.1 
						
						
					 
					
						2004-12-03 12:15:31 +01: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						f3b577f591 
					 
					
						
						
							
							Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish. Normally this step is not long but it's still nice to be killable  
						
						 
						
						... 
						
						
						
						(especially in case of bug like BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"). 
						
						
					 
					
						2004-12-02 23:02:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						a09a603d83 
					 
					
						
						
							
							Bug  #6379 : ENUM values are incorrectly converted  
						
						 
						
						... 
						
						
						
						- add_field_to_list() now uses <List>String
instead of TYPELIB to be able to distinguish
literals 'aaa' and hex literals 0xaabbcc.
- move some code from add_field_to_list() where
  we don't know column charset yet, to 
  mysql_prepare_table(), where we do. 
						
						
					 
					
						2004-12-02 12:48:43 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4c017d18e2 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-12-01 10:25:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						f20e7a82b7 
					 
					
						
						
							
							now we create temporary join for all queries with subqueries to make correct cleunup of tables and avoid too early unlock (BUG#6841)  
						
						 
						
						
						
						
					 
					
						2004-11-30 21:41:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						f09429a4df 
					 
					
						
						
							
							protection: TRASH in delete  
						
						 
						
						... 
						
						
						
						fixed a bug that it discovered 
						
						
					 
					
						2004-11-28 15:53:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						246cf0d682 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2004-11-27 12:37:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						0eca0e0a68 
					 
					
						
						
							
							Merge mysql.com:/home/mydev/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/mydev/mysql-5.0-wl2050-new 
						
						
					 
					
						2004-11-25 21:58:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						cb53411b47 
					 
					
						
						
							
							WL#2050 - CREATE USER and DROP USER and RENAME USER  
						
						 
						
						... 
						
						
						
						Added new commands CREATE USER and RENAME USER.
Changed behaviour of DROP USER.
Changed an error messages for the new commands. 
						
						
					 
					
						2004-11-25 21:55:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						7dabb64176 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2004-11-25 17:36:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						a1e0e96e2d 
					 
					
						
						
							
							Fixed BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY  
						
						 
						
						... 
						
						
						
						...and for PURGE BEFORE too. (Don't fix_fields in the parser!) 
						
						
					 
					
						2004-11-25 16:13:06 +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 
							
						 
					 
					
						
						
							
						
						69ec6a4592 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-join-5.0 
						
						
					 
					
						2004-11-25 02:27:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1e3d8b0839 
					 
					
						
						
							
							post-merge fix  
						
						 
						
						
						
						
					 
					
						2004-11-25 02:23:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						bf173a85a9 
					 
					
						
						
							
							send_warning removed  
						
						 
						
						
						
						
					 
					
						2004-11-24 17:22:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						d201074611 
					 
					
						
						
							
							Fix for bug  #5888  "Triggers with nonexistent columns cause packets  
						
						 
						
						... 
						
						
						
						out of order". (final version)
Now instead of binding Item_trigger_field to TABLE objects during
trigger definition parsing at table open, we perform pass through
special list of all such objects in trigger. This allows easily check
all references to fields in old/new version of row in trigger during
execution of CREATE TRIGGER statement (this is more courtesy for users
since we can't check everything anyway).
We also report that such reference is bad by returning error from
Item_trigger_field::fix_fields() method (instead of setup_field())
This means that if trigger is broken we will bark during trigger
execution instead of trigger definition parsing at table open.
(i.e. now we allow to open tables with broken triggers). 
						
						
					 
					
						2004-11-24 12:24:02 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						43aefd66fd 
					 
					
						
						
							
							Fix compiler warnings on some systems. (Unused variables)  
						
						 
						
						... 
						
						
						
						Fixed bug in DROP FUNCTION for UDFs.
Note: It still doesn't work properly, but that bug is somewhere else. 
						
						
					 
					
						2004-11-23 19:19:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						072d38eb12 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-11-21 20:08:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						21eb2e2eae 
					 
					
						
						
							
							post merge  
						
						 
						
						
						
						
					 
					
						2004-11-21 19:33:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						f5e253dc2f 
					 
					
						
						
							
							reporting empty result added in case of max/min optimisation of ALL/ANY/SOME subqueries  
						
						 
						
						... 
						
						
						
						fixed null processing in NOT operation used in ALL subquery (Bug #6247 ) 
						
						
					 
					
						2004-11-18 18:10:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						a68a9fe268 
					 
					
						
						
							
							remove unused parts of code  
						
						 
						
						... 
						
						
						
						fix for 'show create schema_table'
fix for usage schema tables in subselect
'wrong schema table charset' fix 
						
						
					 
					
						2004-11-18 12:16:06 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e68bd85b77 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2004-11-17 18:04:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						d34421c127 
					 
					
						
						
							
							Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code.  
						
						 
						
						... 
						
						
						
						Moving the part of user_var.test using UCS2 to ctype_ucs.test 
						
						
					 
					
						2004-11-17 16:41:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						ecebc2dd43 
					 
					
						
						
							
							bad fix of the bad cleanup corrected :)  
						
						 
						
						
						
						
					 
					
						2004-11-16 12:39:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e9b140bc5f 
					 
					
						
						
							
							fixed "condition is always false" warnings  
						
						 
						
						
						
						
					 
					
						2004-11-15 22:12:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						77540c8996 
					 
					
						
						
							
							moved procedure list initialization (BUG#6517)  
						
						 
						
						
						
						
					 
					
						2004-11-15 14:37:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9950ccd278 
					 
					
						
						
							
							fixed incorrect using of THD::is_fatal_error  
						
						 
						
						
						
						
					 
					
						2004-11-14 10:25:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						25d0f827ce 
					 
					
						
						
							
							posmerge fixes  
						
						 
						
						
						
						
					 
					
						2004-11-13 23:26:15 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						321f803784 
					 
					
						
						
							
							WL#1629: SHOW with WHERE(partially) &  
						
						 
						
						... 
						
						
						
						WL#173:  Create Data Dictionary Tables for SHOW Commands 
						
						
					 
					
						2004-11-13 13:56:39 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1555469b64 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-11-12 15:36:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						114cc9f463 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2004-11-12 14:39:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a2cca07617 
					 
					
						
						
							
							Ensure that new connections are in state SLEEP (for nicer show processlist)  
						
						 
						
						
						
						
					 
					
						2004-11-12 14:38:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						31f7811183 
					 
					
						
						
							
							post-review fixes  
						
						 
						
						
						
						
					 
					
						2004-11-12 14:34:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								brian@avenger.(none) 
							
						 
					 
					
						
						
							
						
						b5e02d3276 
					 
					
						
						
							
							Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into avenger.(none):/export/brian/mysql/test/5.0 
						
						
					 
					
						2004-11-11 19:15:41 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								brian@avenger.(none) 
							
						 
					 
					
						
						
							
						
						3e4ca194f8 
					 
					
						
						
							
							Mainly resolving Guilhem's 4.1 patch to 5.0  
						
						 
						
						
						
						
					 
					
						2004-11-11 19:01:46 -08: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7d78fd077a 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2004-11-11 00:36:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						600b965f32 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-11-10 18:02:00 +01:00