jimw@rama.(none) 
							
						 
					 
					
						
						
							
						
						caf4392f71 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-4.1-maint  
						
						... 
						
						
						
						into  rama.(none):/home/jimw/my/mysql-4.1-clean 
						
						
					 
					
						2006-09-28 18:11:29 -07:00 
						 
				 
			
				
					
						
							
							
								tsmith@maint1.mysql.com 
							
						 
					 
					
						
						
							
						
						8b5f66767f 
					 
					
						
						
							
							Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx  
						
						... 
						
						
						
						into  maint1.mysql.com:/data/localhome/tsmith/bk/41 
						
						
					 
					
						2006-09-07 01:14:54 +02:00 
						 
				 
			
				
					
						
							
							
								tsmith@maint1.mysql.com 
							
						 
					 
					
						
						
							
						
						b6cd727ed1 
					 
					
						
						
							
							Bug  #21054 : myisam_stats_method ignored in my.cnf and cmdline  
						
						... 
						
						
						
						Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up 
						
						
					 
					
						2006-09-07 00:11:43 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@rama.(none) 
							
						 
					 
					
						
						
							
						
						cb6a084076 
					 
					
						
						
							
							Bug  #2717 : include/my_global.h mis-defines __attribute__  
						
						... 
						
						
						
						Fix when __attribute__() is stubbed out, add ATTRIBUTE_FORMAT() for specifying
  __attribute__((format(...))) safely, make more use of the format attribute,
  and fix some of the warnings that this turns up (plus a bonus unrelated one). 
						
						
					 
					
						2006-08-17 12:25:40 -07:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com/bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4a63a64f1e 
					 
					
						
						
							
							mysqld --collation-server=xxx --character-set-server=yyy  
						
						... 
						
						
						
						didn't work as expected: collation_server was set not to xxx,
but to the default collation of character set "yyy".
    
With different argument order it worked as expected:
mysqld --character-set-server=yyy --collation-server=yyy 
    
Fix:
initializate default_collation_name to 0
when processing --character-set-server
only if --collation-server has not been specified
in command line. 
						
						
					 
					
						2006-08-11 13:19:44 +05:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						5fc215e2e3 
					 
					
						
						
							
							Bug#21419 test case lowercase_fs_off fails on Windows  
						
						... 
						
						
						
						- Backport patch from 5.0 
						
						
					 
					
						2006-08-03 12:16:24 +02:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@mysql.com/myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						b57efe738a 
					 
					
						
						
							
							--{skip-}merge option added which allows the user to disable merge engine and  
						
						... 
						
						
						
						to avoid the potential security problem.
(see bug #15195 : Security Breach with MERGE table) 
						
						
					 
					
						2006-07-14 16:26:58 +05:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						0144b51445 
					 
					
						
						
							
							Add comment for 'kill_server' function  
						
						
						
						
					 
					
						2006-05-23 10:33:53 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						b9a59fa014 
					 
					
						
						
							
							Bug#15869  Cannot shutdown the server - it restarts  
						
						... 
						
						
						
						- A segfault occured when the function 'kill_server' called 
   'my_sigset' with signal number 0. 'my_sigset' is a macro which
   uses 'sigaction' to install the signal handler with an invalid
   signal number will on most platforms return EINVAL but yields
   a segfauilt on IRIX 6.5
 - The server crash was detected by mysqld_safe and it was restarted although
   a shutdown was requested. 
 - Semantics of kill_server(0) is not known, leaving it intact 
						
						
					 
					
						2006-05-19 13:07:24 +02:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						b915f054cf 
					 
					
						
						
							
							Fix a typo in the help message.  
						
						
						
						
					 
					
						2006-04-13 14:06:46 +04:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						518993312c 
					 
					
						
						
							
							A fix and a test case for Bug#16365 "Prepared Statements: DoS with  
						
						... 
						
						
						
						too many open statements". The patch adds a new global variable
@@max_prepared_stmt_count. This variable limits the total number
of prepared statements in the server. The default value of
@@max_prepared_stmt_count is 16382. 16382 small statements
(a select against 3 tables with GROUP, ORDER and LIMIT) consume 
100MB of RAM. Once this limit has been reached, the server will 
refuse to prepare a new statement and return ER_UNKNOWN_ERROR 
(unfortunately, we can't add new errors to 4.1 without breaking 5.0). The limit is changeable after startup
and can accept any value from 0 to 1 million. In case
the new value of the limit is less than the current
statement count, no new statements can be added, while the old
still can be used. Additionally, the current count of prepared 
statements is now available through a global read-only variable 
@@prepared_stmt_count. 
						
						
					 
					
						2006-04-07 23:37:06 +04:00 
						 
				 
			
				
					
						
							
							
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						8c6a32b997 
					 
					
						
						
							
							Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0  
						
						... 
						
						
						
						into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
						
						
					 
					
						2006-01-12 17:47:58 +02:00 
						 
				 
			
				
					
						
							
							
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						af845f6eff 
					 
					
						
						
							
							NetWare specific change to increase thread stack size.  
						
						... 
						
						
						
						Changes to Netware specific mysqld_safe.c 
						
						
					 
					
						2006-01-12 15:10:12 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						7b049bf2cd 
					 
					
						
						
							
							correct help text  
						
						
						
						
					 
					
						2005-12-23 12:38:22 +01:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						e8198e799e 
					 
					
						
						
							
							mysqld.cc:  
						
						... 
						
						
						
						Bug#14960, reverted code to make symdir work on Windows
symlink.test:
  Disabled test case on Windows 
						
						
					 
					
						2005-12-08 16:13:53 +01:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						ea3ea9ed10 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2 
						
						
					 
					
						2005-10-23 02:49:57 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						15a78334c3 
					 
					
						
						
							
							BUG#9622, stage 2, work together with fix for BUG#12232:  
						
						... 
						
						
						
						added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622). 
						
						
					 
					
						2005-10-21 06:29:17 +04:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						e284a57c88 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-13334  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-4.1-clean 
						
						
					 
					
						2005-10-18 09:45:12 -07:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						845b9fbf58 
					 
					
						
						
							
							fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);  
						
						... 
						
						
						
						because they are used by net_printf() and push_warning(), which can be called if check_connection() fails. 
						
						
					 
					
						2005-10-14 15:34:52 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						cb0d8aba46 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-8731b  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-4.1-clean 
						
						
					 
					
						2005-10-12 13:28:46 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						c8a6c2c614 
					 
					
						
						
							
							Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how  
						
						... 
						
						
						
						signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731 ) 
						
						
					 
					
						2005-10-11 09:12:12 -07:00 
						 
				 
			
				
					
						
							
							
								gluh@eagle.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8d01ea1be7 
					 
					
						
						
							
							Fix for bug#9270 multiple SSL race conditions (for 5.0 tree)  
						
						... 
						
						
						
						The fix is needed to perform locking on shared data structures
  This is modification of patch proposed by Leandro Santi
  (see http://webs.sinectis.com.ar/lesanti/misc/mysql-4.0.23a-openssl_locking.patch ) 
						
						
					 
					
						2005-10-11 16:26:00 +05:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						6caa0c849d 
					 
					
						
						
							
							Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0  
						
						... 
						
						
						
						into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
						
						
					 
					
						2005-10-04 07:51:53 +03:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						844d964f2d 
					 
					
						
						
							
							Many files:  
						
						... 
						
						
						
						Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
my_regex.h:
  Rename: regex/regex.h -> regex/my_regex.h 
						
						
					 
					
						2005-09-29 02:08:24 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						d90b988da7 
					 
					
						
						
							
							BUG#12232: Addressing docs team feedback: s/inequal/unequal/  
						
						
						
						
					 
					
						2005-09-24 01:39:50 +04:00 
						 
				 
			
				
					
						
							
							
								paul@kite-hub.kitebird.com 
							
						 
					 
					
						
						
							
						
						b83f29d56d 
					 
					
						
						
							
							mysqld.cc:  
						
						... 
						
						
						
						Fix out-of-order status variable. 
						
						
					 
					
						2005-09-23 14:14:34 -05:00 
						 
				 
			
				
					
						
							
							
								jonas@perch.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						d1ee898d34 
					 
					
						
						
							
							Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push 
						
						
					 
					
						2005-09-21 14:39:28 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						a26e1b7280 
					 
					
						
						
							
							Merge mysql.com:/home/psergey/bk-trees/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-4.1-csc6030-r3 
						
						
					 
					
						2005-09-21 02:20:55 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						f9475d1d15 
					 
					
						
						
							
							BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index  
						
						... 
						
						
						
						statistics (like 4.0 did) (patch #3 , with review #1  & #2  feedback addressed) 
						
						
					 
					
						2005-09-21 02:18:29 +04:00 
						 
				 
			
				
					
						
							
							
								jonas@perch.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						668a192ce5 
					 
					
						
						
							
							ndb - imlp. show engine ndb status;  
						
						... 
						
						
						
						that dump free list allocation per connection 
						
						
					 
					
						2005-09-19 15:35:07 +02:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						6e725adc00 
					 
					
						
						
							
							Bug#12920 - key_read_requests counter appears to re-set  
						
						... 
						
						
						
						After merge fix. 
						
						
					 
					
						2005-09-14 13:18:16 +02:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						7314307762 
					 
					
						
						
							
							Bug#12920 - key_read_requests counter appears to re-set  
						
						... 
						
						
						
						Enlarged the counter variables to ulonglong. 
						
						
					 
					
						2005-09-14 09:56:49 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						167bc61f37 
					 
					
						
						
							
							postmerge fix  
						
						
						
						
					 
					
						2005-09-06 21:18:44 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						10c0ef69e7 
					 
					
						
						
							
							support of concurent query cache resizing (BUG#12848)  
						
						
						
						
					 
					
						2005-09-06 11:16:53 +03:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						6a5f00702d 
					 
					
						
						
							
							Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/usr/home/bar/mysql-4.1.b9948 
						
						
					 
					
						2005-09-05 20:05:32 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						0eafb9572a 
					 
					
						
						
							
							mysqld.cc, mysql_priv.h, sql_parse.cc:  
						
						... 
						
						
						
						bug#9948
  changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  after review fixes 
						
						
					 
					
						2005-09-05 20:00:11 +05:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						0683c122b6 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/home/dlenev/src/mysql-4.1-bg12423 
						
						
					 
					
						2005-09-01 17:01:25 +04:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						da2af0bb6d 
					 
					
						
						
							
							Fix for bug  #12423  "Deadlock when doing FLUSH PRIVILEGES and GRANT in  
						
						... 
						
						
						
						multi-threaded environment".
To avoid deadlocks between several simultaneously run account management 
commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
commands) we should always take table and internal locks during their
execution in the same order. In other words we should first open and lock
privilege tables and only then obtain acl_cache::lock/LOCK_grant locks. 
						
						
					 
					
						2005-09-01 16:52:59 +04:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						f2ea1ac8b8 
					 
					
						
						
							
							bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob  
						
						... 
						
						
						
						sql_parse.cc:
mysqld.cc:
  Added --skip-client-character-set-handshake.
  When this option is activated, client side character set
  (which is sent in handshake) is ignored, and server side
  default-character-set value is used for character_set_client
  and character_set_results, thus reprodicing 4.0 behaviour. 
						
						
					 
					
						2005-08-31 13:03:24 +05:00 
						 
				 
			
				
					
						
							
							
								paul@frost.snake.net 
							
						 
					 
					
						
						
							
						
						351c59cb5f 
					 
					
						
						
							
							Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0  
						
						... 
						
						
						
						into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0 
						
						
					 
					
						2005-08-27 22:00:22 -05:00 
						 
				 
			
				
					
						
							
							
								paul@frost.snake.net 
							
						 
					 
					
						
						
							
						
						39e5dafb91 
					 
					
						
						
							
							Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1 
						
						
					 
					
						2005-08-27 21:52:26 -05:00 
						 
				 
			
				
					
						
							
							
								paul@frost.snake.net 
							
						 
					 
					
						
						
							
						
						848853ea5b 
					 
					
						
						
							
							mysqld.cc:  
						
						... 
						
						
						
						Reorder out-of-order status variables. 
						
						
					 
					
						2005-08-27 21:04:58 -05:00 
						 
				 
			
				
					
						
							
							
								paul@frost.snake.net 
							
						 
					 
					
						
						
							
						
						458bc88563 
					 
					
						
						
							
							mysqld.cc:  
						
						... 
						
						
						
						Reorder out-of-order status variables. 
						
						
					 
					
						2005-08-27 19:18:53 -05:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						e767eb330e 
					 
					
						
						
							
							Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0  
						
						... 
						
						
						
						into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
						
						
					 
					
						2005-08-25 12:08:26 +03:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						fe977b0cd0 
					 
					
						
						
							
							Several fixes for Netware.  
						
						
						
						
					 
					
						2005-08-24 22:03:34 +03:00 
						 
				 
			
				
					
						
							
							
								patg@radha.local 
							
						 
					 
					
						
						
							
						
						7a43a0f54d 
					 
					
						
						
							
							Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean 
						
						
					 
					
						2005-08-19 23:44:40 +02:00 
						 
				 
			
				
					
						
							
							
								patg@radha.local 
							
						 
					 
					
						
						
							
						
						d0767dfad3 
					 
					
						
						
							
							BUG  #12498  Fixed mispelling  
						
						
						
						
					 
					
						2005-08-19 07:51:22 +02:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						c6ee26ab45 
					 
					
						
						
							
							Some minor fixes for Netware. These were required after we started building  
						
						... 
						
						
						
						against a later version of libc. 
						
						
					 
					
						2005-08-18 21:26:25 +03:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						3bfa514655 
					 
					
						
						
							
							Changes for Netware. This is needed when building against newer Libc  
						
						... 
						
						
						
						than we've used before. 
						
						
					 
					
						2005-08-18 21:22:35 +03:00