msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						f0548a15ba 
					 
					
						
						
							
							Manual merge of BUG#11635 whihc is already in 5.0  
						
						
						
						
					 
					
						2005-07-07 15:48:43 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						50133499b5 
					 
					
						
						
							
							BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexes  
						
						... 
						
						
						
						- Change output from SHOW CREATE TABLE to use USING instead of TYPE 
						
						
					 
					
						2005-07-07 14:44:28 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						f9ec5658c7 
					 
					
						
						
							
							Merge fix for BUG#9439 from 4.1  
						
						
						
						
					 
					
						2005-04-17 20:54:31 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						6b4e759cf7 
					 
					
						
						
							
							Fix for BUG#9439:  
						
						... 
						
						
						
						Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests) 
						
						
					 
					
						2005-04-16 23:35:39 +04:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						2f398fc3ae 
					 
					
						
						
							
							Update tests after merge of bug fix.  
						
						
						
						
					 
					
						2005-04-05 20:55:06 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						b95cb4e654 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-04-05 19:45:34 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5865330a9e 
					 
					
						
						
							
							Merge embedded server testing changes from 4.1.  
						
						
						
						
					 
					
						2005-04-01 19:17:15 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						690183d1a0 
					 
					
						
						
							
							Eliminate most of the remaining hardcoded list of tests to skip  
						
						... 
						
						
						
						by adding check for embedded server within tests and splitting some
tests into multiple test files. 
						
						
					 
					
						2005-03-29 17:17:46 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						01ddc370f0 
					 
					
						
						
							
							Enable warnings for 'no default' fields being set to default when they  
						
						... 
						
						
						
						are not specified in an insert. Most of these changes are actually to
clean up the test suite to either specify defaults to avoid warnings,
or add the warnings to the results. Related to bug #5986 . 
						
						
					 
					
						2005-01-14 17:09:35 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						80c56602d3 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-01-13 09:31:54 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						d63dc891c1 
					 
					
						
						
							
							Add test cases to verify that SHOW CREATE TABLE always outputs the  
						
						... 
						
						
						
						key algorithm for keys where they were explicitly specified. 
						
						
					 
					
						2005-01-13 18:22:35 +01:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						e959e0b8fc 
					 
					
						
						
							
							Merge mysql.com:/home/jwinstead2/mysql-4.1-7233  
						
						... 
						
						
						
						into mysql.com:/home/jwinstead2/mysql-5.0-clean 
						
						
					 
					
						2005-01-08 22:22:41 +01:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5c497ef3a8 
					 
					
						
						
							
							Use 'USING <indextype>' in results of SHOW CREATE TABLE, it's the preferred  
						
						... 
						
						
						
						syntax. (Bug #7233 ) 
						
						
					 
					
						2005-01-08 07:31:13 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						2299e1eca4 
					 
					
						
						
							
							Better handling of ensuring that setup_tables() are not called twice  
						
						... 
						
						
						
						This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests 
						
						
					 
					
						2005-01-03 21:04:33 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						34d5331cee 
					 
					
						
						
							
							Merge with global tree  
						
						
						
						
					 
					
						2004-12-31 00:50:30 +02:00 
						 
				 
			
				
					
						
							
							
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						b1e30904d5 
					 
					
						
						
							
							WL#925 - Privileges for stored routines  
						
						... 
						
						
						
						Implement fine-grained control over access to stored procedures
  Privileges are cached (same way as existing table/column privs) 
						
						
					 
					
						2004-12-23 10:46:24 +00:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						4f4bbfc279 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2004-12-22 13:54:39 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						6477b4dfd2 
					 
					
						
						
							
							Merge with global tree  
						
						... 
						
						
						
						Fixed some found bugs in BIT fields
Added more test cases for BIT fields and varchar 
						
						
					 
					
						2004-12-19 20:25:19 +02:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						b40fc58245 
					 
					
						
						
							
							A followup to Bug#6878 "Crash with engine=memory", reported as Bug#6986  
						
						... 
						
						
						
						""show_check" fails on 64bit platforms": now minimal rec_length
of a HEAP table >= sizeof(void*), hence it's platform-dependant. 
						
						
					 
					
						2004-12-08 01:34:50 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						071001950e 
					 
					
						
						
							
							Merge with 4.1 to get in latest bug fixes  
						
						
						
						
					 
					
						2004-11-04 15:06:24 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						2185f1a56c 
					 
					
						
						
							
							Remove usage of !$ from mysql-tests  
						
						... 
						
						
						
						Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test 
						
						
					 
					
						2004-11-02 20:13:27 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						afbe601302 
					 
					
						
						
							
							merge with 4.1  
						
						
						
						
					 
					
						2004-10-29 19:26:52 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						6239edc1d1 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code 
						
						
					 
					
						2004-10-07 10:50:13 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						31122efde7 
					 
					
						
						
							
							Merge with 4.1  
						
						... 
						
						
						
						(Includes merge of arena code in 4.1 and 5.0) 
						
						
					 
					
						2004-09-06 15:14:10 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						6adaff23a4 
					 
					
						
						
							
							Review of new pushed code (Indentation fixes and simple optimizations)  
						
						... 
						
						
						
						Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database
Safety fix for mailformed MERGE files 
						
						
					 
					
						2004-08-31 14:35:04 +03:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						1ffd4d6129 
					 
					
						
						
							
							show_check.test, show_check.result:  
						
						... 
						
						
						
						Don't do this test for now: it fails on Mac OSX. 
						
						
					 
					
						2004-08-23 20:12:40 +05:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3640233f71 
					 
					
						
						
							
							one more test should wait for WL#1324 (tablename to filename encoding)  
						
						... 
						
						
						
						non-ascii filenames work weird (e.g. on MacOSX) 
						
						
					 
					
						2004-07-26 21:20:59 +02:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						6c996daa91 
					 
					
						
						
							
							Bug#4338: mysql-test-run fails if compiled with non-latin1 character set  
						
						
						
						
					 
					
						2004-07-08 18:54:07 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						4df5a14a6f 
					 
					
						
						
							
							Bug  #4374   	SHOW TABLE STATUS FROM ignores collation_connection  
						
						
						
						
					 
					
						2004-07-02 16:52:02 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						aa27a7858e 
					 
					
						
						
							
							"Version" column in SHOW TABLE STATUS.  
						
						
						
						
					 
					
						2004-06-24 18:46:41 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						4e2b94dea6 
					 
					
						
						
							
							After merge fixes  
						
						
						
						
					 
					
						2004-05-05 21:46:16 +03:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						aeff7ce714 
					 
					
						
						
							
							fixed  
						
						... 
						
						
						
						bug #3342  "SHOW CREATE DATABASE seems to require DROP privilege"
(now it require only SELECT privilege on database) 
						
						
					 
					
						2004-04-06 20:26:35 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f34a642d6e 
					 
					
						
						
							
							after merge fixes  
						
						
						
						
					 
					
						2004-03-18 00:09:13 +02:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5ccb6a1cc7 
					 
					
						
						
							
							Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1  
						
						... 
						
						
						
						into eagle.mysql.r18.ru:/home/vva/work/BUG_2593/mysql-4.1 
						
						
					 
					
						2004-03-06 18:27:11 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						8f093d0fb3 
					 
					
						
						
							
							Portability fixes  
						
						
						
						
					 
					
						2004-03-05 19:49:50 +02:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						d2f0d0726b 
					 
					
						
						
							
							commented testcases in show_check.test with quotation marks in table name  
						
						... 
						
						
						
						to avoid troubles with OS which don't support these symbols in file name
used create table 'a/b' as hook for WL#1324 which should fix this problem 
						
						
					 
					
						2004-03-05 17:57:36 +04:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						38a72a162a 
					 
					
						
						
							
							fixed for BUG  #2719  "Heap tables status shows wrong or missing data"  
						
						
						
						
					 
					
						2004-02-20 00:33:16 +04:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e8fb5a1d68 
					 
					
						
						
							
							1. fixed bug @2593 "SHOW CREATE TABLE doesn't properly double quotes"  
						
						... 
						
						
						
						2. added automatic quotation of keywords in SHOW CREATE TABLE 
						
						
					 
					
						2004-02-07 00:57:22 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						7e28e936ec 
					 
					
						
						
							
							show create tests  
						
						
						
						
					 
					
						2004-01-14 12:29:30 +01: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@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						77a70a0a24 
					 
					
						
						
							
							merge with 4.0.15  
						
						
						
						
					 
					
						2003-08-29 13:44:35 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						fe9dc5e711 
					 
					
						
						
							
							Add column names for metadata when running mysql with -T  
						
						... 
						
						
						
						Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324  
						
						
					 
					
						2003-08-27 10:26:03 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						b14b246d38 
					 
					
						
						
							
							Merge with 4.0 to get fix for MIN/MAX  
						
						
						
						
					 
					
						2003-02-07 16:38:37 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						5ce55f27f8 
					 
					
						
						
							
							Added test for SHOW CREATE  
						
						
						
						
					 
					
						2003-02-07 12:54:10 +02: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 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						ee6bd84880 
					 
					
						
						
							
							Changes for new binary .frm format  
						
						... 
						
						
						
						Fixes after last merge from 4.0.
(Code not yet complete, need anoter merge from 4.0) 
						
						
					 
					
						2002-06-04 08:23:57 +03:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						f5ed8784a2 
					 
					
						
						
							
							merge with 3.23.51  
						
						
						
						
					 
					
						2002-05-16 18:20:49 +03:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						0b6a786540 
					 
					
						
						
							
							Don't change FLOAT(X+1,X) to FLOAT(X+2,X)  
						
						
						
						
					 
					
						2002-04-26 13:56:32 +03:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						727122aadd 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2002-04-25 01:16:42 +03:00 
						 
				 
			
				
					
						
							
							
								monty@tik.mysql.fi 
							
						 
					 
					
						
						
							
						
						f94d84a9ec 
					 
					
						
						
							
							SHOW VARIABLES LIKE ... are now case insensitive  
						
						... 
						
						
						
						Fixed stack overflow checking with crash-me with gcc 3.0.4
Using @@unknown_variable doesn't hang client anymore
Added @@VERSION variable 
						
						
					 
					
						2002-04-18 18:24:14 +03:00