cmiller@zippy.cornsilk.net 
							
						 
					 
					
						
						
							
						
						2a7d7dd939 
					 
					
						
						
							
							Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778  
						
						... 
						
						
						
						into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778 
						
						
					 
					
						2006-09-29 11:14:28 -04:00 
						 
				 
			
				
					
						
							
							
								cmiller@zippy.cornsilk.net 
							
						 
					 
					
						
						
							
						
						78aea70393 
					 
					
						
						
							
							Bug  #20778 : strange characters in warning message 1366 when called in SP  
						
						... 
						
						
						
						The function receives an exactly-sized buffer (not a C NUL-terminated string)
and passes it into a printf function to be interpreted with "%s".
Instead, create an intermediate String object, and copy the data into it, 
and pass in a pointer to the String's NUL-terminated buffer. 
						
						
					 
					
						2006-09-27 19:26:25 -04:00 
						 
				 
			
				
					
						
							
							
								tsmith@maint1.mysql.com 
							
						 
					 
					
						
						
							
						
						8e0cc34af4 
					 
					
						
						
							
							Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-c  
						
						... 
						
						
						
						into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c 
						
						
					 
					
						2006-08-03 10:41:14 +02:00 
						 
				 
			
				
					
						
							
							
								tsmith/tim@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						17cc8acc91 
					 
					
						
						
							
							Partial merge of the patch for bug  #15195  from 4.1 -> 5.0; more changes needed  
						
						
						
						
					 
					
						2006-07-20 00:45:47 -06:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@mysql.com/myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						b57efe738a 
					 
					
						
						
							
							--{skip-}merge option added which allows the user to disable merge engine and  
						
						... 
						
						
						
						to avoid the potential security problem.
(see bug #15195 : Security Breach with MERGE table) 
						
						
					 
					
						2006-07-14 16:26:58 +05:00 
						 
				 
			
				
					
						
							
							
								brian@zim.tangent.org 
							
						 
					 
					
						
						
							
						
						0a5a30bef3 
					 
					
						
						
							
							This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.  
						
						
						
						
					 
					
						2006-02-12 13:26:30 -08:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						60296f8f7f 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var 
						
						
					 
					
						2006-01-24 14:10:48 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						09ec2919a1 
					 
					
						
						
							
							Make it possible to run mysql-test-run.pl with default test suite in different vardir.  
						
						
						
						
					 
					
						2006-01-24 08:30:54 +01:00 
						 
				 
			
				
					
						
							
							
								acurtis@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						c01a3b5e5f 
					 
					
						
						
							
							Make storage engines "pluggable", handlerton work  
						
						
						
						
					 
					
						2005-11-07 16:25:06 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						15d48525af 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-07-28 17:09:54 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3c12d0ae54 
					 
					
						
						
							
							Added end marker for tests to make future merges easier  
						
						
						
						
					 
					
						2005-07-28 03:22:47 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						775f17667b 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-06-07 00:31:53 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						f0233c2e3d 
					 
					
						
						
							
							Fix show warnings limit 0 and show warnings limit 0, 0.  
						
						... 
						
						
						
						Add test coverage for SHOW WARNINGS LIMIT a, b; 
						
						
					 
					
						2005-06-04 14:58:32 +04:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						9f05cbfbd7 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-03-23 13:25:31 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						a5bb4810ff 
					 
					
						
						
							
							BUG#9072 'Max_error_count' system variable cannot be set to zero  
						
						... 
						
						
						
						- Chaned min value in mysqld.cc
 - Added testcase to warnings.test 
						
						
					 
					
						2005-03-21 11:07:31 +01:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c6f1e9627a 
					 
					
						
						
							
							Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1  
						
						... 
						
						
						
						into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0 
						
						
					 
					
						2005-02-23 20:22:51 +03:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						fc9c20995f 
					 
					
						
						
							
							Fix for bug  #6572 : SHOW ERRORS doesn't  
						
						
						
						
					 
					
						2005-02-23 20:18:21 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7cf8285b3f 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results 
						
						
					 
					
						2005-01-04 13:46:53 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						6fbc869d18 
					 
					
						
						
							
							A lot of fixes for prepared statements (PS):  
						
						... 
						
						
						
						New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb 
						
						
					 
					
						2004-10-26 19:30:01 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cc78e2d97a 
					 
					
						
						
							
							Ensure that result from date_format() is binary  
						
						... 
						
						
						
						Removed warnings from test suite 
						
						
					 
					
						2004-02-09 13:59:41 +01:00 
						 
				 
			
				
					
						
							
							
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						2b53eef5f0 
					 
					
						
						
							
							WorkLog  #1323  (part 2)  
						
						... 
						
						
						
						New Statement: SHOW [STORAGE] ENGINES
New System Variable: storage_engine
New mysqld Argument: --default-storage-engine= 
						
						
					 
					
						2003-12-17 22:52:03 +00:00 
						 
				 
			
				
					
						
							
							
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						fcf96dbb18 
					 
					
						
						
							
							WorkLog#1323  
						
						... 
						
						
						
						Deprecate the use of TYPE=... Preferred syntax is ENGINE= 
						
						
					 
					
						2003-12-10 04:31:42 +00:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						4f7512160b 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings 
						
						
					 
					
						2003-08-19 00:08:08 +03:00 
						 
				 
			
				
					
						
							
							
								venu@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						0440e70a96 
					 
					
						
						
							
							undo one row warning instead use sql_warnings=1  
						
						
						
						
					 
					
						2003-07-21 19:37:18 +03:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						bc7cf30338 
					 
					
						
						
							
							Enable warnings by default for single value list inserts also when the client protocol is >= 4.1  
						
						
						
						
					 
					
						2003-07-21 00:13:22 -07:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						0c25993d24 
					 
					
						
						
							
							Fix merge conflict by changing warning codes to new one  
						
						
						
						
					 
					
						2003-05-21 01:21:06 -07:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						97a2c472bc 
					 
					
						
						
							
							Resolve merge conflict  
						
						
						
						
					 
					
						2003-05-21 00:14:56 -07:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						60dfb25be3 
					 
					
						
						
							
							Give warning if MySQL doesn't honor given storage engine  
						
						... 
						
						
						
						Allow syntax CREATE TABLE t1 (LIKE t2) 
						
						
					 
					
						2003-05-13 11:15:11 +03:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						79dd162ed1 
					 
					
						
						
							
							Simple misc cases - warnings  
						
						
						
						
					 
					
						2003-01-07 18:59:08 -08:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						1f6ecc0cd3 
					 
					
						
						
							
							Changed mysql-test to print warnings for not existing table to DROP TABLE  
						
						... 
						
						
						
						Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print() 
						
						
					 
					
						2003-01-06 01:48:59 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						463c59e1e9 
					 
					
						
						
							
							fixed tests to be independed from environment  
						
						
						
						
					 
					
						2002-08-30 21:32:59 +03:00 
						 
				 
			
				
					
						
							
							
								monty@donna.mysql.com 
							
						 
					 
					
						
						
							
						
						c0f40d14cc 
					 
					
						
						
							
							Added support for hex strings to mysqlimport  
						
						... 
						
						
						
						A lot of new tests to mysqltest
Fixed bug with BDB tables and autocommit 
						
						
					 
					
						2000-12-28 03:56:38 +02:00