monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0de4777187 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-12-06 11:38:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						67ce247965 
					 
					
						
						
							
							Add support for up to VARCHAR (size up to 65535)  
						
						 
						
						... 
						
						
						
						Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short 
						
						
					 
					
						2004-12-06 02:00:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						fe70f8c747 
					 
					
						
						
							
							Merge mysql.com:/space/bkroot/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/space/bk/b6391-mysql-4.1 
						
						
					 
					
						2004-12-03 12:15:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mats@mysql.com 
							
						 
					 
					
						
						
							
						
						2bbdf2403d 
					 
					
						
						
							
							Bug#6391 (binlog-do-db rules ignored)  
						
						 
						
						... 
						
						
						
						CREATE DATABASE statement used the current database instead of the
  database created when checking conditions for replication.
  CREATE/DROP/ALTER DATABASE statements are now replicated based on
  the manipulated database. 
						
						
					 
					
						2004-12-03 12:13:51 +01: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						072d38eb12 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-11-21 20:08:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						21eb2e2eae 
					 
					
						
						
							
							post merge  
						
						 
						
						
						
						
					 
					
						2004-11-21 19:33:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2d3dd65cc1 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2004-11-20 18:36:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						0acc6f83b2 
					 
					
						
						
							
							enabled having system tables in ndb  
						
						 
						
						
						
						
					 
					
						2004-11-17 08:10:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c67d479918 
					 
					
						
						
							
							Fixes for information_schema  
						
						 
						
						
						
						
					 
					
						2004-11-15 19:20:45 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						bb52950625 
					 
					
						
						
							
							make information schema libmysqld compatible  
						
						 
						
						... 
						
						
						
						fixed typo 
						
						
					 
					
						2004-11-14 00:28:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d76db8b999 
					 
					
						
						
							
							marge  
						
						 
						
						
						
						
					 
					
						2004-11-13 19:45:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7210195f1e 
					 
					
						
						
							
							now my_printf_error is not better then my_error, but my_error call is shorter  
						
						 
						
						... 
						
						
						
						used only one implementation of format parser of (printf)
fixed multistatement 
						
						
					 
					
						2004-11-13 19:35:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						321f803784 
					 
					
						
						
							
							WL#1629: SHOW with WHERE(partially) &  
						
						 
						
						... 
						
						
						
						WL#173:  Create Data Dictionary Tables for SHOW Commands 
						
						
					 
					
						2004-11-13 13:56:39 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						addd1a0da8 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-11-12 19:58:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e9c3887b58 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						
						
						
					 
					
						2004-11-12 17:44:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1555469b64 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-11-12 15:36:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						31f7811183 
					 
					
						
						
							
							post-review fixes  
						
						 
						
						
						
						
					 
					
						2004-11-12 14:34:00 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						baf9771474 
					 
					
						
						
							
							Cleanup in sql_acl.cc: thd->lex ->lex  
						
						 
						
						
						
						
					 
					
						2004-11-11 21:57:55 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						0ebc50b851 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2004-11-09 21:47:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1087186657 
					 
					
						
						
							
							Merge with 4.1 to get new thd->mem_root handling  
						
						 
						
						
						
						
					 
					
						2004-11-08 17:53:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b903a129e2 
					 
					
						
						
							
							Simpler arena swapping code  
						
						 
						
						... 
						
						
						
						Now thd->mem_root is a pointer to thd->main_mem_root and THR_MALLOC is a pointer to thd->mem_root.
This gives us the following benefits:
- Allow us to easily detect if arena has already been swapped before (this fixes a bug in setup_conds() where arena was swaped twice in some cases)
- Faster swaps of arenas (as we don't have to copy the whole MEM_ROOT)
- We don't anymore have to call my_pthread_setspecific_ptr(THR_MALLOC,...) to change where memory is alloced. Now it's enough to set thd->mem_root 
						
						
					 
					
						2004-11-08 01:13:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7eae926e26 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0 
						
						
					 
					
						2004-11-06 12:46:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7d3be517a4 
					 
					
						
						
							
							Merge on pull  
						
						 
						
						
						
						
					 
					
						2004-11-03 13:01:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4c65a9447e 
					 
					
						
						
							
							WL#1437 :don't create new users with GRANT  
						
						 
						
						
						
						
					 
					
						2004-11-02 17:45:26 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						afbe601302 
					 
					
						
						
							
							merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-10-29 19:26:52 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3d389a038e 
					 
					
						
						
							
							fixed detection of updating table on which we select (BUG#6032)  
						
						 
						
						
						
						
					 
					
						2004-10-25 17:32:28 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dellis@goetia.(none) 
							
						 
					 
					
						
						
							
						
						d4c5e404ac 
					 
					
						
						
							
							sql_acl.cc:  
						
						 
						
						... 
						
						
						
						Correcting problem with merge 
						
						
					 
					
						2004-10-22 14:32:23 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dellis@goetia.(none) 
							
						 
					 
					
						
						
							
						
						8ac3b79008 
					 
					
						
						
							
							After-merge fixes.  
						
						 
						
						
						
						
					 
					
						2004-10-22 14:19:42 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dellis@goetia.(none) 
							
						 
					 
					
						
						
							
						
						e1d5815341 
					 
					
						
						
							
							sql_acl.cc:  
						
						 
						
						... 
						
						
						
						BUG #5831   Post-review changes, merging improvements from Monty. 
						
						
					 
					
						2004-10-22 13:41:40 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3288007235 
					 
					
						
						
							
							fixed db/user privileges getting (BUG#5976)  
						
						 
						
						
						
						
					 
					
						2004-10-22 15:43:22 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						42d6d6765a 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0 
						
						
					 
					
						2004-10-20 16:11:16 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4714a6e744 
					 
					
						
						
							
							errors without code removed  
						
						 
						
						... 
						
						
						
						net_printf/send_error calls replaced by my_error family functions
-1/1 (sent/unsent) error reporting removed
(WL#2133) 
						
						
					 
					
						2004-10-20 04:04:37 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						04c23808a8 
					 
					
						
						
							
							Review of all code pushed since last review  
						
						 
						
						... 
						
						
						
						Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify 
						
						
					 
					
						2004-10-20 01:28:42 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dellis@goetia.(none) 
							
						 
					 
					
						
						
							
						
						a4aec769b0 
					 
					
						
						
							
							sql_acl.cc:  
						
						 
						
						... 
						
						
						
						BUG #5831  Revoke privileges in a loop until no more privileges are revoked, because acl_dbs and column_priv_hash can re-organize during privilege removal. 
						
						
					 
					
						2004-10-18 20:25:47 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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