konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						06cfe9a4a4 
					 
					
						
						
							
							A test case for Bug#6282 "Packet error with SELECT INTO"  
						
						 
						
						... 
						
						
						
						(the bug itself is no longer repeatable). 
						
						
					 
					
						2005-03-23 21:36:15 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						7eb8c130f7 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-02-17 16:16:58 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								svoj@mysql.com 
							
						 
					 
					
						
						
							
						
						349112292f 
					 
					
						
						
							
							bug#6958  
						
						 
						
						... 
						
						
						
						Fixed that negative arguments to certain integer options wrap around. 
						
						
					 
					
						2005-02-17 15:04:04 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						b94a482ee9 
					 
					
						
						
							
							Precision Math implementation  
						
						 
						
						
						
						
					 
					
						2005-02-09 02:50:45 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						a04fc26c54 
					 
					
						
						
							
							manually merged  
						
						 
						
						
						
						
					 
					
						2004-12-31 15:26:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						45ce994e5d 
					 
					
						
						
							
							post-merge  
						
						 
						
						
						
						
					 
					
						2004-12-31 11:52:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vtkachenko@intelp4d.mysql.com 
							
						 
					 
					
						
						
							
						
						ae1b969c8f 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0 
						
						
					 
					
						2004-12-31 09:00:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vtkachenko@intelp4d.mysql.com 
							
						 
					 
					
						
						
							
						
						78846b2923 
					 
					
						
						
							
							logging_ok:  
						
						 
						
						... 
						
						
						
						Logging to logging@openlogging.org  accepted
sql_yacc.yy, sql_parse.cc, sql_lex.h, lex.h:
  Implements the SHOW MUTEX STATUS command
set_var.cc, mysqld.cc, mysql_priv.h:
  Added new GLOBAL variable timed_mutexes
ha_innodb.h:
  New function innodb_mutex_show_status
ha_innodb.cc:
  Added new innodb variables in SHOW STATUS
  Implements the SHOW MUTEX STATUS command
innodb.test, innodb.result:
  Added new row_lock_waits status variables tests.
variables.test, variables.result:
  test new variable timed_mutexes
ut0ut.c:
  New function ut_usectime.
sync0sync.c:
  Mutex counting.
sync0rw.c:
  New mutex parameters initialization.
srv0srv.c:
  Counting row lock waits
row0sel.c, row0mysql.c:
  Setting row_lock or table_lock state to thd.
que0que.c:
  Added default no_lock_state to thd.
univ.i:
  Added UNIV_SRV_PRINT_LATCH_WAITS debug define
sync0sync.ic:
  Count mutex using.
sync0sync.h:
  Added new parameters to mutex structure for counting.
sync0rw.h:
  Added new parameters to rw_create_func.
srv0srv.h:
  Added new innodb varuables to SHOW STATUS.
que0que.h:
  Added thread lock states. 
						
						
					 
					
						2004-12-24 12:13:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						4f4bbfc279 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-12-22 13:54:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						f449ba85e8 
					 
					
						
						
							
							A fix (bug  #6993 : Max myisam_data_pointer_size limited to 7).  
						
						 
						
						
						
						
					 
					
						2004-12-07 14:51:13 +04: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 
							
						 
					 
					
						
						
							
						
						afbe601302 
					 
					
						
						
							
							merge with 4.1  
						
						 
						
						
						
						
					 
					
						2004-10-29 19:26:52 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						c315ee2f60 
					 
					
						
						
							
							Merge mysql.com:/home/wax/mysql/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/wax/mysql/mysql-4.1mysqltest 
						
						
					 
					
						2004-09-16 00:53:06 +06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						d6dadac46c 
					 
					
						
						
							
							Merge mysql.com:/home/wax/mysql/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/wax/mysql/mysql-4.1mysqltest 
						
						
					 
					
						2004-09-16 00:50:05 +06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wax@kishkin.ru 
							
						 
					 
					
						
						
							
						
						eb7515366b 
					 
					
						
						
							
							WL#964  
						
						 
						
						... 
						
						
						
						porting mysql_test_run on Linux and Windows 
						
						
					 
					
						2004-09-16 00:47:45 +06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						6c47f075c7 
					 
					
						
						
							
							BUG#4788 - show create table provides incorrect statement.  
						
						 
						
						... 
						
						
						
						Added code to adjust the field_length of user variables 
in dependence on the field type.
Aded new constants for numeric field widths. 
						
						
					 
					
						2004-09-10 18:56:47 +02: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 
							
						 
					 
					
						
						
							
						
						8f2d92c56a 
					 
					
						
						
							
							manually merged  
						
						 
						
						
						
						
					 
					
						2004-08-24 17:24:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						66a3f65d98 
					 
					
						
						
							
							Fixed: BUG#5135: cannot turn on log_warnings with SET in 4.1 (and 4.0)  
						
						 
						
						
						
						
					 
					
						2004-08-23 15:29:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1e31199995 
					 
					
						
						
							
							Merge with 4.1.3-beta  
						
						 
						
						
						
						
					 
					
						2004-07-07 11:29:39 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						be7f1a3570 
					 
					
						
						
							
							merge with 4.0 to get fix for hpux  
						
						 
						
						
						
						
					 
					
						2004-05-28 02:04:07 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a7c17eee46 
					 
					
						
						
							
							Portability fix for 32 bit file systems  
						
						 
						
						
						
						
					 
					
						2004-05-28 00:32:55 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						71eddc362e 
					 
					
						
						
							
							Merging 4.1 to 5.0.  
						
						 
						
						
						
						
					 
					
						2004-05-26 17:04:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						56c0258536 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						... 
						
						
						
						Remove compiler warnings
Update windows project files 
						
						
					 
					
						2004-05-24 14:42:34 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						e13e9288c9 
					 
					
						
						
							
							Fix for Bug#3754 "SET GLOBAL myisam_max_sort_file_size doesn't  
						
						 
						
						... 
						
						
						
						work as expected": precision-losing conversion removed from 
sys_var_thd_ulonglong. 
						
						
					 
					
						2004-05-19 16:42:29 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						dfd59e296e 
					 
					
						
						
							
							Merge 4.1 -> 5.0.  
						
						 
						
						
						
						
					 
					
						2004-04-07 19:07:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						928e796e67 
					 
					
						
						
							
							Better error messages for not nullable  
						
						 
						
						... 
						
						
						
						SET character_set_xxx=NULL
and
SET collation_xxx=NULL 
						
						
					 
					
						2004-03-29 18:33:24 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						61a365e696 
					 
					
						
						
							
							more sys_var_str fixes  
						
						 
						
						
						
						
					 
					
						2004-03-20 17:08:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						581996393a 
					 
					
						
						
							
							select @@smth=@@sys_str_var crash fixed  
						
						 
						
						
						
						
					 
					
						2004-03-20 14:36:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						ceec63f18a 
					 
					
						
						
							
							EOVERFLOW moved to my_base.h - it is used not only in strtod.c  
						
						 
						
						... 
						
						
						
						error message corrected 
						
						
					 
					
						2004-03-16 16:35:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8ba33d7dd3 
					 
					
						
						
							
							Fix for bug#2586 Disallow global/session/local as structured var. instance names  
						
						 
						
						
						
						
					 
					
						2004-03-16 14:01:05 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f43093ec0e 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						... 
						
						
						
						Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t) 
						
						
					 
					
						2004-02-16 10:03:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ce14578909 
					 
					
						
						
							
							Merge with 4.0.18  
						
						 
						
						
						
						
					 
					
						2004-02-11 00:06:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						7b13840a46 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-12-18 17:51:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						2b53eef5f0 
					 
					
						
						
							
							WorkLog  #1323  (part 2)  
						
						 
						
						... 
						
						
						
						New Statement: SHOW [STORAGE] ENGINES
New System Variable: storage_engine
New mysqld Argument: --default-storage-engine= 
						
						
					 
					
						2003-12-17 22:52:03 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						d49ff0fd62 
					 
					
						
						
							
							added error message for receiving variable with wrong GLOBAL|LOCAL type  
						
						 
						
						... 
						
						
						
						(bug #2086 ) 
						
						
					 
					
						2003-12-17 16:37:47 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						63f4858030 
					 
					
						
						
							
							Merged 4.1 -> 5.0  
						
						 
						
						
						
						
					 
					
						2003-12-05 13:11:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						1f02484341 
					 
					
						
						
							
							Fixup error number - Broke during merge  
						
						 
						
						
						
						
					 
					
						2003-12-04 18:09:36 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						afc619f0a2 
					 
					
						
						
							
							WorkLog#1280 - Remove fixed table handler from lex/yacc  
						
						 
						
						
						
						
					 
					
						2003-12-02 20:23:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						28a2c6a96b 
					 
					
						
						
							
							Merging 4.1->5.0.  
						
						 
						
						
						
						
					 
					
						2003-11-19 15:19:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						33346e26af 
					 
					
						
						
							
							added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()  
						
						 
						
						... 
						
						
						
						added string length for more speed
made code covarage for print() method of Item
fixed printability of some items (SCRUM) (WL#1274) 
						
						
					 
					
						2003-10-30 12:57:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						f349adf8de 
					 
					
						
						
							
							support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned  
						
						 
						
						... 
						
						
						
						(BUG#1484) 
						
						
					 
					
						2003-10-24 17:28:32 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						337238b78a 
					 
					
						
						
							
							Merging 4.1->5.0  
						
						 
						
						
						
						
					 
					
						2003-10-22 16:10:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						e71b53a8fe 
					 
					
						
						
							
							merge with 4.0 to get fix for SET enum_system_variable=NULL  
						
						 
						
						
						
						
					 
					
						2003-10-14 16:34:09 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2d3840f550 
					 
					
						
						
							
							Fixed bug in SET enum_system_variable=NULL  
						
						 
						
						
						
						
					 
					
						2003-10-14 16:30:42 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						461d1627b3 
					 
					
						
						
							
							merge with 4.0 for more memory allocation variables.  
						
						 
						
						
						
						
					 
					
						2003-10-13 15:50:30 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c95d142f8f 
					 
					
						
						
							
							Add new user variables for tuning memory usage:  
						
						 
						
						... 
						
						
						
						query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization 
						
						
					 
					
						2003-10-11 22:00:24 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						7f158dd12a 
					 
					
						
						
							
							Merge 4.1 into 5.0  
						
						 
						
						
						
						
					 
					
						2003-08-26 11:51:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						4f7512160b 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						... 
						
						
						
						Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings 
						
						
					 
					
						2003-08-19 00:08:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c2a7768b56 
					 
					
						
						
							
							A new separate error message: Unknown collation 'blablabla'  
						
						 
						
						
						
						
					 
					
						2003-07-29 17:12:14 +05:00