pem@mysql.com 
							
						 
					 
					
						
						
							
						
						8d884c02bb 
					 
					
						
						
							
							Merging 4.1 -> 5.0  
						
						 
						
						
						
						
					 
					
						2003-09-24 11:29:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c22c1d8a4d 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-09-24 10:24:56 +03: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 
							
						 
					 
					
						
						
							
						
						f300e3a164 
					 
					
						
						
							
							Remove 'extern' references from .cc files  
						
						 
						
						
						
						
					 
					
						2003-09-13 11:35:29 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7538242e4f 
					 
					
						
						
							
							merge with 4.1 tree  
						
						 
						
						
						
						
					 
					
						2003-09-11 20:31:40 +03: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						6fa45cec53 
					 
					
						
						
							
							mysql_create_table now accepts field lengths in CREATE form, not in internal form.  
						
						 
						
						... 
						
						
						
						This is to simplify fixing indexes to mean number of chars rather than bytes too. 
						
						
					 
					
						2003-09-10 17:25:26 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4b3b4b9250 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-09-03 19:53:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						755455e15c 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-09-03 12:07:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2fcab1c2ee 
					 
					
						
						
							
							CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]  
						
						 
						
						
						
						
					 
					
						2003-09-03 11:34:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						77a70a0a24 
					 
					
						
						
							
							merge with 4.0.15  
						
						 
						
						
						
						
					 
					
						2003-08-29 13:44:35 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						27e331c30a 
					 
					
						
						
							
							Revert change of lower-case-table handling as this breaks how alias works.  
						
						 
						
						... 
						
						
						
						Changes like this should be done to 4.1, not to a stable release 
						
						
					 
					
						2003-08-29 04:17:30 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e4951147cf 
					 
					
						
						
							
							Fix for bug  #799  FLUSH TABLES WITH READ LOCK does not block CREATE TABLE  
						
						 
						
						... 
						
						
						
						This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39).
Note about COMMIT&ROLLBACK:
  Only 'COMMIT' statement updates the binary log. 
  'ROLLBACK' statement doesn't update the binlog. 
						
						
					 
					
						2003-08-28 18:09:00 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4c076ea6d7 
					 
					
						
						
							
							Fix for bug  #799  FLUSH TABLES WITH READ LOCK does not block CREATE TABLE  
						
						 
						
						
						
						
					 
					
						2003-08-27 18:03:39 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.telia.com 
							
						 
					 
					
						
						
							
						
						08e5a7e135 
					 
					
						
						
							
							Post-merge fixes.  
						
						 
						
						
						
						
					 
					
						2003-08-26 17:41:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						7f158dd12a 
					 
					
						
						
							
							Merge 4.1 into 5.0  
						
						 
						
						
						
						
					 
					
						2003-08-26 11:51:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						40193a7fa5 
					 
					
						
						
							
							Manual merge  
						
						 
						
						
						
						
					 
					
						2003-08-26 00:13:22 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						9d02d19ce8 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.0  
						
						 
						
						... 
						
						
						
						into narttu.mysql.fi:/my/mysql-4.0 
						
						
					 
					
						2003-08-23 12:26:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						e12136b468 
					 
					
						
						
							
							show symlinked directories in SHOW CREATE TABLE  
						
						 
						
						
						
						
					 
					
						2003-08-23 12:25:39 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						ced195f8a9 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						
						
						
					 
					
						2003-08-22 18:43:46 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						08d7f298ee 
					 
					
						
						
							
							fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib  
						
						 
						
						... 
						
						
						
						moved them all from different places to item_strfunc.{h,cc}
checksum table command
Com_xxx status variables updated 
						
						
					 
					
						2003-08-21 16:15:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@laptop.sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						dd9cbce47b 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-08-19 20:14:35 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						10c4acfb4f 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-08-19 00:10:21 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@laptop.sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						85f397781b 
					 
					
						
						
							
							Code cleanup  
						
						 
						
						
						
						
					 
					
						2003-08-16 13:26:48 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2263e3e51f 
					 
					
						
						
							
							Merge with 4.0.14  
						
						 
						
						
						
						
					 
					
						2003-08-11 22:44:43 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						786af34146 
					 
					
						
						
							
							Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a  
						
						 
						
						... 
						
						
						
						The above query created a field of koi8r charset, not cp1251
Change:
CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
Length now means character length, not byte length.
The above creates a field that guarantees can store a multibyte value
1 character long. For utf8 the above creates a field that can store
3 bytes. 
						
						
					 
					
						2003-08-11 18:18:34 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						994a1ea337 
					 
					
						
						
							
							Merge rurik.mysql.com:/home/igor/mysql-4.1  
						
						 
						
						... 
						
						
						
						into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
						
						
					 
					
						2003-08-09 12:57:39 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						7da378f1d1 
					 
					
						
						
							
							PRIMARY KEY can erroneously have HA_NULL_PART_KEY flag that breaks correct key sorting  
						
						 
						
						
						
						
					 
					
						2003-08-07 13:39:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						9306f55d8e 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						Added key cache assignment
mi_locking.c:
  Added key cache assignment: correction
my_sys.h:
  Added key cache variable structure 
						
						
					 
					
						2003-08-02 02:43:18 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						e08a00bd02 
					 
					
						
						
							
							Fuller implementation of lower case table names.  
						
						 
						
						... 
						
						
						
						Bug record #828  
						
						
					 
					
						2003-07-23 17:36:56 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						1167e170d2 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-07-19 18:49:04 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						26ecd86539 
					 
					
						
						
							
							Conflict resolution  
						
						 
						
						
						
						
					 
					
						2003-07-16 13:35:34 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						42e1296e9d 
					 
					
						
						
							
							mi_keycache.c:  
						
						 
						
						... 
						
						
						
						new file
Many files:
  Added CACHE INDEX command 
						
						
					 
					
						2003-07-16 12:30:49 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						0f47087e22 
					 
					
						
						
							
							Fix for the bug  #841 : wrong number of warnings  
						
						 
						
						
						
						
					 
					
						2003-07-14 15:32:31 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						e1aa90a9bf 
					 
					
						
						
							
							Safety and speedup fixes:  
						
						 
						
						... 
						
						
						
						Changed is_open() to work as before.
Added back inited argument to LOG 
						
						
					 
					
						2003-07-14 10:12:05 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						fbebac9a48 
					 
					
						
						
							
							Fix for BUG#791:  
						
						 
						
						... 
						
						
						
						a safer way of initing the mutexes in MYSQL_LOG.
is_open() is now always thread-safe.
See each file for details. 
						
						
					 
					
						2003-07-11 14:26:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						b2cbd83913 
					 
					
						
						
							
							Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS  
						
						 
						
						... 
						
						
						
						Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup 
						
						
					 
					
						2003-07-08 23:58:04 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.telia.com 
							
						 
					 
					
						
						
							
						
						9c3a7a6ba3 
					 
					
						
						
							
							Merge 4.1 into 5.0 (first pass).  
						
						 
						
						
						
						
					 
					
						2003-07-08 17:50:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d71b51323b 
					 
					
						
						
							
							REPAIR/OPTIMIZE/CHECK/RESTORE/etc commands close relevant open HANDLERs  
						
						 
						
						
						
						
					 
					
						2003-06-30 17:00:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						862506b6af 
					 
					
						
						
							
							Derived tables bug fix .......  
						
						 
						
						
						
						
					 
					
						2003-06-12 16:52:36 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						a0f3dcc3c8 
					 
					
						
						
							
							Merge rurik.mysql.com:/home/igor/mysql-4.1  
						
						 
						
						... 
						
						
						
						into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
						
						
					 
					
						2003-06-12 06:22:35 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						f547f2769f 
					 
					
						
						
							
							Many files:  
						
						 
						
						... 
						
						
						
						New feature: preload indexes into key cache.
mi_preload.c:
  new file
Many files:
  Added preload statement. 
						
						
					 
					
						2003-06-12 04:29:02 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dad0664579 
					 
					
						
						
							
							merge with public tree  
						
						 
						
						
						
						
					 
					
						2003-06-05 00:12:45 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						40109c574a 
					 
					
						
						
							
							Merge with 4.0.13  
						
						 
						
						
						
						
					 
					
						2003-06-04 19:21:51 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						02adbe6599 
					 
					
						
						
							
							Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED. Bug  #478  
						
						 
						
						
						
						
					 
					
						2003-06-01 12:32:53 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						81f0fb6e18 
					 
					
						
						
							
							character_set_server is now updatable  
						
						 
						
						... 
						
						
						
						character_set_database was added
Code optimization: reuse more code for all character sets variables 
						
						
					 
					
						2003-05-30 13:03:56 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						cb7061ebe4 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-05-22 02:57:27 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						39cbb547d4 
					 
					
						
						
							
							Resolve merge colflict  
						
						 
						
						
						
						
					 
					
						2003-05-21 00:12:09 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						 
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00