msvensson@shellback.(none) 
							
						 
					 
					
						
						
							
						
						e5004d1312 
					 
					
						
						
							
							Merge shellback.(none):/home/msvensson/mysql/mysql-5.0  
						
						... 
						
						
						
						into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
						
						
					 
					
						2006-04-27 17:35:29 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						29ace143a1 
					 
					
						
						
							
							Backport fix for mysql client not using SSl library directly  
						
						... 
						
						
						
						- Add function mysql_get_ssl_cipher
 - Use function mysql_get_ssl_cipher from mysql 
						
						
					 
					
						2006-04-22 00:48:13 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						1472ed2061 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2006-04-21 20:04:13 +02:00 
						 
				 
			
				
					
						
							
							
								serg@mysql.com 
							
						 
					 
					
						
						
							
						
						98ea03931e 
					 
					
						
						
							
							mysql.cc:  
						
						... 
						
						
						
						revert bug#16855 "fix" per Monty's request 
						
						
					 
					
						2006-04-18 10:16:06 +02:00 
						 
				 
			
				
					
						
							
							
								cmiller@zippy.(none) 
							
						 
					 
					
						
						
							
						
						7d282984f3 
					 
					
						
						
							
							Only expand the empty string to the letters "NULL" if the column  
						
						... 
						
						
						
						does not have "NOT NULL" attribute set.  Also, calculate the padding
characters more safely, so that a negative number doesn't cause it to 
print MAXINT-n spaces. 
						
						
					 
					
						2006-04-16 17:17:36 -04:00 
						 
				 
			
				
					
						
							
							
								cmiller@zippy.(none) 
							
						 
					 
					
						
						
							
						
						0db6176bfc 
					 
					
						
						
							
							Bug#18265: mysql client: No longer right-justifies numeric columns  
						
						... 
						
						
						
						Also fixes a new bug for which "NULL" wasn't printed (because the 
data it represents has length zero).  (Discovered my Paul DuBois.) 
						
						
					 
					
						2006-04-04 17:35:07 -04:00 
						 
				 
			
				
					
						
							
							
								ian@zim.(none) 
							
						 
					 
					
						
						
							
						
						a66aace3e9 
					 
					
						
						
							
							Fix for bug  #16855  
						
						
						
						
					 
					
						2006-03-27 17:45:06 -08:00 
						 
				 
			
				
					
						
							
							
								cmiller@zippy.(none) 
							
						 
					 
					
						
						
							
						
						599c710a5b 
					 
					
						
						
							
							Bug#16859 involves truncating column data at NUL characters.  Instead, the  
						
						... 
						
						
						
						client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown. 
						
						
					 
					
						2006-03-03 16:26:38 -05:00 
						 
				 
			
				
					
						
							
							
								aelkin@mysql.com 
							
						 
					 
					
						
						
							
						
						dd2a44c497 
					 
					
						
						
							
							BUG#16217 forced to introduce a separate mysql client command to adopt its  
						
						... 
						
						
						
						internal charset to one associated with currently being handled query. 
To note such a query can come from interactive client either.
There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side 
character set. 
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.
Interactive human can switch between many multi-byte charsets during the session 
providing the command explicitly. 
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server. 
						
						
					 
					
						2006-02-09 16:23:09 +02:00 
						 
				 
			
				
					
						
							
							
								stewart@mysql.com 
							
						 
					 
					
						
						
							
						
						efbdf7b225 
					 
					
						
						
							
							Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main  
						
						... 
						
						
						
						into  mysql.com:/home/stewart/Documents/MySQL/5.0/main 
						
						
					 
					
						2005-12-28 00:57:18 +11:00 
						 
				 
			
				
					
						
							
							
								paul@snake-hub.snake.net 
							
						 
					 
					
						
						
							
						
						f5cc3fd619 
					 
					
						
						
							
							mysql.cc:  
						
						... 
						
						
						
						Typo in help message. 
						
						
					 
					
						2005-12-20 12:47:44 -06:00 
						 
				 
			
				
					
						
							
							
								knielsen@mysql.com 
							
						 
					 
					
						
						
							
						
						17cab43fcf 
					 
					
						
						
							
							Bug#15097: Missing \n in header printed by mysql --help when HAVE_READLINE  
						
						... 
						
						
						
						is not defined. 
						
						
					 
					
						2005-12-05 12:12:08 +01:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						d88d8081da 
					 
					
						
						
							
							Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0  
						
						... 
						
						
						
						into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
						
						
					 
					
						2005-12-04 15:34:47 +02:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						669a12fdb0 
					 
					
						
						
							
							A set of Netware related patches.  
						
						
						
						
					 
					
						2005-12-04 15:02:06 +02:00 
						 
				 
			
				
					
						
							
							
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						b3b124f9e4 
					 
					
						
						
							
							Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the general tree.  
						
						
						
						
					 
					
						2005-11-21 15:49:34 +01:00 
						 
				 
			
				
					
						
							
							
								jamppa@suse9-x86.mysql.com 
							
						 
					 
					
						
						
							
						
						a50cc250ff 
					 
					
						
						
							
							Netware specific changes for 5.0.16a  
						
						
						
						
					 
					
						2005-11-18 18:25:46 +01:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						f8ce7bc01e 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-11-17 13:37:30 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						2ffc7ff2a2 
					 
					
						
						
							
							Update out-of-date URLs in 'help' text of mysql client. (Bug  #14801 )  
						
						
						
						
					 
					
						2005-11-11 15:23:04 -08:00 
						 
				 
			
				
					
						
							
							
								tim@siva.hindu.god 
							
						 
					 
					
						
						
							
						
						c704130389 
					 
					
						
						
							
							BUG#14358: in mysql.cc, don't neglect to strip delimiter off lines < 9 characters long.  
						
						
						
						
					 
					
						2005-10-28 12:13:34 +13:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						70c816c801 
					 
					
						
						
							
							Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release  
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-5.0 
						
						
					 
					
						2005-10-20 23:23:33 +02:00 
						 
				 
			
				
					
						
							
							
								reggie@ugeek.(none) 
							
						 
					 
					
						
						
							
						
						600c7df8f1 
					 
					
						
						
							
							readd the my_cgets call that SergeyV originally put in  
						
						
						
						
					 
					
						2005-10-18 17:53:09 -05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						e7fa41ebf7 
					 
					
						
						
							
							mysql.cc:  
						
						... 
						
						
						
						After merge fix. 
						
						
					 
					
						2005-10-14 14:19:15 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						aec79cc463 
					 
					
						
						
							
							Merge mysql.com:/usr/home/bar/mysql-4.1  
						
						... 
						
						
						
						into  mysql.com:/usr/home/bar/mysql-5.0 
						
						
					 
					
						2005-10-14 14:17:15 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						48238e1b90 
					 
					
						
						
							
							Merge mysql.com:/usr/home/bar/mysql-4.1.b13487  
						
						... 
						
						
						
						into  mysql.com:/usr/home/bar/mysql-4.1 
						
						
					 
					
						2005-10-14 14:07:22 +05: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 
						 
				 
			
				
					
						
							
							
								gluh@mysql.com 
							
						 
					 
					
						
						
							
						
						041eab4663 
					 
					
						
						
							
							4.1 -> 5.0 merge  
						
						
						
						
					 
					
						2005-10-07 14:26:32 +05: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 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						f846bc32c1 
					 
					
						
						
							
							Windows compilation fix: Added typecast (const char* to char *)  
						
						
						
						
					 
					
						2005-10-04 10:54:58 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						7b2e04d5a2 
					 
					
						
						
							
							Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
						
						
					 
					
						2005-09-30 16:37:02 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						21cf818a8d 
					 
					
						
						
							
							Many files:  
						
						... 
						
						
						
						New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver 
						
						
					 
					
						2005-09-30 14:03:55 +02:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						ceb541e4bc 
					 
					
						
						
							
							Bug#13487 Japanese data inside a comment causes the syntax error  
						
						... 
						
						
						
						mysql.cc:
  Fixed not to copy multibyte characters to the
  target string if we are inside a comment. 
						
						
					 
					
						2005-09-28 15:46:09 +05:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						fbf4a5e079 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-09-28 11:34:53 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ea6d5f9ec3 
					 
					
						
						
							
							Fixed error found during review of new pushed code  
						
						
						
						
					 
					
						2005-09-25 21:22:23 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						a083ff160e 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2005-09-21 13:53:22 +02:00 
						 
				 
			
				
					
						
							
							
								SergeyV@selena. 
							
						 
					 
					
						
						
							
						
						2e9e0b33c5 
					 
					
						
						
							
							Fixes bug  #12929 . Uses my_cgets instead of _cgets function, thus eliminating  
						
						... 
						
						
						
						a restriction to 255 chars for editable buffer. 
						
						
					 
					
						2005-09-16 01:56:16 +04:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						25adba36b1 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.0-11523  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-08-29 10:02:23 -07:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						7b7188cea6 
					 
					
						
						
							
							Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1  
						
						... 
						
						
						
						into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
						
						
					 
					
						2005-08-26 15:56:52 +03:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						e767eb330e 
					 
					
						
						
							
							Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0  
						
						... 
						
						
						
						into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
						
						
					 
					
						2005-08-25 12:08:26 +03:00 
						 
				 
			
				
					
						
							
							
								jani@a193-229-222-105.elisa-laajakaista.fi 
							
						 
					 
					
						
						
							
						
						fe977b0cd0 
					 
					
						
						
							
							Several fixes for Netware.  
						
						
						
						
					 
					
						2005-08-24 22:03:34 +03:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						2870638ef2 
					 
					
						
						
							
							client/mysql.cc  
						
						... 
						
						
						
						mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt)
configure.in
    autoconf 2.52 is enough to build mysql-5.0 
						
						
					 
					
						2005-08-14 14:06:47 +02:00 
						 
				 
			
				
					
						
							
							
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						b9476f7d50 
					 
					
						
						
							
							Merge xiphis.org:/usr/home/antony/work2/mysql-4.1  
						
						... 
						
						
						
						into  xiphis.org:/usr/home/antony/work2/merge-5.0 
						
						
					 
					
						2005-08-11 12:18:53 +01:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						397cef9413 
					 
					
						
						
							
							Fix 'source' command in mysql client to handle delimiter command  
						
						... 
						
						
						
						in sourced file properly. (Bug #11523 ) 
						
						
					 
					
						2005-08-09 12:17:28 -07:00 
						 
				 
			
				
					
						
							
							
								patg@krsna.patg.net 
							
						 
					 
					
						
						
							
						
						74c7168992 
					 
					
						
						
							
							BUG  #12119  
						
						... 
						
						
						
						Removed unnecessary error message from mysql.cc (client program) 
						
						
					 
					
						2005-08-08 13:50:10 -07:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						8437e9c1be 
					 
					
						
						
							
							Fixes during review of new pushed code  
						
						... 
						
						
						
						Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files. 
						
						
					 
					
						2005-07-31 12:49:55 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						78c65b5adc 
					 
					
						
						
							
							Cleanups during review  
						
						... 
						
						
						
						Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while ( 
						
						
					 
					
						2005-07-18 15:33:18 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						99e35c84ac 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-06-20 15:02:45 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5381e18673 
					 
					
						
						
							
							Fix handling of command-line on Windows, missed as part of earlier  
						
						... 
						
						
						
						commit. (Bug #10840 ) 
						
						
					 
					
						2005-06-20 18:54:45 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						55f962c0cf 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-06-10 20:11:20 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						e4cb794750 
					 
					
						
						
							
							Fix use of _cgets() to handle an input line that exceeds our buffer space  
						
						... 
						
						
						
						before a newline is found. (Bug #10840 ) 
						
						
					 
					
						2005-06-09 19:44:59 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						9ba4a6c722 
					 
					
						
						
							
							Fix calculation of buffer size for _cgets() on Windows. (Bug  #10841 )  
						
						
						
						
					 
					
						2005-06-08 00:43:57 +02:00