sasha@asksasha.com 
							
						 
					 
					
						
						
							
						
						9a7690483a 
					 
					
						
						
							
							post-merge fix  
						
						
						
						
					 
					
						2006-01-31 05:07:48 -07:00 
						 
				 
			
				
					
						
							
							
								sasha@asksasha.com 
							
						 
					 
					
						
						
							
						
						144490850a 
					 
					
						
						
							
							Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.1-new  
						
						... 
						
						
						
						into  asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new 
						
						
					 
					
						2006-01-30 20:58:17 -07:00 
						 
				 
			
				
					
						
							
							
								sasha@asksasha.com 
							
						 
					 
					
						
						
							
						
						fdefc7e03d 
					 
					
						
						
							
							#WL3026 - replace_regex in mysqltest  
						
						
						
						
					 
					
						2006-01-30 20:35:33 -07:00 
						 
				 
			
				
					
						
							
							
								sasha@asksasha.com 
							
						 
					 
					
						
						
							
						
						aa234851f0 
					 
					
						
						
							
							patch for replace_regex in mysqltest  
						
						
						
						
					 
					
						2006-01-13 12:25:51 -07:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						fb52fe5cf5 
					 
					
						
						
							
							fix compile error on hp-ux setenv->putenv  
						
						... 
						
						
						
						print slave port as well 
						
						
					 
					
						2006-01-13 17:44:37 +01:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.ndb.mysql.com 
							
						 
					 
					
						
						
							
						
						4b731ddfb4 
					 
					
						
						
							
							wl2325 wl2324  
						
						
						
						
					 
					
						2006-01-12 19:51:02 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						4bcc1845eb 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup 
						
						
					 
					
						2006-01-11 11:21:23 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						f60f757689 
					 
					
						
						
							
							Add comments that groups and describes the inits  
						
						
						
						
					 
					
						2006-01-11 11:10:58 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						f4ad824df9 
					 
					
						
						
							
							Remove obsolete comment  
						
						
						
						
					 
					
						2006-01-11 11:07:17 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						2f48e4f1dc 
					 
					
						
						
							
							Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.  
						
						
						
						
					 
					
						2006-01-11 11:06:26 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						d42d399464 
					 
					
						
						
							
							Disable code for "let" to assign each column from query to it's own variable  
						
						
						
						
					 
					
						2006-01-11 00:24:57 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						4a000ba857 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-small_fix  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration 
						
						
					 
					
						2006-01-10 16:00:37 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						a09473e652 
					 
					
						
						
							
							Fix for crashing mysqltest  
						
						
						
						
					 
					
						2006-01-10 15:56:30 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						b10bed08ce 
					 
					
						
						
							
							Fix mysqltest crash problem  
						
						
						
						
					 
					
						2006-01-10 14:55:39 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						e0d3410a3e 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration 
						
						
					 
					
						2006-01-09 20:12:18 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						43a559ac70 
					 
					
						
						
							
							Improved error message for failing with wrong error  
						
						
						
						
					 
					
						2005-12-29 09:48:43 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						94d05ebc37 
					 
					
						
						
							
							Avoid implicit commits by using a different connection when creating/dropping sp's and views.  
						
						
						
						
					 
					
						2005-12-20 17:06:20 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						90bbcc9b4d 
					 
					
						
						
							
							Store the each column from a multi column result set into a separate variable.  
						
						
						
						
					 
					
						2005-12-20 15:34:58 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						b38a183d62 
					 
					
						
						
							
							Remove confusing printouts from expected to fail "system" commands  
						
						
						
						
					 
					
						2005-12-13 18:47:34 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						b5d805b2d6 
					 
					
						
						
							
							Remove confusing printout  
						
						
						
						
					 
					
						2005-12-13 18:10:53 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						36c86a4df6 
					 
					
						
						
							
							Fix tests after merge  
						
						... 
						
						
						
						Straighten out and comment behaviour for --require and --result in run_query 
						
						
					 
					
						2005-12-13 18:07:13 +01:00 
						 
				 
			
				
					
						
							
							
								paul@snake-hub.snake.net 
							
						 
					 
					
						
						
							
						
						c708d9140f 
					 
					
						
						
							
							mysqltest.c:  
						
						... 
						
						
						
						Put options in proper order. 
						
						
					 
					
						2005-12-12 12:15:25 -06:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						4bcb012bbc 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration 
						
						
					 
					
						2005-12-12 12:43:33 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						8aeb3a1fba 
					 
					
						
						
							
							Fix warnings for running with --view_protocol  
						
						
						
						
					 
					
						2005-12-09 18:51:45 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						fe2ec19039 
					 
					
						
						
							
							WL#2930 mysqltest++  
						
						... 
						
						
						
						- Updated after valgrinding 
						
						
					 
					
						2005-12-08 16:48:37 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						d80516aa96 
					 
					
						
						
							
							Fix memory leak  
						
						
						
						
					 
					
						2005-12-07 14:52:37 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						600a74b0d4 
					 
					
						
						
							
							WL#2930  
						
						... 
						
						
						
						- Updated after review 
						
						
					 
					
						2005-12-06 21:28:13 +01:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5f7e5b46c6 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-5792  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-11-28 10:52:52 -08:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7bd691f11e 
					 
					
						
						
							
							Recursion support made for SP (BUG#10100).  
						
						
						
						
					 
					
						2005-11-23 01:11:19 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						a6031b6425 
					 
					
						
						
							
							Formatting improved  
						
						
						
						
					 
					
						2005-11-04 12:15:49 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						4f26b44318 
					 
					
						
						
							
							Remove trailing whitespace  
						
						
						
						
					 
					
						2005-11-04 12:00:34 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						39b2fb2b3c 
					 
					
						
						
							
							Reapplying patch  
						
						... 
						
						
						
						Check for NULLs only if we don't replace column results,
  get real results after all checks.
  (see bug #14254 : func_crypt.test fails on FreeBSD with --ps-protocol).
Remove two FIXME's 
						
						
					 
					
						2005-11-03 19:32:19 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						32f6ece388 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930 
						
						
					 
					
						2005-11-03 19:20:47 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						718839a1c1 
					 
					
						
						
							
							WL#2930 Adding view and cursor 'protocols' to mysqltest  
						
						... 
						
						
						
						- Part2, actually adding the new functionality 
						
						
					 
					
						2005-11-03 19:00:37 +01:00 
						 
				 
			
				
					
						
							
							
								evgen@moonbone.local 
							
						 
					 
					
						
						
							
						
						bbe58c7e26 
					 
					
						
						
							
							Manually merged  
						
						
						
						
					 
					
						2005-11-01 19:47:53 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						1137a376a7 
					 
					
						
						
							
							Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail.  
						
						
						
						
					 
					
						2005-10-31 19:31:05 +01:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						81437a7286 
					 
					
						
						
							
							Removed C++-isms from client/mysqltest.c  
						
						
						
						
					 
					
						2005-10-31 17:51:48 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						de07ac0c5a 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930 
						
						
					 
					
						2005-10-31 13:36:03 +01:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						afbd0fafd3 
					 
					
						
						
							
							Check for NULLs only if we don't replace column results,  
						
						... 
						
						
						
						get real results after all checks.
(see bug #14254 : func_crypt.test fails on FreeBSD with --ps-protocol). 
						
						
					 
					
						2005-10-31 16:28:45 +04:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						e5eb7cbf29 
					 
					
						
						
							
							WL#2930 Adding view and cursor 'protocols' to mysqltest  
						
						... 
						
						
						
						- Cleanup of mysqltest.c before extending it 
						
						
					 
					
						2005-10-31 12:25:08 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						22c0d6489c 
					 
					
						
						
							
							After reiview fix  
						
						... 
						
						
						
						- Use msg argument to determine if param is required or not in safe_get_param 
						
						
					 
					
						2005-10-28 10:58:57 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						b6dcc55969 
					 
					
						
						
							
							Fix being able to set default TCP port for command-line utilities  
						
						... 
						
						
						
						by using MYSQL_TCP_PORT variable. (Bug #5792 ) 
						
						
					 
					
						2005-10-13 12:28:43 -07:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						7d29c2a4a1 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test 
						
						
					 
					
						2005-10-12 13:59:00 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						0ac28d3187 
					 
					
						
						
							
							Always test ssl and compress  
						
						... 
						
						
						
						- Updated after review 
						
						
					 
					
						2005-10-12 13:56:07 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f5fdf3e87a 
					 
					
						
						
							
							Reviewing new pushed code  
						
						... 
						
						
						
						- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code 
						
						
					 
					
						2005-10-12 00:58:22 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						17d7ba931d 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into  mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-10-08 03:37:23 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						78e828d32f 
					 
					
						
						
							
							Review of code pushed since last 5.0 pull:  
						
						... 
						
						
						
						Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code 
						
						
					 
					
						2005-10-06 17:54:43 +03:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						8a291efb75 
					 
					
						
						
							
							The "exit" command of mysqltest is quite useful when writing tests for 4.1 so I'm porting it from 5.0 to 4.1.  
						
						
						
						
					 
					
						2005-10-05 12:21:53 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						cb96f195c8 
					 
					
						
						
							
							Improved testing of ssl and compression  
						
						... 
						
						
						
						- Added show status variable "compression" for checking that compression is turned on.
 - Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.  
 - Setup server to accept ssl connections from clients ig that is supported by server
 - New tests 
   - ssl - Run with ssl turned on
   - ssl_compress - Run with ssl and compression turned on
   - compress - Run with compression turned in 
 - Updated test 
   - openssl_1, rpl_openssl1 - Changed to run if server supports ssl 
						
						
					 
					
						2005-10-04 15:43:55 +02:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						1831d62a5c 
					 
					
						
						
							
							Fix -ansi -pedantic compilation failure.  
						
						
						
						
					 
					
						2005-10-03 19:44:53 +04:00