brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						274c3826a8 
					 
					
						
						
							
							Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into zim.(none):/home/brian/mysql/mysql-4.1 
						
						
					 
					
						2005-03-25 12:34:07 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						70abf0a046 
					 
					
						
						
							
							Allow inserting of extra HKSCS and cp950 characters into a Big5 column.  
						
						 
						
						
						
						
					 
					
						2005-03-25 16:08:54 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						6e2caeb0ce 
					 
					
						
						
							
							Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into zim.(none):/home/brian/mysql/mysql-4.1 
						
						
					 
					
						2005-03-24 16:08:48 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						e65b96693c 
					 
					
						
						
							
							Collection of changes per Bar and Serg.  
						
						 
						
						
						
						
					 
					
						2005-03-24 16:07:56 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						eaa057e97a 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-4.1 
						
						
					 
					
						2005-03-24 20:17:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						56b931f818 
					 
					
						
						
							
							Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/home/bar/mysql-4.1 
						
						
					 
					
						2005-03-24 18:11:35 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						29ffcad226 
					 
					
						
						
							
							Fixed that LEFT OUTER JOIN was replaced with a regulat join  
						
						 
						
						... 
						
						
						
						in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables(). 
						
						
					 
					
						2005-03-24 18:10:46 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						ccea1af2ae 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/bug9303 
						
						
					 
					
						2005-03-24 14:26:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						bf2f6ff2d4 
					 
					
						
						
							
							BUG#9303 blob field with specified length < 256 does not create tinyblob  
						
						 
						
						
						
						
					 
					
						2005-03-24 13:48:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						c4a698ea3e 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-4.1 
						
						
					 
					
						2005-03-24 12:21:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						639c58bff7 
					 
					
						
						
							
							mysql-test/r/ps_6bdb.result  
						
						 
						
						... 
						
						
						
						followup - results fixed 
						
						
					 
					
						2005-03-24 10:28:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						091f069671 
					 
					
						
						
							
							Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-4.1 
						
						
					 
					
						2005-03-23 21:10:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						f21f8f983f 
					 
					
						
						
							
							client/mysqltest.c  
						
						 
						
						... 
						
						
						
						corrected number of fields for --enable_metadata
sql/sql_union.cc
    fixed a apparent typo in assert 
						
						
					 
					
						2005-03-23 20:38:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gbichot@quadita2.mysql.com 
							
						 
					 
					
						
						
							
						
						bd74a139dc 
					 
					
						
						
							
							Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita 
						
						
					 
					
						2005-03-23 19:50:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gbichot@quadita2.mysql.com 
							
						 
					 
					
						
						
							
						
						19499229ed 
					 
					
						
						
							
							"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":  
						
						 
						
						... 
						
						
						
						s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared 
						
						
					 
					
						2005-03-23 19:19:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								paul@kite-hub.kitebird.com 
							
						 
					 
					
						
						
							
						
						555815734e 
					 
					
						
						
							
							README:  
						
						 
						
						... 
						
						
						
						Fix typo. 
						
						
					 
					
						2005-03-23 10:45:57 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4554b1f263 
					 
					
						
						
							
							fixed union types merging and table related metadata (BUG#8824)  
						
						 
						
						
						
						
					 
					
						2005-03-23 08:36:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								brian@zim.(none) 
							
						 
					 
					
						
						
							
						
						cfcedd85cd 
					 
					
						
						
							
							Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request.  With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.  
						
						 
						
						
						
						
					 
					
						2005-03-22 16:10:39 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						7603a84e24 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-4.1 
						
						
					 
					
						2005-03-22 16:16:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						2a53e9d9a6 
					 
					
						
						
							
							Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build  
						
						 
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
						
						
					 
					
						2005-03-22 15:57:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						f3d284c8bc 
					 
					
						
						
							
							mysql-test-run.sh, mysql-test-run.pl:  
						
						 
						
						... 
						
						
						
						InnoDB needs longer start time for second slave on slow hosts 
						
						
					 
					
						2005-03-22 15:12:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						e1e4a08695 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/bug9072  
						
						 
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-4.1 
						
						
					 
					
						2005-03-22 14:29:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						61ef715e35 
					 
					
						
						
							
							Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build  
						
						 
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
						
						
					 
					
						2005-03-21 17:46:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						c3fa95d467 
					 
					
						
						
							
							mtr_report.pl:  
						
						 
						
						... 
						
						
						
						Made --timer work
mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log 
						
						
					 
					
						2005-03-21 16:01:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						a5bb4810ff 
					 
					
						
						
							
							BUG#9072 'Max_error_count' system variable cannot be set to zero  
						
						 
						
						... 
						
						
						
						- Chaned min value in mysqld.cc
 - Added testcase to warnings.test 
						
						
					 
					
						2005-03-21 11:07:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						6f5fbaad59 
					 
					
						
						
							
							olap.test:  
						
						 
						
						... 
						
						
						
						Added a test case for bug #8617 .
sql_select.cc:
  Fixed bug #8617 .
  Queries with ROLLUP and LIMIT n returned more than n rows
  if SQL_CALC_FOUND_ROWS was used. 
						
						
					 
					
						2005-03-17 20:18:19 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						261105a007 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-03-17 10:59:25 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						a773916238 
					 
					
						
						
							
							A fix (bug  #8942 : SUBSTRING_INDEX in UPDATE causes internal loop).  
						
						 
						
						
						
						
					 
					
						2005-03-17 10:24:50 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						3103b4cae5 
					 
					
						
						
							
							Merge rurik.mysql.com:/home/igor/mysql-4.1  
						
						 
						
						... 
						
						
						
						into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
						
						
					 
					
						2005-03-16 17:50:03 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						45ba13889d 
					 
					
						
						
							
							olap.result, olap.test:  
						
						 
						
						... 
						
						
						
						Added a test for bug #8615 .
sql_select.cc:
  Fixed bug #8615 .
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616. 
						
						
					 
					
						2005-03-16 15:55:04 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						80d9cafa8f 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 
						
						
					 
					
						2005-03-16 17:06:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a085653331 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2005-03-16 15:44:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						a7b877df78 
					 
					
						
						
							
							Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()  
						
						 
						
						... 
						
						
						
						not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for 
debugging purposes. 
						
						
					 
					
						2005-03-16 17:44:29 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						41487d0b4e 
					 
					
						
						
							
							Fix for bug#8656: Crash with group_concat on alias in outer table  
						
						 
						
						... 
						
						
						
						fixed result_field support of Item_ref 
						
						
					 
					
						2005-03-16 16:44:28 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						265270b970 
					 
					
						
						
							
							Fix to get --skip-ndb to work  
						
						 
						
						
						
						
					 
					
						2005-03-16 15:32:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4c3e8b078c 
					 
					
						
						
							
							Fix for bug  #7100 : relay_log_space_max missing from SHOW VARIABLES  
						
						 
						
						
						
						
					 
					
						2005-03-16 15:57:57 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						ce6c390c39 
					 
					
						
						
							
							olap.result, olap.test:  
						
						 
						
						... 
						
						
						
						Added a test case for bug #8616 .
item.h:
  Fixed bug #8616 .
  Added class Item_null_result used in rollup processing.
sql_select.h, sql_select.cc:
  Fixed bug #8616 .
  Added JOIN::rollup_write_data to cover rollup queries
  with DISTINCT. Modified other rollup methods. 
						
						
					 
					
						2005-03-15 22:50:54 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						fde941e5b4 
					 
					
						
						
							
							Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way  
						
						 
						
						
						
						
					 
					
						2005-03-16 01:15:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						c6c887b990 
					 
					
						
						
							
							# Bug#8785 Problem with nested concats and  
						
						 
						
						... 
						
						
						
						character set conversion of a string constant. 
						
						
					 
					
						2005-03-15 17:15:47 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						ec775b65f5 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/usr/home/ram/work/4.1.b8799 
						
						
					 
					
						2005-03-15 14:13:44 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						46613bafbe 
					 
					
						
						
							
							A fix (bug  #8489 : Strange auto_increment behaviour with HEAP table).  
						
						 
						
						
						
						
					 
					
						2005-03-15 13:32:12 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						e7e2a8c8eb 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-4.1-bug8510 
						
						
					 
					
						2005-03-15 04:09:41 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						18343b9454 
					 
					
						
						
							
							correct not_null_tables() for XOR and AND  
						
						 
						
						... 
						
						
						
						correct top_level_item for XOR 
						
						
					 
					
						2005-03-13 16:34:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						a90d2bd97c 
					 
					
						
						
							
							join_outer.result, join_outer.test:  
						
						 
						
						... 
						
						
						
						Added a test case for bug #9017 .
item_cmpfunc.h:
  A wrong not_null_tables method for Item_cond_xor
  caused a conversion of a left join into an inner join
  that was not valid. 
						
						
					 
					
						2005-03-12 23:31:52 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						50f9fc3368 
					 
					
						
						
							
							Merge test and results  
						
						 
						
						
						
						
					 
					
						2005-03-11 11:07:32 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						24716cba44 
					 
					
						
						
							
							Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/M41/mysql-4.1 
						
						
					 
					
						2005-03-11 11:32:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						31eb1c89ee 
					 
					
						
						
							
							Keep the Perl version of 'mysql-test-run' in sync with the shell script.  
						
						 
						
						
						
						
					 
					
						2005-03-11 11:08:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						763039a17b 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2005-03-11 02:23:16 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						5d865045c9 
					 
					
						
						
							
							Fix for BUG#8711: "<=>" may have true value for NULL arguments, so make  
						
						 
						
						... 
						
						
						
						Item_func_equal::not_null_tables() always return 0. 
						
						
					 
					
						2005-03-11 02:17:03 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						2d0ecfa7c9 
					 
					
						
						
							
							Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1  
						
						 
						
						
						
						
					 
					
						2005-03-10 20:31:05 +01:00