jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						2669b86612 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-07-05 15:23:13 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						ac8f9d3864 
					 
					
						
						
							
							Fix test cases  
						
						
						
						
					 
					
						2005-07-05 15:19:04 -07:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						bfbd0e241b 
					 
					
						
						
							
							added processing of view grants to table grants (BUG#9795)  
						
						
						
						
					 
					
						2005-07-05 13:36:36 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						4429756e53 
					 
					
						
						
							
							Fix crash when an entry was added to the mysql.tables_priv  
						
						... 
						
						
						
						table with an empty hostname. (Bug #11330 ) 
						
						
					 
					
						2005-06-20 10:21:35 -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 
							
						 
					 
					
						
						
							
						
						46eda5b998 
					 
					
						
						
							
							Shift skipping of some tests with embedded server from within  
						
						... 
						
						
						
						mysql-test-run to the tests themselves. 
						
						
					 
					
						2005-03-29 15:50:16 -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 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						a04fc26c54 
					 
					
						
						
							
							manually merged  
						
						
						
						
					 
					
						2004-12-31 15:26:24 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						5e03ebbcad 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Cleanup of mi_print_error() handling
Deleted 'merge' directory 
						
						
					 
					
						2004-12-31 03:47:56 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d71c030587 
					 
					
						
						
							
							After merge fixes  
						
						
						
						
					 
					
						2004-12-31 00:44:00 +02:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						71da86aa11 
					 
					
						
						
							
							Manual merge of changes making GRANTs, which change SSL attributes and/or  
						
						... 
						
						
						
						user limits to behave well on 5.0 tables, into 4.1 tree. 
						
						
					 
					
						2004-12-23 22:16:43 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						caade862ae 
					 
					
						
						
							
							Make GRANTs, which change SSL attributes and/or user limits,  
						
						... 
						
						
						
						to behave well on 5.0 tables (well now you can't use tables from 4.1
and 5.0 with 4.0 because former use utf8, but still it is nice to have
similar code in acl_init() and replace_user_table()).
This also will make such GRANTs working in 5.0 (they are broken now). 
						
						
					 
					
						2004-12-23 21:59:36 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						4f4bbfc279 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2004-12-22 13:54:39 +02:00 
						 
				 
			
				
					
						
							
							
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						1be319a708 
					 
					
						
						
							
							Merge Bug#7391 from 4.0  
						
						
						
						
					 
					
						2004-12-18 15:12:10 +00:00 
						 
				 
			
				
					
						
							
							
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						3047649845 
					 
					
						
						
							
							Bug#7391 - Multi-table UPDATE security regression  
						
						... 
						
						
						
						Add in missing privilege checks. 
  Tests for the privileges. 
						
						
					 
					
						2004-12-18 02:07:32 +00:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0de4777187 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2004-12-06 11:38:56 +02:00 
						 
				 
			
				
					
						
							
							
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c78eefbc95 
					 
					
						
						
							
							Fixes (bug  #6932 : 'revoke all privileges...' doesn't remove all proper columns from columns_priv  
						
						... 
						
						
						
						bug #6933 : error in the tests/grant.pl test). 
						
						
					 
					
						2004-12-02 13:34:30 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						319546d5f0 
					 
					
						
						
							
							create/drop/rename user cleanup  
						
						
						
						
					 
					
						2004-11-27 23:07:30 +01:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						cb53411b47 
					 
					
						
						
							
							WL#2050 - CREATE USER and DROP USER and RENAME USER  
						
						... 
						
						
						
						Added new commands CREATE USER and RENAME USER.
Changed behaviour of DROP USER.
Changed an error messages for the new commands. 
						
						
					 
					
						2004-11-25 21:55:49 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						addd1a0da8 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2004-11-12 19:58:24 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						9252656d49 
					 
					
						
						
							
							merge with 4.0  
						
						
						
						
					 
					
						2004-11-12 11:17:53 +02:00 
						 
				 
			
				
					
						
							
							
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						2ad7d5c662 
					 
					
						
						
							
							Bug#6123 - GRANT USAGE creates useless mysql.db row  
						
						... 
						
						
						
						Prevent creation of a row which grants no rights
  Test included 
						
						
					 
					
						2004-11-11 20:59:03 +00:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						afbe601302 
					 
					
						
						
							
							merge with 4.1  
						
						
						
						
					 
					
						2004-10-29 19:26:52 +03:00 
						 
				 
			
				
					
						
							
							
								dellis@goetia.(none) 
							
						 
					 
					
						
						
							
						
						ce6f076315 
					 
					
						
						
							
							grant.test, grant.result, sql_acl.cc:  
						
						... 
						
						
						
						BUG #5831  Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass. 
						
						
					 
					
						2004-10-01 14:48:48 -05:00 
						 
				 
			
				
					
						
							
							
								dellis@goetia.(none) 
							
						 
					 
					
						
						
							
						
						8a12b5add0 
					 
					
						
						
							
							logging_ok:  
						
						... 
						
						
						
						Logging to logging@openlogging.org  accepted
sql_acl.cc, grant.test, grant.result:
  BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass. 
						
						
					 
					
						2004-10-01 07:50:26 -05: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 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e1237cbc53 
					 
					
						
						
							
							manually merged  
						
						
						
						
					 
					
						2004-08-18 19:57:55 +02:00 
						 
				 
			
				
					
						
							
							
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						a8d3ad5e59 
					 
					
						
						
							
							Added initial sorting in order to make test case repeatable.  
						
						
						
						
					 
					
						2004-08-12 16:02:12 +05:00 
						 
				 
			
				
					
						
							
							
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						955e869d7c 
					 
					
						
						
							
							A test case (bug  #4898 : User privileges depending on ORDER BY Settings of table db)  
						
						
						
						
					 
					
						2004-08-12 14:49:16 +05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						77a230c675 
					 
					
						
						
							
							test of SHOW PRIVILEGES  
						
						
						
						
					 
					
						2004-07-21 00:45:52 +03: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@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						2fc1d5c146 
					 
					
						
						
							
							Bug  #3403  Wrong encoding in SHOW GRANTS, EPLAIN SELECT output  
						
						... 
						
						
						
						This change fixes SHOW GRANTS problem, while EXPLAIN will be fixed
in a separate patch. 
						
						
					 
					
						2004-05-14 12:16:27 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						43546e7a82 
					 
					
						
						
							
							Moved reading of ranges from opt_range.cc to handler.cc  
						
						... 
						
						
						
						This gives the handler more optimization possiblities and is needed for NDB cluster
Fixed not-initialized memory error detected by valgrind 
						
						
					 
					
						2004-04-08 13:58:06 +03:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						84e04c74c5 
					 
					
						
						
							
							Fix for bug#3086: SHOW GRANTS doesn't follow ANSI_QUOTES  
						
						
						
						
					 
					
						2004-03-17 16:19:09 +04:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						7f3771bc76 
					 
					
						
						
							
							fix for a bug  #2953 .  
						
						... 
						
						
						
						When password was granted with a global grant, then granting 
privileges on database level, without password being specified, 
will temporary (in memory) set password to ''. 
						
						
					 
					
						2004-03-01 21:54:08 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						050af89dd8 
					 
					
						
						
							
							Merge with public tree  
						
						
						
						
					 
					
						2004-02-16 10:31:05 +02: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 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e9c46aaf80 
					 
					
						
						
							
							REVOKE ALL PRIVILEGES, GRANT FROM user_list  
						
						... 
						
						
						
						is changed to a more consistent
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_list.
Bug #2642  
						
						
					 
					
						2004-02-15 17:59:52 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						73f66f68fd 
					 
					
						
						
							
							merge with 4.0.15  
						
						
						
						
					 
					
						2003-09-11 20:24:14 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						99490870e6 
					 
					
						
						
							
							Cleaned up last bug fixes  
						
						... 
						
						
						
						Fix bug in SHOW GRANTS when there is a column privilege but no table privilege 
						
						
					 
					
						2003-09-09 20:06:50 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						77a70a0a24 
					 
					
						
						
							
							merge with 4.0.15  
						
						
						
						
					 
					
						2003-08-29 13:44:35 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						ced195f8a9 
					 
					
						
						
							
							After merge fixes  
						
						
						
						
					 
					
						2003-08-22 18:43:46 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						4d2902a27d 
					 
					
						
						
							
							grant.result, grant.test, sql_acl.cc:  
						
						... 
						
						
						
						Fix for a bug #878  
						
						
					 
					
						2003-08-22 18:32:11 +03: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 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						a9146ace70 
					 
					
						
						
							
							Cleanups to recent patches  
						
						... 
						
						
						
						Fix packet error when using wrong GRANT command 
						
						
					 
					
						2003-08-15 09:54:19 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2263e3e51f 
					 
					
						
						
							
							Merge with 4.0.14  
						
						
						
						
					 
					
						2003-08-11 22:44:43 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						fb39821e94 
					 
					
						
						
							
							Some fixes for CREATE / INSERT FROM UNIO >..  
						
						
						
						
					 
					
						2003-07-02 01:24:05 +03:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						c1660e1a23 
					 
					
						
						
							
							Lot's of clean-ups and fixes for 4.0.14.  
						
						
						
						
					 
					
						2003-07-02 00:10:47 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a51ea11147 
					 
					
						
						
							
							SHOW GRANTS hided real grants when grants on both column and table (Bug 654)  
						
						
						
						
					 
					
						2003-06-23 20:03:59 +03:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						7d020eae17 
					 
					
						
						
							
							REVOKE all privileges and delete user(244)  
						
						
						
						
					 
					
						2003-06-06 17:43:23 +05:00