ndbdev@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						58aa78e32d 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-05-09 20:28:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								holyfoot@hf-ibm.(none) 
							
						 
					 
					
						
						
							
						
						5ddaf35c26 
					 
					
						
						
							
							Fix for bug  #9632  (strict.test fails in -embedded-server mode)  
						
						 
						
						
						
						
					 
					
						2005-05-09 16:26:06 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						e76c641190 
					 
					
						
						
							
							Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1  
						
						 
						
						
						
						
					 
					
						2005-05-09 11:45:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						3ff9aa5fa1 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						
						
						
					 
					
						2005-05-09 11:43:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						05cbb3962c 
					 
					
						
						
							
							Manual merge 5.0->5.1  
						
						 
						
						
						
						
					 
					
						2005-05-06 15:04:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						015cd1cd21 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-05-06 13:51:58 +03: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								holyfoot@mysql.com 
							
						 
					 
					
						
						
							
						
						556504287b 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-05-05 20:10:50 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								holyfoot@hf-ibm.(none) 
							
						 
					 
					
						
						
							
						
						2c8e9df232 
					 
					
						
						
							
							A lot of fixes to Precision math  
						
						 
						
						... 
						
						
						
						Mostly about precision/decimals of the results of the operations 
						
						
					 
					
						2005-05-05 20:06:49 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gbichot@quadita2.mysql.com 
							
						 
					 
					
						
						
							
						
						b72ae4fe57 
					 
					
						
						
							
							Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).  
						
						 
						
						... 
						
						
						
						Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
  limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
  Reason I don't propagate caller info to the binlog as planned is that on master and slave
  users may be different; even with that some caveats would remain. 
						
						
					 
					
						2005-05-05 14:20:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						4f1e27ed00 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean 
						
						
					 
					
						2005-05-03 00:10:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						7bab94f36b 
					 
					
						
						
							
							Clean up merge from 4.1  
						
						 
						
						
						
						
					 
					
						2005-05-02 10:19:37 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						145ae3c6f5 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean 
						
						
					 
					
						2005-05-02 13:18:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						908c5d74d4 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-bug9821 
						
						
					 
					
						2005-04-29 02:52:20 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						9c33716380 
					 
					
						
						
							
							Clean up error message for connections-per-hour user limit  
						
						 
						
						... 
						
						
						
						being exceeded. (Bug #9947 ) 
						
						
					 
					
						2005-04-27 17:05:15 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						f769a7a8b0 
					 
					
						
						
							
							Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW  
						
						 
						
						... 
						
						
						
						(Review on irc by monty) 
						
						
					 
					
						2005-04-27 16:35:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						033988f014 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-04-25 22:21:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						ea347e5b06 
					 
					
						
						
							
							Fix for BUG#8921: Make SHOW CREATE VIEW ignore temporary tables.  
						
						 
						
						
						
						
					 
					
						2005-04-25 04:00:35 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						057b8aa9a8 
					 
					
						
						
							
							Fixed BUG#9004: Inconsistent behaviour of SP re. warnings  
						
						 
						
						
						
						
					 
					
						2005-04-22 12:53:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						1bd55e471e 
					 
					
						
						
							
							Merging 5.0->5.1  
						
						 
						
						
						
						
					 
					
						2005-04-19 11:09:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						f1496eb6f7 
					 
					
						
						
							
							BUG#9455 mysqladmin status crash the server  
						
						 
						
						... 
						
						
						
						- Send error to client when mysql_change_db fails. 
						
						
					 
					
						2005-04-14 11:56:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						32221d9b9e 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-04-12 23:12:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d4a0becc8a 
					 
					
						
						
							
							FLUSH TABLES WITH READ LOCK should block writes to binlog too  
						
						 
						
						
						
						
					 
					
						2005-04-12 17:15:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						e0e281ecb8 
					 
					
						
						
							
							Fixed BUG#6663: Stored Procedures code report non-selected DB  
						
						 
						
						... 
						
						
						
						when CREATE but not when ALTER 
						
						
					 
					
						2005-04-12 14:52:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						beb28b27e0 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-06 17:23:34 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						49e721677f 
					 
					
						
						
							
							Fixed errors descovered by valgrind 2.4  
						
						 
						
						... 
						
						
						
						Added suppression file for some valgrind warnings that are not real errors 
						
						
					 
					
						2005-04-06 17:22:21 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						1dd12e9d04 
					 
					
						
						
							
							Some of the argument place holders were not quite correct compared to  
						
						 
						
						... 
						
						
						
						the argument type. Fixed also some float() casts to double() as query_id
is now actually longlong type. Related to Bug#9646. 
						
						
					 
					
						2005-04-05 23:14:56 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c796ea598c 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-04-05 13:23:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						c2cfa5e435 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-04-04 08:54:36 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						04f8e164fb 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-04 16:45:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						52770e8682 
					 
					
						
						
							
							XID SQL syntax  
						
						 
						
						... 
						
						
						
						minor cleanups
XA tests 
						
						
					 
					
						2005-04-04 00:50:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5865330a9e 
					 
					
						
						
							
							Merge embedded server testing changes from 4.1.  
						
						 
						
						
						
						
					 
					
						2005-04-01 19:17:15 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						623a5d5a57 
					 
					
						
						
							
							Clean up merge of fix for Bug  #9468 .  
						
						 
						
						
						
						
					 
					
						2005-04-01 19:00:14 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								patg@patrick.local 
							
						 
					 
					
						
						
							
						
						8e0eb65f9a 
					 
					
						
						
							
							5.0 to 5.1 merge  
						
						 
						
						
						
						
					 
					
						2005-04-01 12:32:17 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						9616c9a80d 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-01 15:06:35 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						201ee3eb78 
					 
					
						
						
							
							Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug  #5902 )  
						
						 
						
						... 
						
						
						
						CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912 )
ALTER TABLE now fails in STRICT mode if it generates warnings.
Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933 ) 
						
						
					 
					
						2005-04-01 15:04:50 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						05c9defefa 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0 
						
						
					 
					
						2005-04-01 13:02:29 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						45a79c9056 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-5.0 
						
						
					 
					
						2005-04-01 02:15:40 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						05d4ed14e4 
					 
					
						
						
							
							merge 4.1->5.0  
						
						 
						
						
						
						
					 
					
						2005-03-31 10:39:48 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c64efa6062 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-03-30 22:11:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						8df8afc270 
					 
					
						
						
							
							Fixed BUG#6600: Stored procedure crash after repeated calls with check table.  
						
						 
						
						... 
						
						
						
						Sedond attempt: Simply disallow CHECK in SPs, since it can't work. 
						
						
					 
					
						2005-03-30 17:43:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						e9dbf09dfc 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-03-30 17:07:40 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						9db4daf111 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2005-03-30 10:52:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2a297353c6 
					 
					
						
						
							
							don't strcmp db if it's a pattern  
						
						 
						
						
						
						
					 
					
						2005-03-30 10:43:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						dcdda90a11 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-03-30 10:27:36 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1659dacab1 
					 
					
						
						
							
							fixed mechanism of detection selection from table wich we update  
						
						 
						
						... 
						
						
						
						(BUG##9398, BUG#8703)
fixed wrong join view detection in multi-delete which lead to server crash 
						
						
					 
					
						2005-03-28 15:13:31 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						72c9ac844b 
					 
					
						
						
							
							fixes for "backport wild_compare fix from 4.1 - bug#3924"  
						
						 
						
						
						
						
					 
					
						2005-03-26 19:46:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						bf2f6ff2d4 
					 
					
						
						
							
							BUG#9303 blob field with specified length < 256 does not create tinyblob  
						
						 
						
						
						
						
					 
					
						2005-03-24 13:48:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d6bedfa8e0 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2005-03-23 09:42:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4554b1f263 
					 
					
						
						
							
							fixed union types merging and table related metadata (BUG#8824)  
						
						 
						
						
						
						
					 
					
						2005-03-23 08:36:48 +02:00