hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						5f8e7fef27 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-09-26 15:40:26 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						ba8fa76fa2 
					 
					
						
						
							
							SCRUM:  
						
						 
						
						... 
						
						
						
						WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server 
						
						
					 
					
						2003-09-26 15:33:13 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						8d884c02bb 
					 
					
						
						
							
							Merging 4.1 -> 5.0  
						
						 
						
						
						
						
					 
					
						2003-09-24 11:29:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						99e2a82168 
					 
					
						
						
							
							Bug 1350 fix  
						
						 
						
						
						
						
					 
					
						2003-09-22 11:11:36 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						710599ca2e 
					 
					
						
						
							
							Bug fix:  
						
						 
						
						... 
						
						
						
						http://bugs.mysql.com/bug.php?id=1264  
						
						
					 
					
						2003-09-16 12:36:36 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						f55b05e2cf 
					 
					
						
						
							
							In CREATE syntax: KEY a (field_name(10))  
						
						 
						
						... 
						
						
						
						10 now means "number of characters", not number of bytes. 
						
						
					 
					
						2003-09-15 14:45:42 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						45aa92c574 
					 
					
						
						
							
							After merge fixes.  
						
						 
						
						... 
						
						
						
						Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code) 
						
						
					 
					
						2003-09-11 19:06:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4b3b4b9250 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-09-03 19:53:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						77a70a0a24 
					 
					
						
						
							
							merge with 4.0.15  
						
						 
						
						
						
						
					 
					
						2003-08-29 13:44:35 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						66b160c253 
					 
					
						
						
							
							vio ssl structure renames (to get rid of ending _)  
						
						 
						
						... 
						
						
						
						Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port 
						
						
					 
					
						2003-08-27 02:51:39 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						7f158dd12a 
					 
					
						
						
							
							Merge 4.1 into 5.0  
						
						 
						
						
						
						
					 
					
						2003-08-26 11:51:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						2c1f1206c3 
					 
					
						
						
							
							Better fix for myisamchk --sort-index on windows  
						
						 
						
						... 
						
						
						
						Fixed deadlock bug when doing resize of key buffer while key buffer was in active use 
						
						
					 
					
						2003-08-25 17:19:44 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						e12136b468 
					 
					
						
						
							
							show symlinked directories in SHOW CREATE TABLE  
						
						 
						
						
						
						
					 
					
						2003-08-23 12:25:39 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e3a3d00c77 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-08-21 21:39:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						7f1ffcc453 
					 
					
						
						
							
							Bug  #1064 : SHOW CREATE TABLE: avoid allocations for simple tables, old client compatibility  
						
						 
						
						
						
						
					 
					
						2003-08-21 21:14:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						5bc4965d70 
					 
					
						
						
							
							fix for SHOW CREATE TABLE to report corerct second field's length  
						
						 
						
						
						
						
					 
					
						2003-08-21 20:21:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						bb837f3506 
					 
					
						
						
							
							fixed typo in last push  
						
						 
						
						
						
						
					 
					
						2003-08-17 14:37:26 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						d79cbc3b99 
					 
					
						
						
							
							Fix mutex handling in SHOW_VARIABLES (key_buffer_size was not properly protected)  
						
						 
						
						... 
						
						
						
						Changed some non fatal myisamchk error messages to warnings 
						
						
					 
					
						2003-08-17 14:10:15 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						79922d946a 
					 
					
						
						
							
							table checksum background:  
						
						 
						
						... 
						
						
						
						my_checksum() mysys function
   NISAM checksum code moved from mysys to isam/ - it's obsolete
   MyISAM checksum code moved to mysys
   table's checksum accessible from sql layer
   SHOW TABLE STATUS shows checksum (WL#646)
code cleanup 
						
						
					 
					
						2003-08-05 21:14:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2cac8f0768 
					 
					
						
						
							
							now GRANT db.* ... compares patterns correctly to prevent privilege escalation  
						
						 
						
						
						
						
					 
					
						2003-07-22 22:21:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						333bddb33f 
					 
					
						
						
							
							SCRUM:  
						
						 
						
						... 
						
						
						
						Task 499 'init_connect, init_slave options' 
						
						
					 
					
						2003-07-18 14:11:01 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.telia.com 
							
						 
					 
					
						
						
							
						
						9c3a7a6ba3 
					 
					
						
						
							
							Merge 4.1 into 5.0 (first pass).  
						
						 
						
						
						
						
					 
					
						2003-07-08 17:50:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						ebcc7b5a4f 
					 
					
						
						
							
							Support for variables with components  
						
						 
						
						... 
						
						
						
						Added framework to create/drop and manager buffers for multiple key caches 
						
						
					 
					
						2003-07-06 19:09:57 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dfac0fc90a 
					 
					
						
						
							
							Allow one to use MERGE tables with tables from different databases  
						
						 
						
						... 
						
						
						
						Added command 'replace_column' to mysqltest 
						
						
					 
					
						2003-06-27 16:29:10 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dad0664579 
					 
					
						
						
							
							merge with public tree  
						
						 
						
						
						
						
					 
					
						2003-06-05 00:12:45 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						23145cfed7 
					 
					
						
						
							
							Added SQLSTATE to client/server protocol  
						
						 
						
						... 
						
						
						
						bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86 
						
						
					 
					
						2003-06-04 18:28:51 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						8f57d0e2e4 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into myvenu.com:/home/venu/work/sql/dev-4.1 
						
						
					 
					
						2003-06-03 18:45:53 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						27469ec8b9 
					 
					
						
						
							
							Windows build fixups with the latest source  
						
						 
						
						
						
						
					 
					
						2003-06-03 18:45:07 -07: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						2b1e1f6494 
					 
					
						
						
							
							Variables were rename, binary collation names were added  
						
						 
						
						... 
						
						
						
						Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled 
						
						
					 
					
						2003-05-22 17:20:19 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						413bb98b5c 
					 
					
						
						
							
							SHOW TABLE STATUS displayed wrong Row_format for myisampack'ed tables. (Bug  #427 )  
						
						 
						
						
						
						
					 
					
						2003-05-14 09:37:04 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						784fb81426 
					 
					
						
						
							
							INSERT ... UPDATE ... VALUES()  
						
						 
						
						
						
						
					 
					
						2003-05-03 01:16:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						4fecd58e43 
					 
					
						
						
							
							Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0  
						
						 
						
						... 
						
						
						
						into sinisa.nasamreza.org:/mnt/work/mysql-4.0 
						
						
					 
					
						2003-04-16 17:07:20 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						3e6c350f64 
					 
					
						
						
							
							Fixed bug in SUM() with NULL:s  
						
						 
						
						... 
						
						
						
						Added logging of warnings for failed connections with ssl.
Fixed bug in symbolic link handling on Windows 
						
						
					 
					
						2003-04-15 22:04:16 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5d4e9f95f2 
					 
					
						
						
							
							Merging  
						
						 
						
						
						
						
					 
					
						2003-04-08 19:43:24 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a7708c7904 
					 
					
						
						
							
							Merge with 4.0  
						
						 
						
						
						
						
					 
					
						2003-04-03 21:19:12 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						10957fb0f3 
					 
					
						
						
							
							One test case, one bug fix and one new feature  
						
						 
						
						
						
						
					 
					
						2003-04-03 20:24:15 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						0ee0589e93 
					 
					
						
						
							
							Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into genie.(none):/home/hf/work/mysql-5.0.kil 
						
						
					 
					
						2003-03-31 13:42:37 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						f8f0b70380 
					 
					
						
						
							
							SCRUM  
						
						 
						
						... 
						
						
						
						two KILL commands implementation (version 2) 
						
						
					 
					
						2003-03-31 13:39:46 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						a5222e1c69 
					 
					
						
						
							
							fixed problem of port without host in SHOW PROCESSLIST (bug 189)  
						
						 
						
						
						
						
					 
					
						2003-03-26 22:04:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4e06f1f5bd 
					 
					
						
						
							
							German Phone book collation is always compiled  
						
						 
						
						... 
						
						
						
						Some collation names have been renamed 
						
						
					 
					
						2003-03-26 13:27:19 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						0f7c02f5fa 
					 
					
						
						
							
							SHOW CHARACTER SET now can display comments  
						
						 
						
						... 
						
						
						
						Low case letters are used in charset names 
						
						
					 
					
						2003-03-25 16:12:49 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						43a04aa9fc 
					 
					
						
						
							
							sql_show.cc:  
						
						 
						
						... 
						
						
						
						LIKE was used against wrong name 
						
						
					 
					
						2003-03-25 13:42:01 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3a453df6c2 
					 
					
						
						
							
							Two separate commands: SHOW COLLATION and SHOW CHARACTER SET  
						
						 
						
						
						
						
					 
					
						2003-03-25 13:38:05 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						9f200ede0d 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into narttu.mysql.fi:/my/mysql-4.1 
						
						
					 
					
						2003-03-20 02:06:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						b883a9c01c 
					 
					
						
						
							
							Merge with 4.0.12  
						
						 
						
						
						
						
					 
					
						2003-03-19 22:25:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						68ca84dbd1 
					 
					
						
						
							
							Print right hostname or IP in SHOW PROCESSLIST  
						
						 
						
						... 
						
						
						
						Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists 
						
						
					 
					
						2003-03-19 21:43:41 +02:00