monty@mysql.com 
							
						 
					 
					
						
						
							
						
						4b7882dc73 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-06-05 17:19:50 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d26c13b439 
					 
					
						
						
							
							client/mysql.cc  
						
						... 
						
						
						
						make print_field_types() somewhat more useful 
						
						
					 
					
						2005-06-03 21:59:33 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a69f432115 
					 
					
						
						
							
							Code cleanups during code reviews  
						
						... 
						
						
						
						Ensure we get error if INSERT IGNORE ... SELECT fails
Fixed wrong key_part->key_length usage in index_merge 
						
						
					 
					
						2005-06-01 16:35:09 +03:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						318c41e94d 
					 
					
						
						
							
							default.c:  
						
						... 
						
						
						
						Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
  Removed unused variable 'field' from print_warnings()
libmysql.dsp:
  Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
  Added "my_chsize.c" 
						
						
					 
					
						2005-05-18 12:15:28 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3b3d00c4a2 
					 
					
						
						
							
							Merge with 4.1 to get fix for memory leak  
						
						
						
						
					 
					
						2005-05-16 20:21:38 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						8b1673f18e 
					 
					
						
						
							
							Fix memory leak  
						
						
						
						
					 
					
						2005-05-16 20:16:46 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						40ce1e174d 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2005-05-14 19:28:29 +02:00 
						 
				 
			
				
					
						
							
							
								antony@ltantony.mysql.com 
							
						 
					 
					
						
						
							
						
						7a56977a79 
					 
					
						
						
							
							Bug#6925  
						
						... 
						
						
						
						Comment/*COMMENT*/is not a separator
  Ensure that whitespace is inserted after C-style comment if required. 
						
						
					 
					
						2005-05-08 00:13:35 +01:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						80933d9f95 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-05-07 08:25:58 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						7e7ed0f6a8 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-9186  
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-4.1-clean 
						
						
					 
					
						2005-05-07 01:05:19 -07:00 
						 
				 
			
				
					
						
							
							
								rburnett@bk-internal.mysql.com 
							
						 
					 
					
						
						
							
						
						82f4a0b021 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/users/rburnett/bug10245  
						
						... 
						
						
						
						into bk-internal.mysql.com:/users/rburnett/mysql-5.0 
						
						
					 
					
						2005-05-06 15:21:30 +02:00 
						 
				 
			
				
					
						
							
							
								rburnett@bk-internal.mysql.com 
							
						 
					 
					
						
						
							
						
						8e286b7934 
					 
					
						
						
							
							Bug  #10245  VC++ compiler error with mysql.cc  
						
						... 
						
						
						
						Only print the read line version if we are on a platform that supports readline
mysql.cc:
  Add #ifdef to only print readline version if we are on a platform that supports readline 
						
						
					 
					
						2005-05-05 17:48:50 +02:00 
						 
				 
			
				
					
						
							
							
								geert@kriem.kemuri.org 
							
						 
					 
					
						
						
							
						
						0dab212f5c 
					 
					
						
						
							
							Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0 
						
						
					 
					
						2005-04-29 14:46:53 +02:00 
						 
				 
			
				
					
						
							
							
								geert@kriem.kemuri.org 
							
						 
					 
					
						
						
							
						
						166af66440 
					 
					
						
						
							
							Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0 
						
						
					 
					
						2005-04-27 14:17:50 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						203cdde955 
					 
					
						
						
							
							Merge from 4.1 to 5.0  
						
						
						
						
					 
					
						2005-04-27 12:56:01 +02:00 
						 
				 
			
				
					
						
							
							
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						0ca934de63 
					 
					
						
						
							
							Improved client internal help.  
						
						... 
						
						
						
						Doc fix for Bug#9870. 
						
						
					 
					
						2005-04-26 14:02:16 +03:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						e0edc9a630 
					 
					
						
						
							
							BUG#2596 MySQL Client Segmentation Fault on Solaris 9  
						
						... 
						
						
						
						- Print readline or libedit version 
						
						
					 
					
						2005-04-25 12:05:13 +02:00 
						 
				 
			
				
					
						
							
							
								geert@kriem.kemuri.org 
							
						 
					 
					
						
						
							
						
						e432a7b263 
					 
					
						
						
							
							Removing useless mysql_field_seek  
						
						
						
						
					 
					
						2005-04-25 09:51:37 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						3aecb8acce 
					 
					
						
						
							
							Upgrade to libedit-2.9  
						
						
						
						
					 
					
						2005-04-21 12:06:46 +02:00 
						 
				 
			
				
					
						
							
							
								geert@kriem.kemuri.org 
							
						 
					 
					
						
						
							
						
						8e671105ac 
					 
					
						
						
							
							\W enables show warnings, \w disables; Showing message while interactive when using the \w and \W commands; using strmov instead of my_strdup; removed case for options, my_getopt does it  
						
						
						
						
					 
					
						2005-04-14 15:07:08 +02:00 
						 
				 
			
				
					
						
							
							
								geert@kriem.kemuri.org 
							
						 
					 
					
						
						
							
						
						e5c607e0ad 
					 
					
						
						
							
							Removing for-loop in print_warnings()  
						
						
						
						
					 
					
						2005-04-08 16:54:50 +02:00 
						 
				 
			
				
					
						
							
							
								geert@kriem.kemuri.org 
							
						 
					 
					
						
						
							
						
						8c42aceb0a 
					 
					
						
						
							
							Adding --show-warnings option for the mysql command line tool so warnings,  
						
						... 
						
						
						
						if any, are shown after execution of a statement in both batch and 
interactive mode. 
In interactive mode \w means show the warnings and \W means don't 
show the warnings. 
						
						
					 
					
						2005-04-05 15:30:17 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						dee535be63 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-03-25 10:51:08 -08:00 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						a9fde23474 
					 
					
						
						
							
							typecast fix for windows 64-bit compilation error  
						
						
						
						
					 
					
						2005-03-16 08:51:57 +01:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						3a6af0b28f 
					 
					
						
						
							
							Change mysql prompt while inside a multiline comment. (Bug  #9186 )  
						
						
						
						
					 
					
						2005-03-15 17:33:06 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						5e0d06da82 
					 
					
						
						
							
							Fix 'tee' command in mysql client. (Bug  #8499 )  
						
						
						
						
					 
					
						2005-03-15 16:37:05 -08:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						956682de1a 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2005-03-09 14:09:06 +01:00 
						 
				 
			
				
					
						
							
							
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						8db4423b8c 
					 
					
						
						
							
							Fixed Bug#8922.  
						
						... 
						
						
						
						Reverted Jim's patch. 
						
						
					 
					
						2005-03-08 18:12:12 +02:00 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						877b2f4688 
					 
					
						
						
							
							fixed conversion errors (Windows IA64 build)  
						
						
						
						
					 
					
						2005-03-07 09:47:24 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3839e443a4 
					 
					
						
						
							
							merge with 4.1  
						
						
						
						
					 
					
						2005-02-28 12:18:39 +02:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						dee22632f7 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/usr/home/ram/work/4.1.b4802 
						
						
					 
					
						2005-02-25 15:47:36 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e2ea35ec67 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-02-22 15:47:00 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e2dc9b4099 
					 
					
						
						
							
							Backport my_strntod() from 5.0  
						
						... 
						
						
						
						Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740 ) 
						
						
					 
					
						2005-02-22 12:51:23 +02:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						e2bd15eca2 
					 
					
						
						
							
							mysql.cc:  
						
						... 
						
						
						
						bug#7571:
  Server & Client characterset are shown under different decriptions
  Switch them into the correct order. 
						
						
					 
					
						2005-02-21 15:43:25 +04:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						8cf2b82f94 
					 
					
						
						
							
							After review fixes  
						
						
						
						
					 
					
						2005-02-02 15:52:19 +04:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						7f68f132fd 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/usr/home/ram/work/4.1.b4802 
						
						
					 
					
						2005-02-02 15:06:36 +04:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						85a5c61c5d 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-7811  
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-01-31 17:51:45 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						ec98b8f235 
					 
					
						
						
							
							Change 'mysql' client to output XML like the 'mysqldump'  
						
						... 
						
						
						
						tool does, with the column names as attributes on <field>
elements, instead of trying to use the column name as the
element name. Also fix some encoding issues. (Bug #7811 ) 
						
						
					 
					
						2005-01-25 14:25:40 -08:00 
						 
				 
			
				
					
						
							
							
								jani@ua141d10.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						d5f76d50f6 
					 
					
						
						
							
							Some bug fixes and a feature add to mysql-test-run  
						
						
						
						
					 
					
						2005-01-25 18:32:09 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c76405a7ee 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2005-01-24 19:41:42 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						67ba2e367a 
					 
					
						
						
							
							fixes/cleanups according to Coverity report  
						
						
						
						
					 
					
						2005-01-24 15:48:25 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						502ba93b38 
					 
					
						
						
							
							Merge with global tree  
						
						
						
						
					 
					
						2005-01-18 04:03:26 +02:00 
						 
				 
			
				
					
						
							
							
								reggie@bob.(none) 
							
						 
					 
					
						
						
							
						
						da9f7c7ec4 
					 
					
						
						
							
							Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into bob.(none):/home/reggie/bk/mysql-4.1 
						
						
					 
					
						2005-01-17 14:08:36 -06:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						05793bb9b9 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-01-16 21:39:21 +01:00 
						 
				 
			
				
					
						
							
							
								reggie@bob.(none) 
							
						 
					 
					
						
						
							
						
						68c540f090 
					 
					
						
						
							
							Bug  #7922  	prompt \p fails on Windows for shared-memory connections  
						
						... 
						
						
						
						Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.
mysql.cc:
  Added code to display mysql.host as prompt when using shared memory 
						
						
					 
					
						2005-01-15 23:19:34 -06:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						275a9293e4 
					 
					
						
						
							
							protect against malicious server trying to crash command-line client :)  
						
						
						
						
					 
					
						2005-01-14 22:46:04 +01:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						196c95e938 
					 
					
						
						
							
							Merging conflicts resolved  
						
						
						
						
					 
					
						2005-01-11 21:00:53 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						8b3b364893 
					 
					
						
						
							
							Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1  
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-4.1.5920 
						
						
					 
					
						2005-01-11 19:58:52 +04:00 
						 
				 
			
				
					
						
							
							
								pekka@mysql.com 
							
						 
					 
					
						
						
							
						
						195f7bda02 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-01-08 22:34:16 +01:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mylan 
							
						 
					 
					
						
						
							
						
						247052fecc 
					 
					
						
						
							
							few harmless warnings from automated code-checking tools fixed  
						
						
						
						
					 
					
						2005-01-08 21:25:31 +01:00