joreland@mysql.com 
							
						 
					 
					
						
						
							
						
						54cff2bc30 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-06-13 08:05:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						55f962c0cf 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-06-10 20:11:20 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						495ee34be0 
					 
					
						
						
							
							Fix problem with handling of lower_case_table_name == 2 when  
						
						 
						
						... 
						
						
						
						the case in the FROM and WHERE clauses didn't agree. (Bug #9500 ) 
						
						
					 
					
						2005-06-08 14:35:16 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								paul@frost.snake.net 
							
						 
					 
					
						
						
							
						
						52a4221188 
					 
					
						
						
							
							Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0 
						
						
					 
					
						2005-06-07 10:05:52 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								paul@frost.snake.net 
							
						 
					 
					
						
						
							
						
						85648050af 
					 
					
						
						
							
							Typo in help message.  
						
						 
						
						
						
						
					 
					
						2005-06-07 10:03:09 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ndbdev@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						723173c0f3 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-06-07 12:50:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						f2933263fb 
					 
					
						
						
							
							A fix for systems that don't have HAVE_MMAP defined.  
						
						 
						
						... 
						
						
						
						Moved some variable externs from sql_class.h to mysql_priv.h 
						
						
					 
					
						2005-06-07 11:30:09 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ndbdev@dl145b.mysql.com 
							
						 
					 
					
						
						
							
						
						2fb1fb5877 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-06-07 06:50:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						775f17667b 
					 
					
						
						
							
							Merge with 4.1  
						
						 
						
						
						
						
					 
					
						2005-06-07 00:31:53 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						29fd1f2fd9 
					 
					
						
						
							
							Move USE_PRAGMA_IMPLEMENTATION to proper place  
						
						 
						
						... 
						
						
						
						Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable 
						
						
					 
					
						2005-06-03 23:46:03 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						2dca9d5953 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1 
						
						
					 
					
						2005-06-02 10:44:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						113a99626d 
					 
					
						
						
							
							Merge of 4.1->5.0. This contained the fixes for GCC 4.0  
						
						 
						
						
						
						
					 
					
						2005-06-01 21:56:30 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						ba9b9f8993 
					 
					
						
						
							
							Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.  
						
						 
						
						
						
						
					 
					
						2005-06-01 17:34:10 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						1b029b1c06 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1 
						
						
					 
					
						2005-05-31 21:30:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						5088b28d09 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-05-31 14:37:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						063896a6e7 
					 
					
						
						
							
							Post-review fixes of BUG#9937: Crash on call to stored procedure.  
						
						 
						
						
						
						
					 
					
						2005-05-31 12:06:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						e496b24304 
					 
					
						
						
							
							Merge mysql.com:/usr/local/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/pem/work/mysql-5.0 
						
						
					 
					
						2005-05-30 11:06:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						a07d8b1951 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/bug9993  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-05-27 17:22:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						605af1e7dc 
					 
					
						
						
							
							Merge mysql.com:/usr/local/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/pem/work/mysql-5.0 
						
						
					 
					
						2005-05-27 11:28:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						59db44382b 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2 
						
						
					 
					
						2005-05-26 21:01:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						41c8f46160 
					 
					
						
						
							
							Post-review fixes: rename SHOW_DOUBLE to SHOW_DOUBLE_STATUS  
						
						 
						
						
						
						
					 
					
						2005-05-26 20:54:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						3eca4bf22e 
					 
					
						
						
							
							Fixed BUG#9937: Crash on call to stored procedure.  
						
						 
						
						... 
						
						
						
						This only showed up on two known platforms, both ia64 (one HP-UX and one Linux wich icc).
For some reason, they only get half the stack size they are supposed to have, which
makes deep SP recursion overrun the stack before check_stack_overrun() is triggered.
Also made som minor fixes in the check_stack_overrun() definition, supporting variable
margins.
No test case added, but the reason for the bug report was a failed existing test case
on these machines, which now works. 
						
						
					 
					
						2005-05-26 20:36:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						8401cd5d79 
					 
					
						
						
							
							BUG#9993 2 unexpected warnings when dropping a routine and --skip-grant-tables  
						
						 
						
						... 
						
						
						
						- Dont perform automatic privilege handling for stored procedures when server is started --skip-grant-tables
 - Renamed view_skip_grants to skip_grants and added test cases for this 
						
						
					 
					
						2005-05-26 16:44:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tulin@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						be861a7ccf 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-05-19 09:04:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tulin@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						03590c20bd 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-05-18 22:26:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a9c4379c15 
					 
					
						
						
							
							Fixed bug from last push  
						
						 
						
						
						
						
					 
					
						2005-05-18 21:12:59 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						c63ad3b549 
					 
					
						
						
							
							New file default_modify.c. Fixed a typo on mysqld.cc  
						
						 
						
						... 
						
						
						
						Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it. 
						
						
					 
					
						2005-05-18 20:10:17 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						db40af2a6f 
					 
					
						
						
							
							Fix warnings from icc  
						
						 
						
						... 
						
						
						
						Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling 
						
						
					 
					
						2005-05-18 19:00:21 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						b6179919f3 
					 
					
						
						
							
							Change Last_query_cost status variable from global to thread-local.  
						
						 
						
						
						
						
					 
					
						2005-05-18 05:39:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tulin@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						23f79bd1f2 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-05-17 10:17:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						600010e583 
					 
					
						
						
							
							Don't enable binlogs by default as this gives too many warnings  
						
						 
						
						
						
						
					 
					
						2005-05-14 19:31:34 +03: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						e76c641190 
					 
					
						
						
							
							Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1  
						
						 
						
						
						
						
					 
					
						2005-05-09 11:45:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						05cbb3962c 
					 
					
						
						
							
							Manual merge 5.0->5.1  
						
						 
						
						
						
						
					 
					
						2005-05-06 15:04:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						015cd1cd21 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2005-05-06 13:51:58 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						a9f6aab4c9 
					 
					
						
						
							
							Fixes while reviewing new code  
						
						 
						
						... 
						
						
						
						Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema 
						
						
					 
					
						2005-05-06 11:39:30 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						1f14cfcb35 
					 
					
						
						
							
							merging cp932 from 4.1  
						
						 
						
						
						
						
					 
					
						2005-05-06 12:00:25 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								holyfoot@mysql.com 
							
						 
					 
					
						
						
							
						
						556504287b 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-05-05 20:10:50 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								holyfoot@hf-ibm.(none) 
							
						 
					 
					
						
						
							
						
						2c8e9df232 
					 
					
						
						
							
							A lot of fixes to Precision math  
						
						 
						
						... 
						
						
						
						Mostly about precision/decimals of the results of the operations 
						
						
					 
					
						2005-05-05 20:06:49 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gbichot@quadita2.mysql.com 
							
						 
					 
					
						
						
							
						
						b72ae4fe57 
					 
					
						
						
							
							Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).  
						
						 
						
						... 
						
						
						
						Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
  limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
  Reason I don't propagate caller info to the binlog as planned is that on master and slave
  users may be different; even with that some caveats would remain. 
						
						
					 
					
						2005-05-05 14:20:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@mysql.com 
							
						 
					 
					
						
						
							
						
						665cbabe07 
					 
					
						
						
							
							Bug  #5843 : Server code does not check whether PID file was successfully written  
						
						 
						
						
						
						
					 
					
						2005-05-05 12:24:10 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								marko@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						64bf449bf7 
					 
					
						
						
							
							InnoDB: Disable throttling against thread thrashing by default.  
						
						 
						
						
						
						
					 
					
						2005-05-03 15:55:53 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						4f1e27ed00 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean 
						
						
					 
					
						2005-05-03 00:10:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						145ae3c6f5 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean 
						
						
					 
					
						2005-05-02 13:18:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						9c332d8d2a 
					 
					
						
						
							
							yassl changeset 2:  
						
						 
						
						... 
						
						
						
						remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
  replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95
  set $USE_MYSYS_NEW even if CXX is g++
  yassl bugfixes
  instantiate all yassl templates explicitly 
						
						
					 
					
						2005-04-30 19:48:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						ab0dbb1fc6 
					 
					
						
						
							
							ha_innodb.cc, mysqld.cc:  
						
						 
						
						... 
						
						
						
						Fix compilation error if HAVE_REPLICATION is not defined 
						
						
					 
					
						2005-04-27 13:36:58 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								heikki@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						d694d5f1c9 
					 
					
						
						
							
							Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into hundin.mysql.fi:/home/heikki/mysql-5.0 
						
						
					 
					
						2005-04-27 02:59:05 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3ca23bd918 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2005-04-26 21:09:42 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						ef5ad50ccc 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-9063  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-5.0-build 
						
						
					 
					
						2005-04-26 08:20:51 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						220a01a838 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2005-04-26 16:03:20 +03:00