serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						f9de714945 
					 
					
						
						
							
							misc fixes for compile-time errors  
						
						 
						
						
						
						
					 
					
						2004-07-21 00:45:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1e31199995 
					 
					
						
						
							
							Merge with 4.1.3-beta  
						
						 
						
						
						
						
					 
					
						2004-07-07 11:29:39 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5647996784 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4035 
						
						
					 
					
						2004-06-15 16:03:16 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ba82b9e7d5 
					 
					
						
						
							
							cleunup() of count() and max()/min() added (BUG#2687)  
						
						 
						
						
						
						
					 
					
						2004-06-10 10:59:55 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						71eee450e0 
					 
					
						
						
							
							a fix  
						
						 
						
						... 
						
						
						
						(Bug #4035  GROUP_CONCAT with HAVING clause truncates field                       
Bug #4057  LEFT() function in HAVING clause truncates query result). 
						
						
					 
					
						2004-06-08 18:01:15 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						71eddc362e 
					 
					
						
						
							
							Merging 4.1 to 5.0.  
						
						 
						
						
						
						
					 
					
						2004-05-26 17:04:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c7396f8d20 
					 
					
						
						
							
							PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug  #2266 )  
						
						 
						
						
						
						
					 
					
						2004-05-20 02:02:49 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d2fa79b291 
					 
					
						
						
							
							keep old engine & JOIN if we changed subquery Item (Bug  #3646 )  
						
						 
						
						
						
						
					 
					
						2004-05-07 23:06:11 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						bf45960eef 
					 
					
						
						
							
							Merge 4.1 -> 5.0  
						
						 
						
						
						
						
					 
					
						2004-05-07 18:52:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						dfd59e296e 
					 
					
						
						
							
							Merge 4.1 -> 5.0.  
						
						 
						
						
						
						
					 
					
						2004-04-07 19:07:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6ebf869b40 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2004-04-07 16:20:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						61fd95d168 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1 
						
						
					 
					
						2004-04-07 15:23:05 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						70c4eb5838 
					 
					
						
						
							
							Portability fixes  
						
						 
						
						... 
						
						
						
						Fixed problems with group_concat() and HAVING
Updated crash-me values 
						
						
					 
					
						2004-04-07 04:33:58 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e8eda8129f 
					 
					
						
						
							
							::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()  
						
						 
						
						... 
						
						
						
						Field::val_str simplification, comment 
						
						
					 
					
						2004-04-06 21:35:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						42cf92ce37 
					 
					
						
						
							
							Fixed many compiler warnings  
						
						 
						
						... 
						
						
						
						Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695 , #3381  and #3319 )
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly 
						
						
					 
					
						2004-04-05 13:56:05 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						2f4d2a0e38 
					 
					
						
						
							
							fixed brocken of client_test  
						
						 
						
						... 
						
						
						
						fixed aggregate functions in PS (BUG#3360) 
						
						
					 
					
						2004-04-03 11:13:51 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						4bc6b551f8 
					 
					
						
						
							
							false/true -> FALSE/TRUE  
						
						 
						
						... 
						
						
						
						Fixes after last merge 
						
						
					 
					
						2004-03-30 02:32:41 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d095d4753e 
					 
					
						
						
							
							after review changes  
						
						 
						
						
						
						
					 
					
						2004-03-20 13:36:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						2b45b53066 
					 
					
						
						
							
							DBUG_ASSERT(fixed == 1); added to val*  
						
						 
						
						... 
						
						
						
						small optimisation in signed_literal 
						
						
					 
					
						2004-03-18 15:14:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						8035ce40ec 
					 
					
						
						
							
							DBUG_ASSERT(fixed == 0) added to fix_fields()  
						
						 
						
						
						
						
					 
					
						2004-03-17 14:26:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7e48a0f610 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-03-09 12:52:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						14b9fa3588 
					 
					
						
						
							
							revision of fix_fields() calls (BUG2838)  
						
						 
						
						
						
						
					 
					
						2004-02-18 01:08:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						f9e73c7716 
					 
					
						
						
							
							Post-merge fixes.  
						
						 
						
						
						
						
					 
					
						2004-02-11 18:21:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						c8585f3283 
					 
					
						
						
							
							Merge 4.1 into 5.0.  
						
						 
						
						
						
						
					 
					
						2004-02-10 18:44:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						cefdd4fec6 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2004-02-09 15:49:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						06432eac36 
					 
					
						
						
							
							Added --compact to mysqlbinlog  
						
						 
						
						... 
						
						
						
						Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned 
						
						
					 
					
						2004-02-09 12:31:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						f3877b6538 
					 
					
						
						
							
							fixed cleupup() for distinct aggregate functions (BUG#2663)  
						
						 
						
						
						
						
					 
					
						2004-02-08 20:57:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						69e2460bd4 
					 
					
						
						
							
							fixed subquery with PS (BUG#2462)  
						
						 
						
						... 
						
						
						
						fixed UNION preparation 
						
						
					 
					
						2004-02-08 20:14:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						37abf689ec 
					 
					
						
						
							
							Pack of changes about 'cleanup()'-s  
						
						 
						
						... 
						
						
						
						Some errorneous code trimmed 
						
						
					 
					
						2004-01-20 20:55:47 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						1f8eb40310 
					 
					
						
						
							
							Code cleanup (working on PS & cleanup() code)  
						
						 
						
						... 
						
						
						
						Item & changed with Item* in Item_xxx constructors
tables_list.first -> get_table_list() 
						
						
					 
					
						2004-01-19 19:53:25 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						bfe134b86f 
					 
					
						
						
							
							Fix for prepared statements  
						
						 
						
						... 
						
						
						
						Here i added Item_*::cleanup() functions,
removed a lot of ~Item_*'s,
added code to restore order_list and group_list 
						
						
					 
					
						2003-12-30 14:08:19 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@oak.local 
							
						 
					 
					
						
						
							
						
						d37da004f6 
					 
					
						
						
							
							THD::lex now points to THD::main_lex like in 5.0  
						
						 
						
						... 
						
						
						
						All tests pass (client_test included) 
						
						
					 
					
						2003-12-19 20:52:13 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						99e0ae85c7 
					 
					
						
						
							
							Merge 4.1 to 5.0.  
						
						 
						
						
						
						
					 
					
						2003-12-19 18:03:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@oak.local 
							
						 
					 
					
						
						
							
						
						7fdf6740c7 
					 
					
						
						
							
							Implementation of SUM(DISTINCT), tests cases  
						
						 
						
						
						
						
					 
					
						2003-12-19 19:04:03 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						031390a9a4 
					 
					
						
						
							
							Fixes after merge with 4.0  
						
						 
						
						... 
						
						
						
						Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work) 
						
						
					 
					
						2003-12-19 16:25:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e0cc6799ec 
					 
					
						
						
							
							Merge with 4.0.17  
						
						 
						
						
						
						
					 
					
						2003-12-17 17:35:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						124c4ca346 
					 
					
						
						
							
							cleanup: if there is return from if-part, we don't need else statement  
						
						 
						
						
						
						
					 
					
						2003-12-10 22:26:31 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						d04b02b977 
					 
					
						
						
							
							followup to fix for bug  #1790  BIT_AND() result in GROUP BY different when  
						
						 
						
						... 
						
						
						
						SQL_BIG_RESULT used": now BIT_AND() always returns 18446744073709551615
if no rows were found.
This patch also fixes bug #1972 : "BIT_AND() and BIT_OR() still return 
a *signed* 64bit value" 
						
						
					 
					
						2003-12-10 15:17:23 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						cf192063d1 
					 
					
						
						
							
							Post-review fixes for bug  #1790  'BIT_AND() result in GROUP BY different when  
						
						 
						
						... 
						
						
						
						SQL_BIG_RESULT used':
- BIT_AND now returns BIGINT UNSIGNED
- in case there were no matching rows BIT_AND returns 18446744073709551615 
(but not NULL), BIT_OR returns 0 (but not NULL). That's how Monty wants it
and how is described in our docs. 
						
						
					 
					
						2003-12-02 19:39:51 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						6e717133c5 
					 
					
						
						
							
							Merge 4.1 to 5.0  
						
						 
						
						
						
						
					 
					
						2003-12-01 16:14:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ede8169d24 
					 
					
						
						
							
							Added missing SSL library (Should be in source distribution)  
						
						 
						
						... 
						
						
						
						Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log 
						
						
					 
					
						2003-11-28 12:18:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						c4a9dc4f8b 
					 
					
						
						
							
							fix for bug  #1790 :  
						
						 
						
						... 
						
						
						
						"BIT_AND() result in GROUP BY different when SQL_BIG_RESULT used"
return value of BIT_AND changed to BIGINT SIGNED
Also the patch fixes another bug: when temporary table is in use and one of
values in group is NULL, BIT_AND always returns zero.
Fixed it to always skip null values. 
						
						
					 
					
						2003-11-21 00:03:04 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7c6113a39f 
					 
					
						
						
							
							Merge key cache structures to one  
						
						 
						
						... 
						
						
						
						Fixed compiler warnings (IRIX C compiler and VC++) 
						
						
					 
					
						2003-11-20 22:06:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						28a2c6a96b 
					 
					
						
						
							
							Merging 4.1->5.0.  
						
						 
						
						
						
						
					 
					
						2003-11-19 15:19:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						807391a031 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1 
						
						
					 
					
						2003-10-30 15:56:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						33346e26af 
					 
					
						
						
							
							added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()  
						
						 
						
						... 
						
						
						
						added string length for more speed
made code covarage for print() method of Item
fixed printability of some items (SCRUM) (WL#1274) 
						
						
					 
					
						2003-10-30 12:57:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								konstantin@oak.local 
							
						 
					 
					
						
						
							
						
						2dadbb3153 
					 
					
						
						
							
							small fix in comment  
						
						 
						
						
						
						
					 
					
						2003-10-30 13:09:38 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ae380c5855 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-10-28 12:45:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						6300a01909 
					 
					
						
						
							
							added comment  
						
						 
						
						
						
						
					 
					
						2003-10-24 19:30:47 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						934fa2a104 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-10-22 20:52:47 +03:00