monty@mysql.com 
							
						 
					 
					
						
						
							
						
						dd4db08438 
					 
					
						
						
							
							Code cleanups during review of pushed code  
						
						 
						
						
						
						
					 
					
						2005-03-15 16:07:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						9ec8d87328 
					 
					
						
						
							
							Updated error message to be more informative. Previous error message  
						
						 
						
						... 
						
						
						
						"Access denied to database mysql" was actually not just misleading, but
also wrong.
Bug#7905. 
						
						
					 
					
						2005-03-14 16:59:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						7b19170cf7 
					 
					
						
						
							
							BUG#9101 - RELEASE/ROLLBACK TO SAVEPOINT did not forget savepoints correctly  
						
						 
						
						
						
						
					 
					
						2005-03-11 21:10:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e40bf3c40b 
					 
					
						
						
							
							sql/ha_ndbcluster.cc  
						
						 
						
						... 
						
						
						
						after merge fix
sql/sql_parse.cc
    correct max_connections condition 
						
						
					 
					
						2005-03-10 00:10:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						8d94824aa1 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4 
						
						
					 
					
						2005-03-09 01:15:42 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						be3c863ba0 
					 
					
						
						
							
							Merge in fix Bug#3788  
						
						 
						
						
						
						
					 
					
						2005-03-08 22:32:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						b2c77c1c9c 
					 
					
						
						
							
							post merge fixes  
						
						 
						
						
						
						
					 
					
						2005-03-08 22:59:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						a54b5ea52f 
					 
					
						
						
							
							Fixing  bug  #8850  in such a way  that when TRUNCATE  is called within  
						
						 
						
						... 
						
						
						
						stored  procedure,  it  is converted  to DELETE. 
						
						
					 
					
						2005-03-05 21:44:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						48d92d150d 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-5.0-sp 
						
						
					 
					
						2005-03-05 16:33:36 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						e6a506c397 
					 
					
						
						
							
							Fix for yet another memleak caused by SP-locking patch.  
						
						 
						
						... 
						
						
						
						Improved handling of situations when we encounter error during
CREATE PROCEDURE (FUNCTION/TRIGGER/...) and bail out of yyparse()
without restoring proper THD::lex. 
						
						
					 
					
						2005-03-05 16:31:58 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						df2b38913f 
					 
					
						
						
							
							WL2131: Access control for SHOW ... PROCEDURE|FUNCTION ...  
						
						 
						
						
						
						
					 
					
						2005-03-05 14:35:32 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						5e1d2ad68c 
					 
					
						
						
							
							Bug#3788  
						
						 
						
						... 
						
						
						
						Crashes with stored procedure return non-string values
  Also fixes Bug#2773 
						
						
					 
					
						2005-03-04 21:14:35 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						5b16dbf960 
					 
					
						
						
							
							Manual merge SP-locking improvements patch with current tree.  
						
						 
						
						
						
						
					 
					
						2005-03-04 17:46:45 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						5a6c7027f0 
					 
					
						
						
							
							Better approach for prelocking of tables for stored routines execution  
						
						 
						
						... 
						
						
						
						and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
  to be prelocked and doing implicit LOCK/UNLOCK any more.
  Instead we calculate this list at open_tables() and do implicit
  LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
  Also now we support cases when same table (with same alias) is
  used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
  LEX and does preparations before statement execution or complex
  expression evaluation to auxilary sp_lex_keeper class. Now 
  all statements in SP (and corresponding instructions) that
  evaluate expression which can contain subquery have their
  own LEX. 
						
						
					 
					
						2005-03-04 16:35:28 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						b9aa67bc76 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-02-26 16:15:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1ecb8c8fed 
					 
					
						
						
							
							Fixes while during review of last pull  
						
						 
						
						... 
						
						
						
						Temporary patch to remove some warnings 
						
						
					 
					
						2005-02-26 12:19:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7e5f74f8f2 
					 
					
						
						
							
							Merge with global tree  
						
						 
						
						
						
						
					 
					
						2005-02-25 17:12:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0a6b7aedb2 
					 
					
						
						
							
							Remove compiler warnings and remove not used variables  
						
						 
						
						... 
						
						
						
						(Found during build process) 
						
						
					 
					
						2005-02-25 16:53:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						65daa271c1 
					 
					
						
						
							
							Cset exclude: joreland@mysql.com|ChangeSet|20050224071025|18754  
						
						 
						
						
						
						
					 
					
						2005-02-25 09:35:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						8253f54524 
					 
					
						
						
							
							Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-5.0 
						
						
					 
					
						2005-02-25 09:17:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						c7c2eacfb8 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb 
						
						
					 
					
						2005-02-25 08:28:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cd78e701a5 
					 
					
						
						
							
							Show all generated warnings in SHOW ERROR  
						
						 
						
						... 
						
						
						
						Previously we only stored the first given error (the error sent to the client) 
						
						
					 
					
						2005-02-24 23:33:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						1029db2b6d 
					 
					
						
						
							
							Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jonas/src/mysql-5.0-ndb 
						
						
					 
					
						2005-02-24 20:57:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						05eb8af434 
					 
					
						
						
							
							fixed compilation failure affects build without InnoDB  
						
						 
						
						
						
						
					 
					
						2005-02-24 20:55:20 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						2b1f0bf1f5 
					 
					
						
						
							
							Fixed BUG#8638: Test 'sp' fails: Stored Procedure often sends warning 1329  
						
						 
						
						... 
						
						
						
						The warning sent is by itself ok, the problem was rather why it wasn't
  sent on some other platforms...
  The real problem was that a total_warn_count which was inconsistent with warn_list
  was sent back with send_eof() during SP execution, which in turn cause a protocol
  error in mysqltest. 
						
						
					 
					
						2005-02-24 13:56:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						a0aac3e3f8 
					 
					
						
						
							
							#ifdef innodb specific code, (old_innodb_table_locks)  
						
						 
						
						
						
						
					 
					
						2005-02-24 08:10:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@51.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						5d6cc9de06 
					 
					
						
						
							
							Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0 
						
						
					 
					
						2005-02-24 01:11:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						383c6e312a 
					 
					
						
						
							
							don't log BEGIN in auto-commit mode  
						
						 
						
						... 
						
						
						
						correct end_log_pos for Xid_log_event 
						
						
					 
					
						2005-02-23 18:26:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@52.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						25e87cd6f7 
					 
					
						
						
							
							Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0 
						
						
					 
					
						2005-02-23 19:22:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						41043bb3f5 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-22 16:39:21 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						df3c8db4f3 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-4.1-clean 
						
						
					 
					
						2005-02-22 13:14:49 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@51.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						a9b40a8c0b 
					 
					
						
						
							
							Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0 
						
						
					 
					
						2005-02-22 14:52:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@51.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						04cffe4dfb 
					 
					
						
						
							
							postreview fix  
						
						 
						
						
						
						
					 
					
						2005-02-22 12:43:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						178be07aa3 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-02-22 00:17:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b43029f4eb 
					 
					
						
						
							
							bug#8646 - deadlock if long transaction causes binlog rotate  
						
						 
						
						
						
						
					 
					
						2005-02-22 00:15:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						b902a66e27 
					 
					
						
						
							
							Fix -ansi -pedantic compilation failure.  
						
						 
						
						
						
						
					 
					
						2005-02-21 17:27:36 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cab35adf7e 
					 
					
						
						
							
							Review of new pushed code (XA & other)  
						
						 
						
						... 
						
						
						
						Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command() 
						
						
					 
					
						2005-02-21 14:47:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@51.0.168.192.in-addr.arpa 
							
						 
					 
					
						
						
							
						
						a11369b999 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-20 18:49:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						10800c1eb5 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-8475  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-4.1-clean 
						
						
					 
					
						2005-02-18 15:40:17 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						29d1d9a369 
					 
					
						
						
							
							Clean up merge for fix for Bug  #8350 .  
						
						 
						
						
						
						
					 
					
						2005-02-18 15:23:17 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						262dd182ef 
					 
					
						
						
							
							compilation fixes  
						
						 
						
						
						
						
					 
					
						2005-02-18 14:42:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c0dda01f76 
					 
					
						
						
							
							Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa 
						
						
					 
					
						2005-02-18 12:02:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						1c22de9032 
					 
					
						
						
							
							Log each slow query in a multi-statement query to the slow query log.  
						
						 
						
						... 
						
						
						
						(Bug #8475 ) 
						
						
					 
					
						2005-02-17 11:48:44 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						10ab9e982f 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1 
						
						
					 
					
						2005-02-17 17:52:49 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						530eecbd99 
					 
					
						
						
							
							Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa 
						
						
					 
					
						2005-02-17 14:00:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2b41b8fa01 
					 
					
						
						
							
							post-review fixes. Now ROLLBACK is done in Format_description_log_event  
						
						 
						
						
						
						
					 
					
						2005-02-17 13:52:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						36998b7cb7 
					 
					
						
						
							
							Fixed Bug#8042, "mysqld crashes on sighup".  
						
						 
						
						
						
						
					 
					
						2005-02-17 14:07:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						a1bf1c926e 
					 
					
						
						
							
							Bug#8147  
						
						 
						
						... 
						
						
						
						Fix ambigious table error for INSERT..SELECT..UPDATE 
						
						
					 
					
						2005-02-17 01:33:59 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						0987d81ae6 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-16 21:03:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						5ddb6354a5 
					 
					
						
						
							
							after merge fixes  
						
						 
						
						
						
						
					 
					
						2005-02-16 17:34:02 +01:00