msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						c3f407a07a 
					 
					
						
						
							
							Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-05-18 12:56:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						e05aa94353 
					 
					
						
						
							
							WL#2247 mysqltest: add option for sorting results  
						
						 
						
						... 
						
						
						
						- Final touchups 
						
						
					 
					
						2007-05-18 12:50:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						d5676f2feb 
					 
					
						
						
							
							WL#2247 mysqltest: add option for sorting results  
						
						 
						
						... 
						
						
						
						- Change from "query_sorted <query>" to "sorted_results" 
						
						
					 
					
						2007-05-16 17:19:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						34a784f3d0 
					 
					
						
						
							
							Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-04-10 14:29:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						60eb839e77 
					 
					
						
						
							
							Merge 192.168.0.4:mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
						
						
					 
					
						2007-04-10 13:51:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@shellback.(none) 
							
						 
					 
					
						
						
							
						
						2df8524391 
					 
					
						
						
							
							Add "query_sorted" command to mysqltest  
						
						 
						
						... 
						
						
						
						Usage:
  query_sorted <query>; 
						
						
					 
					
						2007-04-05 20:12:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						3b1fc84a5e 
					 
					
						
						
							
							Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-04-04 15:17:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						19801cbfdc 
					 
					
						
						
							
							Add expansion of $variables in "let from query",  
						
						 
						
						... 
						
						
						
						"if with query" and "while with query" 
						
						
					 
					
						2007-04-04 15:09:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						f5778fc73e 
					 
					
						
						
							
							Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-03-01 18:12:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com/narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						26aa385bc5 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2007-02-21 14:07:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						dd74beb6be 
					 
					
						
						
							
							Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-02-20 18:21:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						d6584a920b 
					 
					
						
						
							
							Add "diff_files" command to mysqltest  
						
						 
						
						
						
						
					 
					
						2007-02-20 18:20:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						b540ae533d 
					 
					
						
						
							
							Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-02-19 18:24:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						d2fe11cb56 
					 
					
						
						
							
							Commment out two test's thats just confusing for cmd.exe  
						
						 
						
						
						
						
					 
					
						2007-02-19 18:23:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						420bf2a398 
					 
					
						
						
							
							Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-02-19 18:20:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						cb84744145 
					 
					
						
						
							
							Add cat_file command to mysqltest  
						
						 
						
						
						
						
					 
					
						2007-02-19 18:19:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						91967e5550 
					 
					
						
						
							
							Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint  
						
						 
						
						... 
						
						
						
						into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2007-02-19 16:40:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						d2c02cd10d 
					 
					
						
						
							
							Add "append_file" command to mysqltest  
						
						 
						
						
						
						
					 
					
						2007-02-19 16:39:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.blaudden 
							
						 
					 
					
						
						
							
						
						478bb9e27c 
					 
					
						
						
							
							Update for running with cmd.exe directly  
						
						 
						
						
						
						
					 
					
						2007-02-19 12:03:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com/narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a04157fbb3 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2007-01-22 14:04:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						3b0caab561 
					 
					
						
						
							
							Add test's from Matthias for assigning one variable from another using let  
						
						 
						
						
						
						
					 
					
						2007-01-19 15:43:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@pilot.mysql.com 
							
						 
					 
					
						
						
							
						
						2e744d5644 
					 
					
						
						
							
							Bug  #23125  [patch] trigger test fails when run as root  
						
						 
						
						... 
						
						
						
						- Skip tests using chmod when running as root 
						
						
					 
					
						2006-12-22 00:38:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com/narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a6481aa4c7 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						 
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2006-12-15 01:01:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com/narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						88dd873de0 
					 
					
						
						
							
							Fixed compiler warnings detected by option -Wshadow and -Wunused:  
						
						 
						
						... 
						
						
						
						- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments
Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c
I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes 
						
						
					 
					
						2006-12-15 00:51:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						a743e17d8c 
					 
					
						
						
							
							Add "chmod" command to mysqltest  
						
						 
						
						
						
						
					 
					
						2006-11-30 10:54:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						9a5b4a1151 
					 
					
						
						
							
							Add command "exit" to mysqltest, it will stop processing any more  
						
						 
						
						... 
						
						
						
						commands and go directly to result file processing 
						
						
					 
					
						2006-10-19 13:34:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						6e405f5888 
					 
					
						
						
							
							Improve "check_eol_junk" to detect junk although there are multi line comments in the way.  
						
						 
						
						... 
						
						
						
						I.e take advantage of the fact that a # comment is always terminated by a new line 
Add tests for the above 
						
						
					 
					
						2006-10-05 12:25:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@shellback.(none) 
							
						 
					 
					
						
						
							
						
						2cea0e6b13 
					 
					
						
						
							
							Update mysqltest to latest version  
						
						 
						
						... 
						
						
						
						- ie. backport from 5.1
 - also update testcase error dected by new version 
						
						
					 
					
						2006-10-03 15:33:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								holyfoot@deer.(none) 
							
						 
					 
					
						
						
							
						
						be9f623012 
					 
					
						
						
							
							bug  #15442  (mysqltest.test doesn't work with the embedded server)  
						
						 
						
						
						
						
					 
					
						2006-04-11 15:01:21 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								paul@snake-hub.snake.net 
							
						 
					 
					
						
						
							
						
						7f7f5969c0 
					 
					
						
						
							
							mysqltest.test:  
						
						 
						
						... 
						
						
						
						Add real_sleep tests. 
						
						
					 
					
						2006-02-28 17:54:11 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						523d2aad94 
					 
					
						
						
							
							BUG#12959 mysqltest crashes if testcase passed with -x option  
						
						 
						
						... 
						
						
						
						- Enable testcases after help from Serg 
						
						
					 
					
						2005-09-20 14:11:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						cb3d610148 
					 
					
						
						
							
							BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"  
						
						 
						
						... 
						
						
						
						- Improved solution 
						
						
					 
					
						2005-09-07 16:39:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						5c8d457ec8 
					 
					
						
						
							
							Backport fixes for mysqltest.test from 5.0  
						
						 
						
						
						
						
					 
					
						2005-09-06 22:03:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						4cfd08d1ab 
					 
					
						
						
							
							BUG#12959 mysqltest crashes if testcase passed with -x option  
						
						 
						
						... 
						
						
						
						- Update test cases 
						
						
					 
					
						2005-09-06 09:40:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						466ea56376 
					 
					
						
						
							
							BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"  
						
						 
						
						
						
						
					 
					
						2005-09-05 22:40:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						72228ea825 
					 
					
						
						
							
							Bug#12959  mysqltest crashes if testcase passed with -x option  
						
						 
						
						
						
						
					 
					
						2005-09-05 16:50:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						78f32604ac 
					 
					
						
						
							
							mysqltest.test: Remove output from shells in result file  
						
						 
						
						
						
						
					 
					
						2005-09-02 11:14:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						28f529d91f 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1  
						
						 
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316 
						
						
					 
					
						2005-09-01 17:21:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						ced32517c7 
					 
					
						
						
							
							Bug  #3131   	mysqltest fails on $2=$1 assignment in test  
						
						 
						
						
						
						
					 
					
						2005-09-01 10:53:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						906f7c4481 
					 
					
						
						
							
							Bug  #12471   	mysqltest, --error within loop affects wrong statement  
						
						 
						
						... 
						
						
						
						- Move clearing of expected errors 
						
						
					 
					
						2005-09-01 09:34:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						d692f0c045 
					 
					
						
						
							
							Remove syntax !$<err_no> to set an expected error code  
						
						 
						
						... 
						
						
						
						Use !<err_no> instead 
						
						
					 
					
						2005-08-31 18:10:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						2fc6ef3a40 
					 
					
						
						
							
							BUG#11316: mysqltest, problems when assigning value with '#' to $variable  
						
						 
						
						... 
						
						
						
						- Add stricter checking of syntax in mysqltest 
						
						
					 
					
						2005-08-31 17:16:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						9ed35f83fa 
					 
					
						
						
							
							BUG#10267 mysqltest, wrong number of loops when a script is sourced within a loop  
						
						 
						
						
						
						
					 
					
						2005-08-16 17:10:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3c12d0ae54 
					 
					
						
						
							
							Added end marker for tests to make future merges easier  
						
						 
						
						
						
						
					 
					
						2005-07-28 03:22:47 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						447a119407 
					 
					
						
						
							
							BUG#11316 mysqltest, problems when assigning value with '#' to $variable  
						
						 
						
						... 
						
						
						
						- Fixed problem, only detect comment if the # is on start of line AND starting line of the current command.
 - Wrote tests for most of the mysqltest commands, added stricter checking of correct syntax. 
						
						
					 
					
						2005-07-15 17:51:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						2185f1a56c 
					 
					
						
						
							
							Remove usage of !$ from mysql-tests  
						
						 
						
						... 
						
						
						
						Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test 
						
						
					 
					
						2004-11-02 20:13:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mleich@mysql.com 
							
						 
					 
					
						
						
							
						
						86143bc832 
					 
					
						
						
							
							These modifications are the result of  
						
						 
						
						... 
						
						
						
						WL#2067 add features to mysqltest: "disable_error_abort" + "$mysql_errno"
$mysql_errno is a new builtin variable of mysqltest and contains the
return code of the last command send to the server.
"--disable_abort_on_error" switches the abort of mysqltest
after "unmasked" failing statements off.
"--enable_abort_on_error" switches the abort of mysqltest
after "unmasked" failing statements on. (default)
"Maskings" are
    !$<error number>  and  --error <error number>
in the line before the statement to be checked.
The benefit of the option "--disable_abort_on_error" is that
- all statements after the failing statement are executed
- a r/<test>.reject will be produced
- it is possible to write test cases, which perform
  code sequences depending on the return code of a single
  statement 
						
						
					 
					
						2004-10-29 14:51:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						7a640b44dd 
					 
					
						
						
							
							mysqltest.c, mysqltest.result, mysqltest.test:  
						
						 
						
						... 
						
						
						
						Added SQLSTATE matching support to test engine
mysqltest.result, mysqltest.test:
  new file 
						
						
					 
					
						2004-10-22 05:56:27 +02:00