jimw@rama.(none) 
							
						 
					 
					
						
						
							
						
						f7e19b40f3 
					 
					
						
						
							
							Merge rama.(none):/home/jimw/my/tmp_merge  
						
						 
						
						... 
						
						
						
						into  rama.(none):/home/jimw/my/mysql-5.1-clean 
						
						
					 
					
						2006-07-28 15:51:48 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tim@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						bc89c92c37 
					 
					
						
						
							
							Bug  #6061  mysql-log-rotate script - error logging doesn't use new file  
						
						 
						
						... 
						
						
						
						- Fix mysqld_safe so that it always passes correct --log-error argument to mysqld
- A few other minor clean-ups to mysqld_safe 
						
						
					 
					
						2006-05-10 11:33:36 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igreenhoe@mysql.com 
							
						 
					 
					
						
						
							
						
						ed2432494f 
					 
					
						
						
							
							Fix for bug  #17353 .  
						
						 
						
						
						
						
					 
					
						2006-04-17 19:57:50 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						550e73cc6e 
					 
					
						
						
							
							mysql-test-run.pl:  
						
						 
						
						... 
						
						
						
						Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'
mysqld_safe.sh:
  Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861 
						
						
					 
					
						2006-03-02 22:53:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						bb34222087 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-11-01 12:15:08 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						1d9bfbf7d2 
					 
					
						
						
							
							Handle decision to use mysqld-max over mysqld within mysqld_safe  
						
						 
						
						... 
						
						
						
						even when --ledir option is specified. (Bug #13774 ) 
						
						
					 
					
						2005-10-31 11:15:44 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						80c1c6b33f 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-07-19 11:05:49 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						9f4c796922 
					 
					
						
						
							
							Fix handling of datadir by mysqld_safe to support specifying a  
						
						 
						
						... 
						
						
						
						different DATADIR via the command line or during ./configure and
still starting up mysqld_safe via a relative path. (Bug #7249 ) 
						
						
					 
					
						2005-06-24 17:14:16 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tim@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						8a77c6f741 
					 
					
						
						
							
							scripts/mysqld_safe.sh  
						
						 
						
						... 
						
						
						
						Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable. 
						
						
					 
					
						2005-05-27 12:44:06 +12:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						49ac2dac3e 
					 
					
						
						
							
							Automerge / manual check  of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).  
						
						 
						
						... 
						
						
						
						Post-merge fix will follow. 
						
						
					 
					
						2005-04-26 12:03:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						48ba5e4956 
					 
					
						
						
							
							Step 1 of the switch to support configuration with NPTL:  
						
						 
						
						... 
						
						
						
						Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'. 
						
						
					 
					
						2005-04-20 20:10:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						eaea82d3af 
					 
					
						
						
							
							Merge query_cache tests  
						
						 
						
						
						
						
					 
					
						2005-03-11 12:38:38 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						bb9d7bfc79 
					 
					
						
						
							
							Create directory for UNIX socket in mysqld_safe if it doesn't already exist.  
						
						 
						
						... 
						
						
						
						(Bug #8513 ) 
						
						
					 
					
						2005-03-02 12:19:44 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						6e9b26e8b7 
					 
					
						
						
							
							Fixed a compatibility problem.  
						
						 
						
						... 
						
						
						
						1) If my.cnf is found in datadir and basedir, give a warning and use the
   one in basedir.
2) If my.cnf is found in datadir, use it, but give a warning.
3) No warning if my.cnf is in basedir. 
						
						
					 
					
						2005-02-23 18:59:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						70f35fa6da 
					 
					
						
						
							
							Add --help to mysqld_safe. (Bug  #7931 )  
						
						 
						
						
						
						
					 
					
						2005-02-02 19:41:33 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5010be1d8b 
					 
					
						
						
							
							Merge mysql.com:/home/jwinstead2/mysql-4.1-clean  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/jwinstead2/mysql-5.0 
						
						
					 
					
						2005-01-06 21:39:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						f472cec178 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2005-01-06 19:32:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						0ed892f197 
					 
					
						
						
							
							Change mysqld_safe search for mysqld relative to the current working directory  
						
						 
						
						... 
						
						
						
						to only look for the mysqld binary (and english error strings) and assume the
datadir from that. Then, if that datadir turns out to not exist, startup will
fail. This avoids the behavior where mysqld_safe would go off and run a totally
different binary because the data directory had been moved (even when --datadir
was specified on the command line). (Bug #7249 ) 
						
						
					 
					
						2005-01-05 01:08:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						81d99da104 
					 
					
						
						
							
							Added checking for my.cnf file from environment variable MYSQL_HOME  
						
						 
						
						... 
						
						
						
						instead of DATADIR. 
						
						
					 
					
						2005-01-04 20:13:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						663396653a 
					 
					
						
						
							
							Use 'ps xaww' in mysqld_safe (on Linux) so whole command-line is searched  
						
						 
						
						... 
						
						
						
						for port and/or pid-file parameters. (Bug #5878 ) 
						
						
					 
					
						2005-01-04 01:49:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tsmith@build.mysql.com 
							
						 
					 
					
						
						
							
						
						075a887995 
					 
					
						
						
							
							mysqld_safe.sh:  
						
						 
						
						... 
						
						
						
						Fix calls to my_print_defaults.  Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option.  
  NOTE: this may make some installations behave differently, if they depend on this broken behavior. 
						
						
					 
					
						2004-11-30 22:17:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tim@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						b0510c7fd4 
					 
					
						
						
							
							Portability fixes to mysqld_safe for non-Linux systems.  Fix FIND_PROC  
						
						 
						
						... 
						
						
						
						for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself. 
						
						
					 
					
						2004-11-02 17:53:25 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						707def6fd0 
					 
					
						
						
							
							better fix for bug#5001  
						
						 
						
						
						
						
					 
					
						2004-09-07 13:48:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								patg@krsna.patg.net 
							
						 
					 
					
						
						
							
						
						e277145911 
					 
					
						
						
							
							mysqld_safe.sh:  
						
						 
						
						... 
						
						
						
						bug #5001 , added conditional if to test if port set, then only kill the processes
  for this port, not all processes (in the case of this bug where multiple servers 
  are killed.)
  The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's
  discovery that mysqld_safe would get killed. 
  In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file"
  was the case that evaluated as true, so in order to test, I had to comment that block
  out. 
						
						
					 
					
						2004-08-31 18:59:41 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						5647809350 
					 
					
						
						
							
							warn about multiple mysqld --user parameters only if their arguments differ  
						
						 
						
						
						
						
					 
					
						2004-06-10 13:56:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f10d098f7d 
					 
					
						
						
							
							Fixed http address in some scripts (Bug  #3460 )  
						
						 
						
						... 
						
						
						
						Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix)
Fixed that INTERVAL can handle big integers. (Bug #3498 )
Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473 ) 
						
						
					 
					
						2004-04-28 17:45:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						5693662fc0 
					 
					
						
						
							
							- fixed early removing of socket file when multiple instances of mysqld are  
						
						 
						
						... 
						
						
						
						started via mysqld_safe (BUG#2114) Thanks to Rodrigo Marchant for the
   suggestion 
						
						
					 
					
						2004-01-15 16:14:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2cae5989e9 
					 
					
						
						
							
							do not put --user into command line if the value comes from [mysqld] or [server] sections  
						
						 
						
						... 
						
						
						
						Bug #2163  
						
						
					 
					
						2003-12-19 23:08:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1394684e12 
					 
					
						
						
							
							make mysqld to respect socket/port options of mysqld_safe command line  
						
						 
						
						... 
						
						
						
						and [mysqld_safe] section in my.cnf, even if they are also specified
in [mysql] section. 
						
						
					 
					
						2003-09-27 18:54:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						5f8ef50b35 
					 
					
						
						
							
							Added a warning to my_print_defaults if --verbose is given  
						
						 
						
						... 
						
						
						
						and --defaults-file is a non-existing or non-regular file.
Bug#755 
						
						
					 
					
						2003-08-27 19:22:14 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						ca8831e1ad 
					 
					
						
						
							
							- removed options sort_buffer and key_buffer from calls to (my)isamchk  
						
						 
						
						... 
						
						
						
						in mysqld_safe (commented out by default), to not override any options
   defined in my.cnf (thanks to Axel Schwenke from Jobpilot.de for the
   suggestion) 
						
						
					 
					
						2003-07-15 12:50:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						8a52c2d20b 
					 
					
						
						
							
							Added option --skip-kill-mysqld to mysqld_safe. This can be useful,  
						
						 
						
						... 
						
						
						
						if one is running many mysqlds through mysqld_multi, for example.
Without this option, on Linux one mysqld_safe process may kill
other mysqlds as well, if started using the same binary and path. 
						
						
					 
					
						2003-06-14 12:29:42 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						63df5f7cb7 
					 
					
						
						
							
							- applied patch for mysqld_safe from Christian Hammers to be able to  
						
						 
						
						... 
						
						
						
						define a different niceness level in my.cnf (Bug #627 ) 
						
						
					 
					
						2003-06-12 13:52:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						7fbc28c074 
					 
					
						
						
							
							- added missing dashes to parameter "open-files-limit" in mysqld_safe  
						
						 
						
						... 
						
						
						
						(bug #264 ) 
						
						
					 
					
						2003-04-15 16:11:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						026ec1d37c 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-03-13 13:44:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f1635f64f9 
					 
					
						
						
							
							Merge with 3.23 to get fixes for --user and BACKUP TABLE  
						
						 
						
						
						
						
					 
					
						2003-03-10 12:48:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						a533db746b 
					 
					
						
						
							
							Patch for novell  
						
						 
						
						... 
						
						
						
						Reverted wrong patch for mysqld_safe.sh 
						
						
					 
					
						2003-02-16 22:50:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						381ab77b84 
					 
					
						
						
							
							Fixed a bug in mysqld_safe, when it earlier could have removed  
						
						 
						
						... 
						
						
						
						a socket from another, still living MySQL server. 
						
						
					 
					
						2003-02-12 19:53:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						3d28913740 
					 
					
						
						
							
							Only write to the error log if --log-error is specified and --console is not specified  
						
						 
						
						... 
						
						
						
						(On Windows --log-error is enabled by default) 
						
						
					 
					
						2003-01-28 20:56:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						74f478f9a5 
					 
					
						
						
							
							Merge sinisa@work.mysql.com:/home/bk/mysql-4.0  
						
						 
						
						... 
						
						
						
						into sinisa.nasamreza.org:/mnt/work/mysql-4.0 
						
						
					 
					
						2003-01-21 15:54:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f4b950df96 
					 
					
						
						
							
							Merge with 3.23  
						
						 
						
						
						
						
					 
					
						2003-01-16 20:47:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						748665e7bb 
					 
					
						
						
							
							A small fix for the type in the script  
						
						 
						
						
						
						
					 
					
						2003-01-09 15:22:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						876f3f4d30 
					 
					
						
						
							
							Fixed that NULL and 0 returns 0 instead of NULL  
						
						 
						
						... 
						
						
						
						This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL 
						
						
					 
					
						2002-11-11 15:57:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						d7a0000711 
					 
					
						
						
							
							fixed test for "root", on some installations / is mounted read-only  
						
						 
						
						
						
						
					 
					
						2002-11-08 22:45:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						5343d4c969 
					 
					
						
						
							
							Added --skip-safemalloc to mysqltest  
						
						 
						
						... 
						
						
						
						Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
Small change in EXCHANGE output
Propagate open-files-limit from mysqld_safe -> mysqld
Fixed speed bug in GROUP BY
Added quotes around database name in CREATE DATABASE db_name (for binary log) 
						
						
					 
					
						2002-10-29 22:56:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						c3bda04595 
					 
					
						
						
							
							a fix for the typo in the last push  
						
						 
						
						
						
						
					 
					
						2002-10-07 15:17:41 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						d2ef2ec9c8 
					 
					
						
						
							
							a small fix for some shells  
						
						 
						
						
						
						
					 
					
						2002-10-05 15:45:24 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						fa38c84be7 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2002-03-06 19:53:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tim@black.box 
							
						 
					 
					
						
						
							
						
						d83b557f4a 
					 
					
						
						
							
							Fix the NOHUP_NICENESS test in mysqld_safe.  
						
						 
						
						
						
						
					 
					
						2001-10-22 11:22:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@work.mysql.com 
							
						 
					 
					
						
						
							
						
						bf1f7a2837 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2001-09-02 20:13:07 +02:00