bar@mysql.com 
							
						 
					 
					
						
						
							
						
						13b5cdb126 
					 
					
						
						
							
							Moving mysql_get_server_version() from libmysql.c to client.c,  
						
						... 
						
						
						
						as it is now required by mysql_set_character_set() 
						
						
					 
					
						2006-04-06 13:03:22 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						45a3bb57d6 
					 
					
						
						
							
							libmysql.c:  
						
						... 
						
						
						
						Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server. 
						
						
					 
					
						2006-04-06 11:47:46 +05:00 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						556fbe7d68 
					 
					
						
						
							
							fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163)  
						
						... 
						
						
						
						(approved by kostja) 
						
						
					 
					
						2006-03-21 22:02:36 +01:00 
						 
				 
			
				
					
						
							
							
								anozdrin@mysql.com 
							
						 
					 
					
						
						
							
						
						0e172496eb 
					 
					
						
						
							
							Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.0-tree  
						
						... 
						
						
						
						into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree 
						
						
					 
					
						2006-03-10 22:37:38 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						2ea0b9b72c 
					 
					
						
						
							
							Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":  
						
						... 
						
						
						
						it breaks binary compatibility. The patch will be left intact
in 5.1. 
						
						
					 
					
						2006-03-05 00:38:54 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						951943c22a 
					 
					
						
						
							
							Undo the patch for Bug#16144 "mysql_stmt_attr_get type error",  
						
						... 
						
						
						
						it breaks binary compatibility. The patch will be left intact
in 5.1. Warning: this changeset should be null-merged into 5.1.
A separate commit in order to push into the release clone of 
5.0.19. 
						
						
					 
					
						2006-03-04 23:04:48 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						82b77cdd90 
					 
					
						
						
							
							Fixes to embedded server to be able to run tests with it  
						
						... 
						
						
						
						(Needed for "list of pushes" web page and autopush) 
						
						
					 
					
						2006-02-24 18:34:15 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						519bf5b6fc 
					 
					
						
						
							
							Bug#11589 mysqltest, --ps-protocol, strange output, float/double/real with zerofill  
						
						... 
						
						
						
						- Add zerofill in client if real/float/double is bound to string and fetched using binary protocol. 
						
						
					 
					
						2006-02-21 14:55:54 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						e919f8e888 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2006-02-21 08:50:26 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						25c4344656 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/bug14057/my51-bug14057 
						
						
					 
					
						2006-02-21 08:49:21 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						56acf0a0c2 
					 
					
						
						
							
							Bug#14057 mysql_ping() handles TCP and UNIX socket connections in different ways  
						
						... 
						
						
						
						- Retry the ping if reconnect is turned on and the error was CR_SERVER_LOST 
						
						
					 
					
						2006-02-16 13:44:56 +01:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						d33b03abef 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.0-clean  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.1-clean 
						
						
					 
					
						2006-02-15 12:06:20 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						28a88a07ce 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.0-clean  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.1-clean 
						
						
					 
					
						2006-02-15 11:22:03 -08:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						12b23630db 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2006-02-15 20:16:33 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@devsrv-b.mysql.com 
							
						 
					 
					
						
						
							
						
						eb97818627 
					 
					
						
						
							
							Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000'  
						
						... 
						
						
						
						- Init sql_state in mysql_stmt_init 
						
						
					 
					
						2006-02-15 13:45:03 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						48b8e842ca 
					 
					
						
						
							
							Automerge  
						
						
						
						
					 
					
						2006-02-15 00:01:46 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						63cfd11859 
					 
					
						
						
							
							dbug changes:  
						
						... 
						
						
						
						1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log 
						
						
					 
					
						2006-02-14 22:36:11 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						e486d81a52 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013  
						
						... 
						
						
						
						into  neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2006-02-13 10:56:45 +01:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						5000951ab4 
					 
					
						
						
							
							Bug#14013 mysql_stmt_store_result() bombs if a cursor is open  
						
						... 
						
						
						
						- Add code to 'mysql_stmt_store_result' to allow it to be called on 
   a prepared statement with open server side cursor.
 - Add tests to mysql_client_test that uses 'mysql_stmt_store_result' 
						
						
					 
					
						2006-02-10 14:50:29 +01:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						5ed755d0d8 
					 
					
						
						
							
							Merge mysql.com:/home/kostja/mysql/tmp_merge  
						
						... 
						
						
						
						into  mysql.com:/home/kostja/mysql/mysql-5.1-merge 
						
						
					 
					
						2006-02-08 23:53:45 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						9f0bb47f87 
					 
					
						
						
							
							Merge mysql.com:/home/kostja/mysql/tmp_merge  
						
						... 
						
						
						
						into  mysql.com:/home/kostja/mysql/mysql-5.1-merge 
						
						
					 
					
						2006-02-02 23:27:06 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						98091b152a 
					 
					
						
						
							
							Merge mysql.com:/opt/local/work/mysql-4.1-root  
						
						... 
						
						
						
						into  mysql.com:/opt/local/work/mysql-5.0-root 
						
						
					 
					
						2006-02-02 18:17:18 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						92b41ba92a 
					 
					
						
						
							
							Merge mysql.com:/home/kostja/mysql/tmp_merge  
						
						... 
						
						
						
						into  mysql.com:/home/kostja/mysql/mysql-5.1-merge 
						
						
					 
					
						2006-02-02 16:57:34 +03:00 
						 
				 
			
				
					
						
							
							
								andrey@lmy004. 
							
						 
					 
					
						
						
							
						
						736faf4730 
					 
					
						
						
							
							fix for bug  #12744  (MYSQL_STMT operations cause seg fault after connection reset)  
						
						
						
						
					 
					
						2006-02-01 20:35:16 +01:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						d2bba04183 
					 
					
						
						
							
							Merge mysql.com:/opt/local/work/mysql-4.1-root  
						
						... 
						
						
						
						into  mysql.com:/opt/local/work/mysql-5.0-root 
						
						
					 
					
						2006-01-18 15:15:09 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						19fd36e254 
					 
					
						
						
							
							A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":  
						
						... 
						
						
						
						use the right type in mysql_stmt_attr_get 
						
						
					 
					
						2006-01-17 23:19:43 +03:00 
						 
				 
			
				
					
						
							
							
								holyfoot@deer.(none) 
							
						 
					 
					
						
						
							
						
						e8697cf428 
					 
					
						
						
							
							Big patch to make embedded-server working in 5.x  
						
						... 
						
						
						
						Now it supports queries returning several results
(particularly important with the SP) 
						
						
					 
					
						2006-01-04 14:20:28 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						14f94dc0ca 
					 
					
						
						
							
							many warnings (practically safe but annoying) corrected  
						
						
						
						
					 
					
						2006-01-03 17:54:54 +01:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						1311d4dc79 
					 
					
						
						
							
							Merging  
						
						
						
						
					 
					
						2005-08-04 16:27:53 +05:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						39ef54fd8e 
					 
					
						
						
							
							Fix for bug  #12177  (errorlog file isn't closed)  
						
						... 
						
						
						
						4.1 version of the patch 
						
						
					 
					
						2005-08-04 15:23:21 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b3cbd0048f 
					 
					
						
						
							
							Cleanups during review of new code  
						
						... 
						
						
						
						Ensure mysql_close() is called if mysql_set_character_set() fails 
						
						
					 
					
						2005-07-28 16:10:14 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						d7fbff3ec5 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.0-5906  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-07-19 19:59:34 -07:00 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						21a88afeed 
					 
					
						
						
							
							minor fix (backport from 5.0) - changed function prototype/definition  
						
						
						
						
					 
					
						2005-07-19 17:12:00 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						dd2f631ec4 
					 
					
						
						
							
							Fix number to date conversion so it always honors the NO_ZERO_DATE,  
						
						... 
						
						
						
						NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906 ) 
						
						
					 
					
						2005-07-18 16:12:44 -07:00 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						53c630a524 
					 
					
						
						
							
							Restore previous used client charset in mysql_reconnect  
						
						... 
						
						
						
						Moved mysql_set_character_set function to client.c
Changed function prototype for mysql_set_character_set (as suggested
by Konstantin) 
						
						
					 
					
						2005-07-16 07:13:40 +02:00 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						8c4cd0427f 
					 
					
						
						
							
							Fix for bug  #11037 .  
						
						... 
						
						
						
						When all rows are fetched subsequent calls to mysql_stmt_fetch return
now MYSQL_NO_DATA instead of errorcode 1. 
						
						
					 
					
						2005-07-15 14:30:47 +02:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						1c142ee631 
					 
					
						
						
							
							Merge mysql.com:/opt/local/work/mysql-4.1-root  
						
						... 
						
						
						
						into  mysql.com:/opt/local/work/mysql-5.0-root 
						
						
					 
					
						2005-07-14 20:02:34 +04:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						a1270b65db 
					 
					
						
						
							
							A fix and a test case for Bug#11183 "mysql_stmt_reset() doesn't reset  
						
						... 
						
						
						
						information about error". 
						
						
					 
					
						2005-07-14 20:02:33 +04:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						509531421c 
					 
					
						
						
							
							Implement MarkM optimization request to avoid redundnat packet exchange  
						
						... 
						
						
						
						in cursors. 
						
						
					 
					
						2005-07-14 15:27:24 +04:00 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						55d413252f 
					 
					
						
						
							
							changes after Bar's review: renamed CHARACTER_SET to MY_CHARSET_INFO  
						
						
						
						
					 
					
						2005-07-12 10:58:21 +02:00 
						 
				 
			
				
					
						
							
							
								georg@lmy002.wdf.sap.corp 
							
						 
					 
					
						
						
							
						
						ceba4ee9cd 
					 
					
						
						
							
							New attempt after Bar's review  
						
						... 
						
						
						
						Added api function mysql_get_character_set_info which provides
information about the current client character set. 
						
						
					 
					
						2005-07-12 10:31:43 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						485f2c93c2 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-5.0-10214  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-07-05 09:47:20 -07:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						f60ebc4815 
					 
					
						
						
							
							A fix and a test case for Bug#10794 "mysql_stmt_attr_set no  
						
						... 
						
						
						
						open cursor after mysql_stmt_execute" + post-review fixes.
The bug was caused by wrong flags in stmt->server_status on the client
side: if there was no cursor, the server didn't send server_status
flags to the client, and the old flags were used to set up the
fetch function of a statement. Consequently, stmt_read_row_from_cursor was
used when there was no cursor. The fix fixes the server to always
send server flags to the client. 
						
						
					 
					
						2005-06-30 16:17:10 +04:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						3ccb90c085 
					 
					
						
						
							
							Make status of NO_BACKSLASH_ESCAPES mode known to the client so  
						
						... 
						
						
						
						it can use it to switch to only quoting apostrophes by doubling
them when it is in effect. (Bug #10214 ) 
						
						
					 
					
						2005-06-23 18:29:56 -07:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						b3d977df10 
					 
					
						
						
							
							Rename all prepared statements COM_ commands to prefix with COM_STMT_  
						
						
						
						
					 
					
						2005-06-17 23:26:25 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						4b7882dc73 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-06-05 17:19:50 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						25a2c4a71e 
					 
					
						
						
							
							Cleanup during review  
						
						... 
						
						
						
						Simple optimization for 2 argument usage to function of variable arguments
Fix stack overrun when using 1+1+1+1+1+1+1+....
Update crash-me results for 5.0
Don't call post_open if pre_open() fails (optimization) 
						
						
					 
					
						2005-06-05 17:01:20 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						ada8f09186 
					 
					
						
						
							
							Add missing STMT_ATTR_PREFETCH_ROWS to mysql_stmt_attr_get  
						
						
						
						
					 
					
						2005-06-04 12:37:10 +04:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						d0b4e71bbd 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/opt/local/work/mysql-5.0-9643 
						
						
					 
					
						2005-05-16 18:48:01 +04:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						f1916b87d2 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/opt/local/work/mysql-5.0-9643 
						
						
					 
					
						2005-05-16 18:29:04 +04:00