tsmith@quadxeon.mysql.com 
							
						 
					 
					
						
						
							
						
						4b93804592 
					 
					
						
						
							
							Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51  
						
						... 
						
						
						
						into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51 
						
						
					 
					
						2007-06-05 17:51:30 +02:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.(none) 
							
						 
					 
					
						
						
							
						
						6044940b25 
					 
					
						
						
							
							Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime  
						
						... 
						
						
						
						into  bodhi.(none):/opt/local/work/mysql-5.1-runtime 
						
						
					 
					
						2007-06-01 20:06:13 +04:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.(none) 
							
						 
					 
					
						
						
							
						
						b9a3431048 
					 
					
						
						
							
							Fix more mysqltest warnings.  
						
						
						
						
					 
					
						2007-06-01 20:05:34 +04:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.(none) 
							
						 
					 
					
						
						
							
						
						4688ace2a6 
					 
					
						
						
							
							Fix a typo in the test case.  
						
						
						
						
					 
					
						2007-06-01 18:04:25 +04:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.(none) 
							
						 
					 
					
						
						
							
						
						f1336a5809 
					 
					
						
						
							
							Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime  
						
						... 
						
						
						
						into  bodhi.(none):/opt/local/work/mysql-5.1-runtime 
						
						
					 
					
						2007-06-01 17:50:24 +04:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.(none) 
							
						 
					 
					
						
						
							
						
						d97db648a0 
					 
					
						
						
							
							Fix some mysqltest warnings.  
						
						
						
						
					 
					
						2007-06-01 17:49:01 +04:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						7c15ac32b0 
					 
					
						
						
							
							Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint  
						
						... 
						
						
						
						into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint 
						
						
					 
					
						2007-06-01 15:43:47 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						583a126660 
					 
					
						
						
							
							Merge pilot.(none):/data/msvensson/mysql/bug28373/my50-bug28373  
						
						... 
						
						
						
						into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-06-01 15:43:04 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						146e087186 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0-maint  
						
						... 
						
						
						
						into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-06-01 14:53:58 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						721d25f8ab 
					 
					
						
						
							
							Merge pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497  
						
						... 
						
						
						
						into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint 
						
						
					 
					
						2007-06-01 14:49:21 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						8ed65b97e1 
					 
					
						
						
							
							Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497  
						
						... 
						
						
						
						into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-06-01 14:35:47 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						aede6302af 
					 
					
						
						
							
							Fiux syntax errors in grant.test, connect command with both -- and ;  
						
						... 
						
						
						
						only one of those is allowed 
						
						
					 
					
						2007-06-01 14:12:16 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						1b6d413a2f 
					 
					
						
						
							
							Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497  
						
						... 
						
						
						
						into  pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497 
						
						
					 
					
						2007-06-01 13:50:59 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						fd1c544384 
					 
					
						
						
							
							Add missing semicolon after connect command  
						
						
						
						
					 
					
						2007-06-01 13:39:54 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						62f71f5d7a 
					 
					
						
						
							
							Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497  
						
						... 
						
						
						
						into  pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497 
						
						
					 
					
						2007-06-01 12:38:54 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						91170035d9 
					 
					
						
						
							
							Turn query_logging back on to avoid sideeffects in folloing test section  
						
						
						
						
					 
					
						2007-06-01 12:38:41 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						d43153f274 
					 
					
						
						
							
							Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_value  
						
						... 
						
						
						
						into  pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497 
						
						
					 
					
						2007-06-01 12:04:05 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						09c5c03cb2 
					 
					
						
						
							
							Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test failures  
						
						... 
						
						
						
						- Add funtion "query_get_value to allow reading a fields value
   into a $variable 
						
						
					 
					
						2007-06-01 12:01:42 +02:00 
						 
				 
			
				
					
						
							
							
								kostja@bodhi.(none) 
							
						 
					 
					
						
						
							
						
						16633169e4 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.1  
						
						... 
						
						
						
						into  bodhi.(none):/opt/local/work/mysql-5.1-runtime 
						
						
					 
					
						2007-06-01 12:12:06 +04:00 
						 
				 
			
				
					
						
							
							
								jani@a88-113-38-195.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						2c8f4f9791 
					 
					
						
						
							
							Added casts to avoid compiler warnings and fixed a wrong type.  
						
						... 
						
						
						
						---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning. 
						
						
					 
					
						2007-05-31 17:45:22 +03:00 
						 
				 
			
				
					
						
							
							
								msvensson@pilot.(none) 
							
						 
					 
					
						
						
							
						
						42deaca611 
					 
					
						
						
							
							Bug#28373 mysqltest test case fails with binlog disabled  
						
						... 
						
						
						
						- Update tests to be independent how the mysqld was started 
						
						
					 
					
						2007-05-31 15:58:22 +02:00 
						 
				 
			
				
					
						
							
							
								kaa@polly.local 
							
						 
					 
					
						
						
							
						
						ca25403ca1 
					 
					
						
						
							
							Merge polly.local:/home/kaa/src/maint/bug27643/my51-bug27643  
						
						... 
						
						
						
						into  polly.local:/home/kaa/src/maint/mysql-5.1-maint 
						
						
					 
					
						2007-05-31 16:07:17 +04:00 
						 
				 
			
				
					
						
							
							
								kaa@polly.local 
							
						 
					 
					
						
						
							
						
						7d2d483615 
					 
					
						
						
							
							Corrected the error codes and messages for 5.1. This is to fix PB failures introduced by the patch for bug  #27643 .  
						
						
						
						
					 
					
						2007-05-31 16:04:58 +04:00 
						 
				 
			
				
					
						
							
							
								kaa@polly.local 
							
						 
					 
					
						
						
							
						
						1239481b13 
					 
					
						
						
							
							Merge polly.local:/home/kaa/src/maint/bug27643/my51-bug27643  
						
						... 
						
						
						
						into  polly.local:/home/kaa/src/maint/mysql-5.1-maint 
						
						
					 
					
						2007-05-31 15:05:11 +04:00 
						 
				 
			
				
					
						
							
							
								kaa@polly.local 
							
						 
					 
					
						
						
							
						
						054da00167 
					 
					
						
						
							
							Merge polly.local:/home/kaa/src/maint/bug27643/my50-bug27643  
						
						... 
						
						
						
						into  polly.local:/home/kaa/src/maint/mysql-5.0-maint 
						
						
					 
					
						2007-05-31 15:01:49 +04:00 
						 
				 
			
				
					
						
							
							
								kaa@polly.local 
							
						 
					 
					
						
						
							
						
						16f7290359 
					 
					
						
						
							
							Merge polly.local:/home/kaa/src/maint/bug27643/my50-bug27643  
						
						... 
						
						
						
						into  polly.local:/home/kaa/src/maint/bug27643/my51-bug27643 
						
						
					 
					
						2007-05-31 14:58:22 +04:00 
						 
				 
			
				
					
						
							
							
								kaa@polly.local 
							
						 
					 
					
						
						
							
						
						d435b3ed74 
					 
					
						
						
							
							Fix for bug  #27643  "query failed : 1114 (The table '' is full)  
						
						... 
						
						
						
						Problem:
HASH indexes on VARCHAR columns with binary collations did not ignore trailing spaces from strings before comparisons. This could result in duplicate records being successfully inserted into a MEMORY table with unique key constraints.
As a direct consequence of the above, internal MEMORY tables used for GROUP BY calculation in testcases for bug #27643  contained duplicate rows which resulted in duplicate key errors when converting those temporary tables to MyISAM. Additionally, that error was incorrectly converted to the 'table is full' error.
Solution:
- ignore trailing spaces in VARCHAR fields with binary collations when calculating hashes.
- return a proper error from create_myisam_from_heap() when conversion fails. 
						
						
					 
					
						2007-05-31 14:54:44 +04:00 
						 
				 
			
				
					
						
							
							
								lars/lthalmann@mysql.com/dl145j.mysql.com 
							
						 
					 
					
						
						
							
						
						685293b985 
					 
					
						
						
							
							Disabled due to valgrind failure (talked to Tomas)  
						
						
						
						
					 
					
						2007-05-31 10:34:22 +02:00 
						 
				 
			
				
					
						
							
							
								lars/lthalmann@dl145j.mysql.com 
							
						 
					 
					
						
						
							
						
						30179dd8c0 
					 
					
						
						
							
							Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl  
						
						... 
						
						
						
						into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl 
						
						
					 
					
						2007-05-31 10:27:53 +02:00 
						 
				 
			
				
					
						
							
							
								lars/lthalmann@dl145j.mysql.com 
							
						 
					 
					
						
						
							
						
						73ca08a481 
					 
					
						
						
							
							Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime  
						
						... 
						
						
						
						into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl 
						
						
					 
					
						2007-05-31 10:23:37 +02:00 
						 
				 
			
				
					
						
							
							
								lars/lthalmann@dl145h.mysql.com 
							
						 
					 
					
						
						
							
						
						4e90009904 
					 
					
						
						
							
							Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime  
						
						... 
						
						
						
						into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl 
						
						
					 
					
						2007-05-31 10:20:58 +02:00 
						 
				 
			
				
					
						
							
							
								tsmith@quadxeon.mysql.com 
							
						 
					 
					
						
						
							
						
						91c484339c 
					 
					
						
						
							
							Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51  
						
						... 
						
						
						
						into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51 
						
						
					 
					
						2007-05-30 23:48:20 +02:00 
						 
				 
			
				
					
						
							
							
								tsmith@quadxeon.mysql.com 
							
						 
					 
					
						
						
							
						
						64f582396b 
					 
					
						
						
							
							Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50  
						
						... 
						
						
						
						into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
						
						
					 
					
						2007-05-30 23:46:21 +02:00 
						 
				 
			
				
					
						
							
							
								aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi 
							
						 
					 
					
						
						
							
						
						4835204dcc 
					 
					
						
						
							
							Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl  
						
						... 
						
						
						
						into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0 
						
						
					 
					
						2007-05-30 22:33:54 +03:00 
						 
				 
			
				
					
						
							
							
								aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi 
							
						 
					 
					
						
						
							
						
						95b1be9eb1 
					 
					
						
						
							
							bug#22725  
						
						... 
						
						
						
						refining the test because of Bug #28786  'reset master' does not reset binlogging on embeded server 
						
						
					 
					
						2007-05-30 22:29:15 +03:00 
						 
				 
			
				
					
						
							
							
								lars/lthalmann@mysql.com/dl145k.mysql.com 
							
						 
					 
					
						
						
							
						
						1ec47e4ef8 
					 
					
						
						
							
							Changed to vertical output for rpl_row_until.test  
						
						
						
						
					 
					
						2007-05-30 17:00:48 +02:00 
						 
				 
			
				
					
						
							
							
								lars/lthalmann@dl145k.mysql.com 
							
						 
					 
					
						
						
							
						
						5816dfe330 
					 
					
						
						
							
							Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl  
						
						... 
						
						
						
						into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl 
						
						
					 
					
						2007-05-30 15:58:48 +02:00 
						 
				 
			
				
					
						
							
							
								lars/lthalmann@mysql.com/dl145k.mysql.com 
							
						 
					 
					
						
						
							
						
						ac1d6a7f61 
					 
					
						
						
							
							Masking out error that is not generated by the test (rpl_ndb_basic.test) itself  
						
						
						
						
					 
					
						2007-05-30 15:56:05 +02:00 
						 
				 
			
				
					
						
							
							
								aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi 
							
						 
					 
					
						
						
							
						
						e87959a23a 
					 
					
						
						
							
							bug#22725  
						
						... 
						
						
						
						the test is not supposed for row format. the include-guard is set. 
						
						
					 
					
						2007-05-30 16:14:55 +03:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@ramil.myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						b0692ac99c 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint  
						
						... 
						
						
						
						into  mysql.com:/home/ram/work/b28436/b28436.5.1 
						
						
					 
					
						2007-05-30 17:13:59 +05:00 
						 
				 
			
				
					
						
							
							
								ramil/ram@mysql.com/ramil.myoffice.izhnet.ru 
							
						 
					 
					
						
						
							
						
						c98fa25956 
					 
					
						
						
							
							Fix for bug  #28436 : Incorrect position in SHOW BINLOG EVENTS causes server coredump  
						
						... 
						
						
						
						Problem: there is an ASSERT() in the Log_event::read_log_event() checking the integrity 
of the event's data that may fail.
Fix: move the assert's condition to an explicit check. 
						
						
					 
					
						2007-05-30 15:23:47 +05:00 
						 
				 
			
				
					
						
							
							
								lars/lthalmann@mysql.com/dl145k.mysql.com 
							
						 
					 
					
						
						
							
						
						a6cf35bb78 
					 
					
						
						
							
							Added extra parenthesis to remove compiler warning  
						
						... 
						
						
						
						Fixed test case rpl_incident.test (synchronize drop table, masked IO thread behaviour) 
						
						
					 
					
						2007-05-30 11:55:56 +02:00 
						 
				 
			
				
					
						
							
							
								aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi 
							
						 
					 
					
						
						
							
						
						03638e3aa3 
					 
					
						
						
							
							bug#22725  
						
						... 
						
						
						
						merge 5.0 with 5.1 
						
						
					 
					
						2007-05-30 11:18:55 +03:00 
						 
				 
			
				
					
						
							
							
								anozdrin/alik@ibm. 
							
						 
					 
					
						
						
							
						
						072ff4e3e0 
					 
					
						
						
							
							Disable IM tests.  
						
						
						
						
					 
					
						2007-05-30 12:06:07 +04:00 
						 
				 
			
				
					
						
							
							
								aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi 
							
						 
					 
					
						
						
							
						
						54772da05e 
					 
					
						
						
							
							Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0  
						
						... 
						
						
						
						into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0 
						
						
					 
					
						2007-05-30 10:59:54 +03:00 
						 
				 
			
				
					
						
							
							
								aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi 
							
						 
					 
					
						
						
							
						
						6c3921eb9a 
					 
					
						
						
							
							bug#22725  
						
						... 
						
						
						
						test comments correction 
						
						
					 
					
						2007-05-30 10:56:18 +03:00 
						 
				 
			
				
					
						
							
							
								anozdrin/alik@ibm. 
							
						 
					 
					
						
						
							
						
						c0b3242ea5 
					 
					
						
						
							
							Disable IM-tests.  
						
						
						
						
					 
					
						2007-05-30 11:53:50 +04:00 
						 
				 
			
				
					
						
							
							
								aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi 
							
						 
					 
					
						
						
							
						
						6620493d19 
					 
					
						
						
							
							Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0  
						
						... 
						
						
						
						into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0 
						
						
					 
					
						2007-05-30 10:27:05 +03:00 
						 
				 
			
				
					
						
							
							
								aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi 
							
						 
					 
					
						
						
							
						
						508e17fd93 
					 
					
						
						
							
							bug#22725  
						
						... 
						
						
						
						combining the final result variable in such way that either option of the test execution
will yield zero. 
						
						
					 
					
						2007-05-30 00:22:24 +03:00 
						 
				 
			
				
					
						
							
							
								aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi 
							
						 
					 
					
						
						
							
						
						2e60009cde 
					 
					
						
						
							
							bug#22725  
						
						... 
						
						
						
						tests refining, see binlog_killed.test file for details 
						
						
					 
					
						2007-05-29 23:16:50 +03:00