monty@mysql.com 
							
						 
					 
					
						
						
							
						
						86d7b02199 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-07-03 14:17:52 +03:00 
						 
				 
			
				
					
						
							
							
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						b60175f9c4 
					 
					
						
						
							
							Fixed Bug#11226 and reverted fix for Bug#6993.  
						
						... 
						
						
						
						Using 8 bytes for data pointer does not work at least on
all computers. The result may become 0 or negative number.
(mysqld, myisamchk) 
						
						
					 
					
						2005-06-30 16:13:22 +03:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						95484f7996 
					 
					
						
						
							
							Merge mysql.com:/usr/home/bar/mysql-4.1.sysvar  
						
						... 
						
						
						
						into mysql.com:/usr/home/bar/mysql-5.0 
						
						
					 
					
						2005-06-02 17:13:37 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						e686057259 
					 
					
						
						
							
							item_func.cc:  
						
						... 
						
						
						
						set_var.cc:
variables.result
variables.test
  Bug #10904  Illegal mix of collations between a system variable and a constant
  Changing coercibility of system variables to SYSCONST,
  to be the same with USER(), DATABASE(), etc. 
						
						
					 
					
						2005-06-02 16:17:44 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						66b6bbfaea 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/usr/home/ram/work/5.0.b10339 
						
						
					 
					
						2005-05-18 14:46:05 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						122c72e248 
					 
					
						
						
							
							a fix (bug  #10339 : Incorrect error is displayed if try to set value of internal ' warning_count ').  
						
						
						
						
					 
					
						2005-05-13 16:18:27 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						2d25da2a4b 
					 
					
						
						
							
							concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file  
						
						... 
						
						
						
						myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors 
						
						
					 
					
						2005-05-13 12:08:08 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5865330a9e 
					 
					
						
						
							
							Merge embedded server testing changes from 4.1.  
						
						
						
						
					 
					
						2005-04-01 19:17:15 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						16efc3e333 
					 
					
						
						
							
							Merge embedded-server testing changes.  
						
						
						
						
					 
					
						2005-04-01 16:43:35 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						690183d1a0 
					 
					
						
						
							
							Eliminate most of the remaining hardcoded list of tests to skip  
						
						... 
						
						
						
						by adding check for embedded server within tests and splitting some
tests into multiple test files. 
						
						
					 
					
						2005-03-29 17:17:46 -08:00 
						 
				 
			
				
					
						
							
							
								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