brian@grrr.local 
							
						 
					 
					
						
						
							
						
						9807162144 
					 
					
						
						
							
							Added "SHOW AUTHORS" code  
						
						 
						
						
						
						
					 
					
						2005-11-10 19:43:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						c01a3b5e5f 
					 
					
						
						
							
							Make storage engines "pluggable", handlerton work  
						
						 
						
						
						
						
					 
					
						2005-11-07 16:25:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								svoj@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						3791197f0d 
					 
					
						
						
							
							WL#2575 - Fulltext: Parser plugin for FTS  
						
						 
						
						... 
						
						
						
						WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree. 
						
						
					 
					
						2005-11-06 13:13:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a6f5375cb0 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.1 
						
						
					 
					
						2005-11-05 01:32:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						efbdd24c96 
					 
					
						
						
							
							found problem removed  
						
						 
						
						
						
						
					 
					
						2005-11-02 15:17:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c54d129224 
					 
					
						
						
							
							postreview fixes  
						
						 
						
						
						
						
					 
					
						2005-10-31 22:14:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c399932a72 
					 
					
						
						
							
							fixe of typos, comments & layout  
						
						 
						
						
						
						
					 
					
						2005-10-28 00:56:44 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						6143c6543e 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0 
						
						
					 
					
						2005-10-28 00:24:13 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1b164c7b83 
					 
					
						
						
							
							support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787)  
						
						 
						
						
						
						
					 
					
						2005-10-28 00:18:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						8cd0241439 
					 
					
						
						
							
							Merge deer.(none):/home/hf/work/mysql-5.0.13667  
						
						 
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-5.0.12267 
						
						
					 
					
						2005-10-25 21:09:37 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@eagle.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e8d52711ad 
					 
					
						
						
							
							fix for bug#14089 FROM list subquery always fails when  
						
						 
						
						... 
						
						
						
						information_schema is current database
  skip the check of I_S tables if table is derived table 
						
						
					 
					
						2005-10-21 13:14:54 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						bee76b78a2 
					 
					
						
						
							
							A fix and a test case for Bug#13587 "Server crash when SP is created  
						
						 
						
						... 
						
						
						
						without database" 
						
						
					 
					
						2005-10-19 14:46:32 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								elliot@mysql.com 
							
						 
					 
					
						
						
							
						
						a93780b23d 
					 
					
						
						
							
							BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsistency)  
						
						 
						
						... 
						
						
						
						Updated more DDL statements to cause implicit commit. 
						
						
					 
					
						2005-10-13 05:12:17 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@eagle.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4b2a0f0c70 
					 
					
						
						
							
							after merge fix  
						
						 
						
						
						
						
					 
					
						2005-10-12 13:18:46 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@mysql.com 
							
						 
					 
					
						
						
							
						
						d19c85199f 
					 
					
						
						
							
							4.1->5.0 merge  
						
						 
						
						
						
						
					 
					
						2005-10-12 11:54:12 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						5513ab69b7 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-10-12 00:59:52 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f5fdf3e87a 
					 
					
						
						
							
							Reviewing new pushed code  
						
						 
						
						... 
						
						
						
						- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code 
						
						
					 
					
						2005-10-12 00:58:22 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						40bd22ef69 
					 
					
						
						
							
							Fix for bug  #13667  (Inconsistency for decimal(m,d) specification.  
						
						 
						
						
						
						
					 
					
						2005-10-11 21:18:04 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						5456afc603 
					 
					
						
						
							
							Added missing HAVE_REPLICATION define  
						
						 
						
						
						
						
					 
					
						2005-10-10 21:42:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						af951aa662 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						
						
						
					 
					
						2005-10-10 19:38:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						cd0e0a9933 
					 
					
						
						
							
							Added missing HAVE_REPLICATION define  
						
						 
						
						
						
						
					 
					
						2005-10-10 19:23:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						57f36732ca 
					 
					
						
						
							
							Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1  
						
						 
						
						... 
						
						
						
						into  mysql.com:/users/lthalmann/bk/mysql-5.0 
						
						
					 
					
						2005-10-10 17:50:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						998380521f 
					 
					
						
						
							
							BUG#12618: Removing fake locking  
						
						 
						
						
						
						
					 
					
						2005-10-10 15:10:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2e2d18b7cf 
					 
					
						
						
							
							Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.1 
						
						
					 
					
						2005-10-09 19:10:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						ba169f81e3 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-10-08 16:59:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						510d5c3583 
					 
					
						
						
							
							Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-10-08 16:56:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e91712d9bb 
					 
					
						
						
							
							pthread_handler_decl() changed to be ctags-friendly  
						
						 
						
						... 
						
						
						
						(and contain extern "C" when necessary) 
						
						
					 
					
						2005-10-08 16:39:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						ae293f9ac5 
					 
					
						
						
							
							Bug  #10942  "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE"  
						
						 
						
						... 
						
						
						
						don't allow STOP SLAVE if global read lock is in taken 
						
						
					 
					
						2005-10-08 14:46:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						17d7ba931d 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-10-08 03:37:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@eagle.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						b2b8d8b276 
					 
					
						
						
							
							Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails  
						
						 
						
						... 
						
						
						
						allow select into outfile from I_S tables
  it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
  as we use 'any_db' for 'check_access' function in places where FILE_ACL is required 
						
						
					 
					
						2005-10-07 14:16:44 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						78e828d32f 
					 
					
						
						
							
							Review of code pushed since last 5.0 pull:  
						
						 
						
						... 
						
						
						
						Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code 
						
						
					 
					
						2005-10-06 17:54:43 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						620b7bafb0 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-10-06 10:54:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2356401750 
					 
					
						
						
							
							Bug#12935 Local and XA transactions not mutually exclusive  
						
						 
						
						
						
						
					 
					
						2005-10-05 19:58:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						26b3ef7f44 
					 
					
						
						
							
							Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc 
						
						
					 
					
						2005-09-30 13:56:32 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8c813c0a16 
					 
					
						
						
							
							duplicate error message removed  
						
						 
						
						
						
						
					 
					
						2005-09-30 12:01:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						43b544a968 
					 
					
						
						
							
							Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc 
						
						
					 
					
						2005-09-30 12:36:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						6f7928c293 
					 
					
						
						
							
							Fix for bug  #13546  "Build errors with --with-embedded-server  
						
						 
						
						... 
						
						
						
						--with-embedded-privilege-control options". One more (hopefully last) build
failure which was introduced during work on WL#2787 "Add view definer/owner
to the view definition..." 
						
						
					 
					
						2005-09-28 18:43:46 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						6890eae9e5 
					 
					
						
						
							
							Merging  
						
						 
						
						
						
						
					 
					
						2005-09-26 13:15:01 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						acf218b708 
					 
					
						
						
							
							Several fixes revelaled by Intel compiler.  
						
						 
						
						
						
						
					 
					
						2005-09-23 16:47:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						306aa15391 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged 
						
						
					 
					
						2005-09-21 17:42:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3b41e3362b 
					 
					
						
						
							
							aftermerge fix  
						
						 
						
						
						
						
					 
					
						2005-09-21 17:38:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jonas@perch.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						f35c49f748 
					 
					
						
						
							
							Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push 
						
						
					 
					
						2005-09-21 13:22:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						23f35495ac 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2005-09-21 12:37:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						506c6eb922 
					 
					
						
						
							
							postmerge fixes  
						
						 
						
						
						
						
					 
					
						2005-09-21 08:29:47 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c1b185f5ff 
					 
					
						
						
							
							WL#2787 (Add view definer/owner to the view definition (.frm) to check privileges on used tables and stored routines when using a VIEW.)  
						
						 
						
						... 
						
						
						
						Part 2 postreview fixes. 
						
						
					 
					
						2005-09-20 21:20:38 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jonas@perch.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						2119a88abe 
					 
					
						
						
							
							Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1  
						
						 
						
						... 
						
						
						
						into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
						
						
					 
					
						2005-09-20 10:46:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jonas@perch.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						8983e39070 
					 
					
						
						
							
							Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push 
						
						
					 
					
						2005-09-20 09:50:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jonas@perch.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						668a192ce5 
					 
					
						
						
							
							ndb - imlp. show engine ndb status;  
						
						 
						
						... 
						
						
						
						that dump free list allocation per connection 
						
						
					 
					
						2005-09-19 15:35:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						aec371f910 
					 
					
						
						
							
							WL#2787 (part 2, ver 3 (merged)) changed securety context switching  
						
						 
						
						
						
						
					 
					
						2005-09-15 22:29:07 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ndbdev@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						dc595c9b1d 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-09-15 07:36:47 +02:00