jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						083c032ec3 
					 
					
						
						
							
							Fix minimum value of query_prealloc_size to be the same as its default. (Bug  #13334 )  
						
						
						
						
					 
					
						2005-10-10 19:39:16 -07:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						5e3eb3d21e 
					 
					
						
						
							
							Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/usr/home/bar/mysql-4.1.b12363 
						
						
					 
					
						2005-09-02 11:19:43 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						3ff1acb8db 
					 
					
						
						
							
							Bug#12363  
						
						... 
						
						
						
						character_set_results is nullable, but value_ptr returns string "NULL"
set_var.cc:
  Create Item_null instead of Item_string for NULL values
variables.result, variables.test:
  adding test case 
						
						
					 
					
						2005-08-30 17:11:59 +05:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						120dd92b03 
					 
					
						
						
							
							workaround (bug  #9613 : Some read-only variables are selectable, others are not).  
						
						
						
						
					 
					
						2005-08-26 13:23:32 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3c12d0ae54 
					 
					
						
						
							
							Added end marker for tests to make future merges easier  
						
						
						
						
					 
					
						2005-07-28 03:22:47 +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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								svoj@mysql.com 
							
						 
					 
					
						
						
							
						
						349112292f 
					 
					
						
						
							
							bug#6958  
						
						... 
						
						
						
						Fixed that negative arguments to certain integer options wrap around. 
						
						
					 
					
						2005-02-17 15:04:04 +04:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						45ce994e5d 
					 
					
						
						
							
							post-merge  
						
						
						
						
					 
					
						2004-12-31 11:52:14 +01: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						cb7061ebe4 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-05-22 02:57:27 +03:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8d52377a5c 
					 
					
						
						
							
							Some SHOW VARIABLES have been renamed:  
						
						... 
						
						
						
						collation_client  -> character_set_client
collation_results -> character_set_results
character_set     -> character_set_server
SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion 
						
						
					 
					
						2003-05-21 17:44:12 +05:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a46c0a7cac 
					 
					
						
						
							
							Portability fix for 64 bit machines  
						
						
						
						
					 
					
						2003-05-14 23:06:06 +03:00 
						 
				 
			
				
					
						
							
							
								jani@hynda.(none) 
							
						 
					 
					
						
						
							
						
						c9c5841760 
					 
					
						
						
							
							- Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342  
						
						... 
						
						
						
						- Fix for QNX: UNIX sockets available since 6.2.1 
						
						
					 
					
						2003-05-13 19:34:51 +03:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						6d5f527afd 
					 
					
						
						
							
							Variable names have been renamed:  
						
						... 
						
						
						
						client_collation -> collation_client
  result_collation -> collation_results
  connection_collation -> collation_connection 
						
						
					 
					
						2003-04-23 18:19:22 +05:00 
						 
				 
			
				
					
						
							
							
								mysql@home.(none) 
							
						 
					 
					
						
						
							
						
						bbf710b35e 
					 
					
						
						
							
							Some optimization in SET NAMES  
						
						
						
						
					 
					
						2003-04-05 18:56:15 +05:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						07c96e1ea7 
					 
					
						
						
							
							A test case for the bug fix as per PEM's reported bug  #118 .  
						
						... 
						
						
						
						Patch is already commited and approved by Sanja ..;o) 
						
						
					 
					
						2003-03-20 20:44:56 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						15f26dd560 
					 
					
						
						
							
							A test case for bug in record  #166  :  
						
						... 
						
						
						
						select @@not_a_variable closes the connection 
						
						
					 
					
						2003-03-20 19:13:45 +02:00