sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						de02193bdd 
					 
					
						
						
							
							Added Non-prelocked SP execution: Now a PROCEDURE doesn't enter/leave prelocked mode for  
						
						... 
						
						
						
						its body, but lets each statement to get/release its own locks. This allows a broader set
of statements to be executed inside PROCEDUREs (but breaks replication)
This patch should fix BUG#8072, BUG#8766, BUG#9563, BUG#11126 
						
						
					 
					
						2005-07-30 08:19:57 +00:00 
						 
				 
			
				
					
						
							
							
								ndbdev@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						f4fe2c3b71 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-07-21 08:06:26 +02:00 
						 
				 
			
				
					
						
							
							
								pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se 
							
						 
					 
					
						
						
							
						
						6026054ead 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0 
						
						
					 
					
						2005-07-21 01:29:57 -04:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						6ca09e8b8f 
					 
					
						
						
							
							Bug  #12055   	NDB temp tables created by ALTER TABLE are usable  
						
						... 
						
						
						
						- do not discover temporary files and make them visible 
						
						
					 
					
						2005-07-20 18:40:55 +02:00 
						 
				 
			
				
					
						
							
							
								tulin@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						a6c21a0791 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-07-19 21:56:10 +02:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						e3af1b6ec6 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into  mysql.com:/home/kostja/mysql/mysql-5.0-10760-new 
						
						
					 
					
						2005-07-19 22:22:12 +04:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						14344b658a 
					 
					
						
						
							
							A fix and a test case for Bug#10760 and complementary cleanups.  
						
						... 
						
						
						
						The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same 
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes. 
						
						
					 
					
						2005-07-19 22:21:12 +04:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						8a3e723b74 
					 
					
						
						
							
							Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch)  
						
						... 
						
						
						
						"Triggers have the wrong namespace"
  "Triggers: duplicate names allowed"
  "Triggers: CREATE TRIGGER does not accept fully qualified names"
  "SHOW TRIGGERS" 
						
						
					 
					
						2005-07-19 20:06:49 +04:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						67087e2aa7 
					 
					
						
						
							
							Patch for push of wl1354 Partitioning  
						
						
						
						
					 
					
						2005-07-18 13:31:02 +02:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						674b6bb151 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-07-12 20:01:22 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						86d7b02199 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-07-03 14:17:52 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						7398252d02 
					 
					
						
						
							
							Portability fixes  
						
						... 
						
						
						
						Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning 
						
						
					 
					
						2005-06-27 20:31:00 +03:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						85b9ffc4ca 
					 
					
						
						
							
							Merged from mysql-4.1 to mysql-5.0  
						
						
						
						
					 
					
						2005-06-22 14:10:02 +02:00 
						 
				 
			
				
					
						
							
							
								tulin@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						07b4a42e18 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-06-18 09:21:50 +02:00 
						 
				 
			
				
					
						
							
							
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						51dd521dfc 
					 
					
						
						
							
							Bug#6877 MySQL should give an error if the requested table type is not available  
						
						... 
						
						
						
						Implement new SQL mode - NO_ENGINE_SUBSTITUTION 
						
						
					 
					
						2005-06-17 22:14:44 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						4602b1809f 
					 
					
						
						
							
							BUG10365 Cluster handler uses non-standard error code  
						
						... 
						
						
						
						- Updated after review 
						
						
					 
					
						2005-06-16 15:17:47 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						8771c73258 
					 
					
						
						
							
							BUG#10365 Cluster handler uses non-standard error codes  
						
						... 
						
						
						
						- Added better error messages when trying to open a table that can't be discovered or unpacked. The most likely cause of this is that it does not have any frm data, probably since it has been created from NdbApi or is a NDB system table.
 - Separated functionality that was in ha_create_table_from_engine into two functions. One that checks if the table exists and another one that tries to create the table from the engine. 
						
						
					 
					
						2005-06-08 13:31:59 +02:00 
						 
				 
			
				
					
						
							
							
								ndbdev@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						74f1b22b86 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-06-07 13:42:57 +02:00 
						 
				 
			
				
					
						
							
							
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						270b695f59 
					 
					
						
						
							
							Fix for bug  #10015  "Crash in InnoDB if stored routines are used".  
						
						... 
						
						
						
						We should not allow explicit or implicit transaction commits inside
of stored functions or triggers (so in autocommit mode we should not
do commits after execution of sub-statement).
Also since we don't support nested statement transactions in 5.0,
we shouldn't commit or rollback stmt transactions while we are inside
stored functions or triggers. This should be fixed in later (>=5.1)
releases. 
						
						
					 
					
						2005-06-07 14:53:08 +04:00 
						 
				 
			
				
					
						
							
							
								ndbdev@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						2fb1fb5877 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-06-07 06:50:50 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						775f17667b 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-06-07 00:31:53 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6a5349028c 
					 
					
						
						
							
							a compiler must see '#pragma implementation' *before*  
						
						... 
						
						
						
						'#pragma interface' (that comes with the #include'd header file) 
						
						
					 
					
						2005-06-05 19:38:52 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						29fd1f2fd9 
					 
					
						
						
							
							Move USE_PRAGMA_IMPLEMENTATION to proper place  
						
						... 
						
						
						
						Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable 
						
						
					 
					
						2005-06-03 23:46:03 +03:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						644906bf9c 
					 
					
						
						
							
							bitmap bug fixes and interface change  
						
						
						
						
					 
					
						2005-06-02 18:40:25 +02:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						bef102ec90 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1 
						
						
					 
					
						2005-06-02 09:50:47 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						f0fcc54b0c 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-06-02 04:45:09 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						bd48eed988 
					 
					
						
						
							
							tztime.cc:  
						
						... 
						
						
						
						Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION 
						
						
					 
					
						2005-06-02 02:43:32 +02:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						5088b28d09 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-05-31 14:37:47 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						697cfe7f07 
					 
					
						
						
							
							Merge from 4.1  
						
						
						
						
					 
					
						2005-05-26 21:01:55 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						83d430353e 
					 
					
						
						
							
							Add ifdefs to control when "#pragma implementation" should be used  
						
						... 
						
						
						
						Added some more ifdefs for "#pragma interface" 
						
						
					 
					
						2005-05-26 12:09:14 +02:00 
						 
				 
			
				
					
						
							
							
								tulin@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						03590c20bd 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-05-18 22:26:23 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						c1b512fad3 
					 
					
						
						
							
							Change update_auto_increment to return 1 if get_auto_increment() returned ~(ulonglong)  
						
						... 
						
						
						
						This makes it easier to give an error in the handler if there was a problem generating an auto-increment value 
						
						
					 
					
						2005-05-18 10:41:35 +03:00 
						 
				 
			
				
					
						
							
							
								tulin@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						23f79bd1f2 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-05-17 10:17:53 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d06bb6fa39 
					 
					
						
						
							
							After merge fixes  
						
						
						
						
					 
					
						2005-05-16 15:21:35 +03:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						c33a0673a6 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1  
						
						... 
						
						
						
						into mysql.com:/Users/mikron/wl1682 
						
						
					 
					
						2005-05-12 12:01:01 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						cf642995f6 
					 
					
						
						
							
							Many fixes  
						
						
						
						
					 
					
						2005-05-12 11:20:50 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						c18a302577 
					 
					
						
						
							
							Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1  
						
						... 
						
						
						
						into mysql.com:/Users/mikron/wl1682 
						
						
					 
					
						2005-05-07 11:23:09 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						b4ab00df62 
					 
					
						
						
							
							WL 1682: Bitvector for updated/read fields in handler interface  
						
						... 
						
						
						
						Fixed clear issues of bitvector and memory allocation issues 
						
						
					 
					
						2005-05-07 10:00:25 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						a9f6aab4c9 
					 
					
						
						
							
							Fixes while reviewing new code  
						
						... 
						
						
						
						Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema 
						
						
					 
					
						2005-05-06 11:39:30 +03:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						abec3ade26 
					 
					
						
						
							
							WL 1682:  
						
						... 
						
						
						
						Divide bitvector into .cc and .h file 
						
						
					 
					
						2005-05-05 10:17:09 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						0f40e05cbe 
					 
					
						
						
							
							Silly mistake, forgot return :(  
						
						
						
						
					 
					
						2005-05-04 10:44:11 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						f7cd6b8aa1 
					 
					
						
						
							
							WL 1682: After review fixes + update bitvector class + bitvector test  
						
						... 
						
						
						
						cases + bug fixes 
						
						
					 
					
						2005-05-02 15:45:33 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						c0e8a8d625 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-30 03:46:38 +03:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						21347433cf 
					 
					
						
						
							
							WL 1682: Use bitvector instead of query_id to tell handler which fields  
						
						... 
						
						
						
						to read and write
Changed Server code, added new interface to handler and changed the
NDB handler, InnoDB handler and Federated handler that previously used
query_id
Bug#10202 fix (one-liner fix for memory leak) 
						
						
					 
					
						2005-04-28 14:45:27 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						f78e1d1c44 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-04-28 10:58:24 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						9969e1c5ea 
					 
					
						
						
							
							BUG#9911 After review fixes  
						
						... 
						
						
						
						- Remove ha_archive::rename_table and move the fix to handler::rename_table 
						
						
					 
					
						2005-04-28 10:49:18 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						215be0264b 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-27 17:19:32 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						69b813a901 
					 
					
						
						
							
							mysqladmin extended-status now displays global status  
						
						... 
						
						
						
						Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part 
						
						
					 
					
						2005-04-27 17:16:08 +03:00 
						 
				 
			
				
					
						
							
							
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						ce2c8126a2 
					 
					
						
						
							
							handler.cc:  
						
						... 
						
						
						
						Fix compilation error if HAVE_REPLICATION is not defined 
						
						
					 
					
						2005-04-27 15:09:41 +03:00 
						 
				 
			
				
					
						
							
							
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						f12cd8c708 
					 
					
						
						
							
							Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into hundin.mysql.fi:/home/heikki/mysql-5.0 
						
						
					 
					
						2005-04-26 17:57:15 +03:00