timour@mysql.com 
							
						 
					 
					
						
						
							
						
						8ab4a7a101 
					 
					
						
						
							
							Merge with implementation of WL#1724.  
						
						 
						
						
						
						
					 
					
						2004-10-11 10:47:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						09e9651acc 
					 
					
						
						
							
							fix privileges for old style privileges tables on fly (as it do mysql_fix_privilege_tables dut if we have not it run)  
						
						 
						
						... 
						
						
						
						fixed forgoten test 
						
						
					 
					
						2004-10-10 18:51:02 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d2a5548431 
					 
					
						
						
							
							Using MySQL 4.0 with privilege tables from 5.0 caused a crash.  
						
						 
						
						... 
						
						
						
						(Fixed this by backporting some logic from 4.1) 
						
						
					 
					
						2004-10-08 16:32:56 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3ef0b19cd3 
					 
					
						
						
							
							fixed & added comments (according to Igor's review and a bit more)  
						
						 
						
						
						
						
					 
					
						2004-10-07 01:45:06 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						c27d22b44e 
					 
					
						
						
							
							Reverted patch for new usage of open_count as it caused more problems than it solved  
						
						 
						
						... 
						
						
						
						Cleaned up patch for checking locks for multi-table updates 
						
						
					 
					
						2004-10-06 01:24:21 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						74e7df0d80 
					 
					
						
						
							
							SHOW CREATE VIEW (TABLE) privilege now reqiere show create privilege  
						
						 
						
						... 
						
						
						
						(BUG#4777) 
						
						
					 
					
						2004-09-17 22:23:59 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						62c2f1c161 
					 
					
						
						
							
							sql_print_error cleanup  
						
						 
						
						
						
						
					 
					
						2004-09-04 20:17:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						46ff90738b 
					 
					
						
						
							
							Merge with pulled code  
						
						 
						
						
						
						
					 
					
						2004-09-03 22:38:45 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cbd67f49e1 
					 
					
						
						
							
							Cleanup of new code pushed into 5.0 since last pull  
						
						 
						
						... 
						
						
						
						Merged the different find_xxxx_table_in_list functions to one + some inline functions 
						
						
					 
					
						2004-09-03 21:43:04 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b60713c033 
					 
					
						
						
							
							bug in my_strnncoll_utf8 (and friends) fixed  
						
						 
						
						... 
						
						
						
						cleanups
better, charset-dependent, ft_max_len_for_sort value 
						
						
					 
					
						2004-08-30 08:37:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								timour@mysql.com 
							
						 
					 
					
						
						
							
						
						e2cd3dd1ce 
					 
					
						
						
							
							WL#1724 "Min/Max Optimization for Queries with Group By Clause"  
						
						 
						
						... 
						
						
						
						- after-review changes
- merged with the source tree from 204-08-27 
						
						
					 
					
						2004-08-27 16:37:13 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7e446b8349 
					 
					
						
						
							
							Item name for VIEW added to find_field_in_table (BUG#5147)  
						
						 
						
						
						
						
					 
					
						2004-08-27 00:08:59 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ea687ba5da 
					 
					
						
						
							
							Portability fixes  
						
						 
						
						... 
						
						
						
						Fixed bug in end space handle for WHERE text_column="constant" 
						
						
					 
					
						2004-08-26 18:26:38 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e1237cbc53 
					 
					
						
						
							
							manually merged  
						
						 
						
						
						
						
					 
					
						2004-08-18 19:57:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						798952dcf2 
					 
					
						
						
							
							A fix (Bug#4898: User privileges depending on ORDER BY Settings of table db)  
						
						 
						
						
						
						
					 
					
						2004-08-12 09:41:35 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						d3e520ce7e 
					 
					
						
						
							
							Port of cursors to be pushed into 5.0 tree:  
						
						 
						
						... 
						
						
						
						- client side part is simple and may be considered stable
- server side part now just joggles with THD state to save execution
  state and has no additional locking wisdom.
  Lot's of it are to be rewritten. 
						
						
					 
					
						2004-08-03 03:32:21 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e8d23cfa26 
					 
					
						
						
							
							followup to SET PASSWORD fix  
						
						 
						
						
						
						
					 
					
						2004-08-01 17:21:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2852862c68 
					 
					
						
						
							
							apply in SET PASSWORD same checks as in GRANT, to let only valid hashes through  
						
						 
						
						
						
						
					 
					
						2004-07-30 22:05:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						bc98f2146d 
					 
					
						
						
							
							made different fields for view updatebility in principle and updatability during this execution (BUG#4601)  
						
						 
						
						
						
						
					 
					
						2004-07-22 17:52:04 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						8bc592f1b0 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0 
						
						
					 
					
						2004-07-20 22:10:47 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8d080cbcfa 
					 
					
						
						
							
							manual merge  
						
						 
						
						
						
						
					 
					
						2004-07-20 15:34:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4246f40065 
					 
					
						
						
							
							fixed case when frivileges check switched off (BUG#4631)  
						
						 
						
						
						
						
					 
					
						2004-07-20 01:01:02 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						acfcf76228 
					 
					
						
						
							
							make acl_init() more robust -  
						
						 
						
						... 
						
						
						
						don't be confused if  new privilege - ENUM ('N','Y') - columns are added (mostly because of downgrade)
  don't expect NOT NULL fields to never contain a NULL :) - somebody may've changed table definition, or we may be reading the wrong column 
						
						
					 
					
						2004-07-19 16:01:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								miguel@hegel.txg 
							
						 
					 
					
						
						
							
						
						b3b598d19c 
					 
					
						
						
							
							Fixes for bug  #4571  (Windows compabilities)  
						
						 
						
						
						
						
					 
					
						2004-07-16 03:47:17 -03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9336d36cf8 
					 
					
						
						
							
							VIEW  
						
						 
						
						... 
						
						
						
						two TABLE_LIST copy eliminated 
						
						
					 
					
						2004-07-16 01:15:55 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						31fe2837f9 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-07-12 08:20:24 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1e31199995 
					 
					
						
						
							
							Merge with 4.1.3-beta  
						
						 
						
						
						
						
					 
					
						2004-07-07 11:29:39 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								antony@ltantony.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						58cec1fd6a 
					 
					
						
						
							
							Bug#4407 - assertion in ha_myisam.cc  
						
						 
						
						... 
						
						
						
						Fix assertion failure where ha_myisam::index_next() is called
  without first calling ha_myisam::ha_index_init() 
						
						
					 
					
						2004-07-06 16:30:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c03addab79 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2004-06-23 12:36:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3f1c4ba745 
					 
					
						
						
							
							handler interface cleanups:  
						
						 
						
						... 
						
						
						
						more logical table/index_flags
  return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
  max_keys and other limits renamed to max_supported_keys/etc
  max_keys/etc are now wrappers to max_supported_keys/etc 
  ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing 
						
						
					 
					
						2004-06-23 12:29:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b11d258835 
					 
					
						
						
							
							Merge with 4.0.21  
						
						 
						
						
						
						
					 
					
						2004-06-18 04:38:58 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ff223db0fe 
					 
					
						
						
							
							Merge with 3.23 to get latest bug fixes  
						
						 
						
						
						
						
					 
					
						2004-06-10 11:59:45 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d8b6322860 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2004-06-09 12:34:22 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						4cb62eb001 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2004-06-02 12:14:36 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						dc5a7f8030 
					 
					
						
						
							
							cleanup  
						
						 
						
						
						
						
					 
					
						2004-06-02 00:27:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6341c93d77 
					 
					
						
						
							
							check_scramble_323 shuold ensure that the scramble has the correct length  
						
						 
						
						
						
						
					 
					
						2004-06-01 23:58:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						70c2256d2f 
					 
					
						
						
							
							Merge with 4.0 to get fixes for netware  
						
						 
						
						
						
						
					 
					
						2004-06-02 00:09:14 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4c8387706a 
					 
					
						
						
							
							correct table_hash_search call  
						
						 
						
						
						
						
					 
					
						2004-05-31 21:10:15 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2e1ded2fe1 
					 
					
						
						
							
							backport wild_compare fix from 4.1 - bug#3924  
						
						 
						
						
						
						
					 
					
						2004-05-29 17:52:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						71eddc362e 
					 
					
						
						
							
							Merging 4.1 to 5.0.  
						
						 
						
						
						
						
					 
					
						2004-05-26 17:04:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						c095ce828e 
					 
					
						
						
							
							Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table  
						
						 
						
						... 
						
						
						
						names to lower case using latin1 instead of utf-8 in sql_acl.cc if lower_case_table_names 
was on. Also replaced in other such places system_charset_info with files_charset_info
for consistency. 
						
						
					 
					
						2004-05-22 23:41:58 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						a79a3f5724 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mishka.local:/home/my/mysql-4.1 
						
						
					 
					
						2004-05-16 14:49:32 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						314a8bf114 
					 
					
						
						
							
							key_cmp -> key_cmp_if_same  
						
						 
						
						... 
						
						
						
						New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys 
						
						
					 
					
						2004-05-16 14:48:32 +03: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 
							
						 
					 
					
						
						
							
						
						116f61c656 
					 
					
						
						
							
							Don't automaticly generate a new key for a foreign key constraint if there is already a usable key.  
						
						 
						
						... 
						
						
						
						Prefer not automatic keys before automatic keys. If there is two conf 
						
						
					 
					
						2004-05-12 00:29:52 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1d528a4d55 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2004-05-11 12:21:38 +03:00