jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5865330a9e 
					 
					
						
						
							
							Merge embedded server testing changes from 4.1.  
						
						
						
						
					 
					
						2005-04-01 19:17:15 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						3c5602faec 
					 
					
						
						
							
							Re-enable alter_table test for embedded server by moving grant-related test  
						
						... 
						
						
						
						to grant.test and using replace_column to neuter the Privileges column in
SHOW FULL COLUMNS. 
						
						
					 
					
						2005-02-09 18:17:40 -08:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						af878017b2 
					 
					
						
						
							
							Merge mysql.com:/home/dlenev/src/mysql-4.1-merges  
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-5.0-merges 
						
						
					 
					
						2005-01-18 21:27:09 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						0787a97b1c 
					 
					
						
						
							
							Added test for bug  #7884  "Able to add invalid unique index on TIMESTAMP  
						
						... 
						
						
						
						prefix", which roots were fixed in 4.0 tree. 
						
						
					 
					
						2005-01-18 17:45:49 +03:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						a04fc26c54 
					 
					
						
						
							
							manually merged  
						
						
						
						
					 
					
						2004-12-31 15:26:24 +01:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						45ce994e5d 
					 
					
						
						
							
							post-merge  
						
						
						
						
					 
					
						2004-12-31 11:52:14 +01:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						c7e756f959 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2004-12-30 21:11:40 +01:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						12bf7dcd04 
					 
					
						
						
							
							unsufficient privilege checks in GRANT, when a grantor has column-level privileges  
						
						
						
						
					 
					
						2004-12-30 21:01:11 +01:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						2e912bbbe8 
					 
					
						
						
							
							Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges  
						
						... 
						
						
						
						mysqldump skips information_schema db
'use' now can use information_schema db
changed value of column 'Null' to 'NO' if column is not nullable 
						
						
					 
					
						2004-12-10 12:07:11 +03:00 
						 
				 
			
				
					
						
							
							
								brian@avenger.(none) 
							
						 
					 
					
						
						
							
						
						f05daf02ba 
					 
					
						
						
							
							Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)  
						
						
						
						
					 
					
						2004-11-11 18:58:57 -08:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						ed807c29c9 
					 
					
						
						
							
							alter_table.result, alter_table.test, field_conv.cc:  
						
						... 
						
						
						
						Bug #6479   ALTER TABLE ... changing charset fails for TEXT columns
  Fix: use do_conv_blob rather than do_copy_blob
  if the column's character sets are different. 
						
						
					 
					
						2004-11-08 14:23:14 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						afbe601302 
					 
					
						
						
							
							merge with 4.1  
						
						
						
						
					 
					
						2004-10-29 19:26:52 +03:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						541883f9d8 
					 
					
						
						
							
							Produce a "truncated" warning if a value cannot be converted  
						
						... 
						
						
						
						into the column character set on INSERT/UPDATE. 
						
						
					 
					
						2004-10-28 15:21:20 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						be4ca46fbe 
					 
					
						
						
							
							More fixes for strict mode:  
						
						... 
						
						
						
						More tests.
Better error messages.
Fixed bug when checking if we updated all needed columns for INSERT.
Give an error if we encounter a wrong float value during parsing.
Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS.
Fixed UPDATE IGNORE when using STRICT mode. 
						
						
					 
					
						2004-10-02 22:20:08 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3f2210c064 
					 
					
						
						
							
							after merge fixes  
						
						
						
						
					 
					
						2004-08-19 03:02:09 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e1237cbc53 
					 
					
						
						
							
							manually merged  
						
						
						
						
					 
					
						2004-08-18 19:57:55 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b9512a55aa 
					 
					
						
						
							
							BUG#4717 - check for valid table names in ALTER TABLE ... RENAME  
						
						
						
						
					 
					
						2004-07-26 10:52:40 +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 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						9c2a961a63 
					 
					
						
						
							
							Fix and test case for BUG#3899  
						
						
						
						
					 
					
						2004-06-23 11:40:42 +04:00 
						 
				 
			
				
					
						
							
							
								paul@kite-hub.kitebird.com 
							
						 
					 
					
						
						
							
						
						125b4da804 
					 
					
						
						
							
							packet.result, alter_table.result:  
						
						... 
						
						
						
						fix up test result. 
						
						
					 
					
						2004-06-15 23:50:03 -05:00 
						 
				 
			
				
					
						
							
							
								paul@ice.snake.net 
							
						 
					 
					
						
						
							
						
						fd1d01e098 
					 
					
						
						
							
							Language/consistency edits to error messages  
						
						... 
						
						
						
						and affected test results. 
						
						
					 
					
						2004-06-15 22:18:20 -05:00 
						 
				 
			
				
					
						
							
							
								bar@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						b92dd45da4 
					 
					
						
						
							
							ALTER TABLE t1 CONVERT TO should also change the default character set.  
						
						... 
						
						
						
						Forgot to do it in the previous commit. 
						
						
					 
					
						2004-03-30 22:18:49 +05:00 
						 
				 
			
				
					
						
							
							
								bar@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						dba73e1c86 
					 
					
						
						
							
							More different syntaxes for (1) modifying the default charaset/collation  
						
						... 
						
						
						
						and for (2) converting the columns:
1.  ALTER TABLE t1 [DEFAULT] CHARACTER SET xxx [COLLATE yyy]
2.  ALTER TABLE t1 CONVERT TO CHARACTER SET xxx [COLLATE yyy] 
						
						
					 
					
						2004-03-30 21:33:45 +05:00 
						 
				 
			
				
					
						
							
							
								bar@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3aea3e92ce 
					 
					
						
						
							
							1. New data types, from the user point of view:  
						
						... 
						
						
						
						BINARY(N) and VARBIBARY(N)
2. More 4.0 compatibility and more BINARY keyword consistency:
2a. CREATE TABLE a (a CHAR(N) BINARY) 
    is now synonym for
    CREATE TABLE a (a CHAR(N) COLLATE xxxx_bin)
2b. SELECT BINARY x
    is still synonin for
    SELECT x COLLATE xxxxx_bin. 
						
						
					 
					
						2004-03-26 16:11:46 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						447baa9011 
					 
					
						
						
							
							After merge fixes + simple optimizations  
						
						
						
						
					 
					
						2004-03-26 11:06:53 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e0e0314d60 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2004-03-25 23:29:45 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						488fe61074 
					 
					
						
						
							
							Updated tests after merge  
						
						
						
						
					 
					
						2004-03-25 23:08:42 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						f897144c4e 
					 
					
						
						
							
							Bug  #2821   	Table default character set affects LONGBLOB fields  
						
						
						
						
					 
					
						2004-03-19 11:37:49 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f43093ec0e 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t) 
						
						
					 
					
						2004-02-16 10:03:25 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ce14578909 
					 
					
						
						
							
							Merge with 4.0.18  
						
						
						
						
					 
					
						2004-02-11 00:06:46 +01:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						8090b61fcb 
					 
					
						
						
							
							3.23 -> 4.0 merge: after merge fixes  
						
						
						
						
					 
					
						2004-02-06 16:40:44 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						2a4cfe8b4f 
					 
					
						
						
							
							merge 3.23 -> 4.0, 2003/02/06  
						
						
						
						
					 
					
						2004-02-06 15:23:41 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						2093624a73 
					 
					
						
						
							
							Fix for bug  #2628  "ALTER TABLE destroys table and reports success"  
						
						
						
						
					 
					
						2004-02-06 14:28:57 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c4326bc68e 
					 
					
						
						
							
							better fix BUG#2361: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key  
						
						
						
						
					 
					
						2004-01-28 18:35:52 +01:00 
						 
				 
			
				
					
						
							
							
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						646d692510 
					 
					
						
						
							
							a fix (bug  #2361 : ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key).  
						
						
						
						
					 
					
						2004-01-13 16:18:37 +04: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 
							
						 
					 
					
						
						
							
						
						cab1dc628c 
					 
					
						
						
							
							CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS  
						
						... 
						
						
						
						New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag. 
						
						
					 
					
						2003-11-18 13:47:27 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2263e3e51f 
					 
					
						
						
							
							Merge with 4.0.14  
						
						
						
						
					 
					
						2003-08-11 22:44:43 +03:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						1472b156e2 
					 
					
						
						
							
							A test for character conversion in ALTER TABLE was added  
						
						
						
						
					 
					
						2003-07-14 18:00:27 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						b2cbd83913 
					 
					
						
						
							
							Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS  
						
						... 
						
						
						
						Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup 
						
						
					 
					
						2003-07-08 23:58:04 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dad0664579 
					 
					
						
						
							
							merge with public tree  
						
						
						
						
					 
					
						2003-06-05 00:12:45 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						40109c574a 
					 
					
						
						
							
							Merge with 4.0.13  
						
						
						
						
					 
					
						2003-06-04 19:21:51 +03:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						7342852dd9 
					 
					
						
						
							
							"Collation" has been moved to SHOW FULL FIELDS  
						
						... 
						
						
						
						SHOW COLLATION columns have been removed:
  D -> Default
  C -> Compiled
  Y -> Yes 
						
						
					 
					
						2003-06-02 17:19:06 +05:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						02adbe6599 
					 
					
						
						
							
							Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED. Bug  #478  
						
						
						
						
					 
					
						2003-06-01 12:32:53 +03:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						a238efaa63 
					 
					
						
						
							
							SHOW FIELDS changes, more SQL99 INFORMATION_SCHEMA.COLUMNS compatibility:  
						
						... 
						
						
						
						Character set is not displayed in "Type" column anymore
In "Collation" column NULL instead of BINARY is now displayd for for non-character data types 
						
						
					 
					
						2003-05-23 13:10:25 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6aa8929cf3 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Added initialization of all important global variables 
						
						
					 
					
						2003-05-21 21:39:58 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						5d3df7610f 
					 
					
						
						
							
							merge fix  
						
						
						
						
					 
					
						2003-04-26 16:44:42 +03:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						0bfb2d3d9f 
					 
					
						
						
							
							correct test result  
						
						
						
						
					 
					
						2003-04-23 15:37:11 +04:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						ae51f04564 
					 
					
						
						
							
							do not mark the table as analyzed unless all the key parts are REALLY analyzed.  
						
						
						
						
					 
					
						2003-04-23 00:53:07 +04:00