jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						3f6aad900c 
					 
					
						
						
							
							Resolve merge from 4.1  
						
						
						
						
					 
					
						2005-05-18 11:06:34 -07:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						8b302cbb99 
					 
					
						
						
							
							A draft comment for mysql_select. Feel free to moderate and improve.  
						
						
						
						
					 
					
						2005-05-18 19:35:20 +04:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						e3b0643098 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
						
						
					 
					
						2005-05-18 14:34:42 +02:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						80aa0062db 
					 
					
						
						
							
							olap.result, olap.test:  
						
						... 
						
						
						
						Added test cases for bug #7914 .
sql_select.cc:
  Fixed bug #7914 : rollup over expresssions such as sum(a)+1. 
						
						
					 
					
						2005-05-18 05:15:48 -07:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						b6179919f3 
					 
					
						
						
							
							Change Last_query_cost status variable from global to thread-local.  
						
						
						
						
					 
					
						2005-05-18 05:39:10 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7d70579917 
					 
					
						
						
							
							Fixed failing tests for not 32 bit intel machines  
						
						... 
						
						
						
						Fixed bug in mysql_stmt_fetch() when retrieving rows to return 
						
						
					 
					
						2005-05-16 13:34:23 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						7ca3f018e7 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/media/sda1/mysql/mysql-5.0-9478 
						
						
					 
					
						2005-05-12 11:17:38 +04:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						d0e24153b9 
					 
					
						
						
							
							A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"  
						
						... 
						
						
						
						(crash on attempt to re-execute a statement with an open cursor) + 
post-review fixes. 
						
						
					 
					
						2005-05-12 11:16:12 +04:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						3351233349 
					 
					
						
						
							
							Manual merge  
						
						
						
						
					 
					
						2005-05-10 16:41:47 -07:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						9d4b228b61 
					 
					
						
						
							
							Many files:  
						
						... 
						
						
						
						Fixed bug #8528 .
  Representation for single-table views was made similar to
  representation for multi-table views.
view.test:
  Added test case for bug #8528 .
view.result:
  Added test case for bug #8528 . Fixed other test cases. 
						
						
					 
					
						2005-05-10 16:31:13 -07:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						145f7b2983 
					 
					
						
						
							
							Fix for Bug  #9246   Condition pushdown and left join, wrong result  
						
						
						
						
					 
					
						2005-05-09 18:56:29 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						66f881a8f6 
					 
					
						
						
							
							Removed call to cond_push for empty cond  
						
						
						
						
					 
					
						2005-05-08 22:42:40 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						a785052d7d 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
						
						
					 
					
						2005-05-07 22:44:49 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						1eaa54a4d8 
					 
					
						
						
							
							Removed double cond_push  
						
						
						
						
					 
					
						2005-05-07 22:41:30 +02:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						80933d9f95 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-05-07 08:25:58 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						ef183de687 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-8497  
						
						... 
						
						
						
						into mysql.com:/home/jimw/my/mysql-4.1-clean 
						
						
					 
					
						2005-05-07 01:00:24 -07:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						015cd1cd21 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-05-06 13:51:58 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						a9f6aab4c9 
					 
					
						
						
							
							Fixes while reviewing new code  
						
						... 
						
						
						
						Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema 
						
						
					 
					
						2005-05-06 11:39:30 +03:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						b93385de8f 
					 
					
						
						
							
							Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/root/mysql-5.0 
						
						
					 
					
						2005-05-06 11:48:54 +05:00 
						 
				 
			
				
					
						
							
							
								bar@noter.(none) 
							
						 
					 
					
						
						
							
						
						153b928c10 
					 
					
						
						
							
							Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci  
						
						... 
						
						
						
						We cannot propagate constants with tricky collations. 
						
						
					 
					
						2005-05-05 21:13:57 +05:00 
						 
				 
			
				
					
						
							
							
								holyfoot@hf-ibm.(none) 
							
						 
					 
					
						
						
							
						
						2c8e9df232 
					 
					
						
						
							
							A lot of fixes to Precision math  
						
						... 
						
						
						
						Mostly about precision/decimals of the results of the operations 
						
						
					 
					
						2005-05-05 20:06:49 +05:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						e9838c7c70 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-test-valgrind 
						
						
					 
					
						2005-05-03 10:23:10 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						530b6ba541 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-05-01 23:10:55 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						28a5491d3d 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2005-04-30 09:46:08 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						6040b0abf6 
					 
					
						
						
							
							A fix and a test case for Bug#9520 "SELECT DISTINCT crashes server  
						
						... 
						
						
						
						with cursor". The patch refactors do_select/sub_select
functions, which implement the nested loop algorithm, and reuses them to
fetch rows for cursors as well.
Pushing with view.test failing (--ps-protocol). 
						
						
					 
					
						2005-04-30 09:54:35 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						aa84afb983 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2005-04-30 03:45:12 +03:00 
						 
				 
			
				
					
						
							
							
								evgen@moonbone.local 
							
						 
					 
					
						
						
							
						
						b11705a2b0 
					 
					
						
						
							
							Fix bug  #9703  "Error 1032 with GROUP BY query and large tables"  
						
						... 
						
						
						
						Reset old error if tmp table was successfully created.
Test data is large and can be found in bug report along with test query. 
						
						
					 
					
						2005-04-29 21:19:39 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						a7a1d4dc1e 
					 
					
						
						
							
							Fix for BUG#10244:  
						
						... 
						
						
						
						Make get_quick_select_for_ref() accept estimated # records as parameter and 
set QUICK_RANGE_SELECT::records, as this value is used to allocate buffers 
in Multi-Range Read. 
						
						
					 
					
						2005-04-29 01:16:32 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e7b2de98ee 
					 
					
						
						
							
							be sure to call top_level_item() on the new Item_cond_and,  
						
						... 
						
						
						
						that merges ON and WHERE (BUG#10162) 
						
						
					 
					
						2005-04-27 01:32:44 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						972f86f1ee 
					 
					
						
						
							
							Cleanups during review  
						
						
						
						
					 
					
						2005-04-26 23:24:59 +03:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						ca35e36310 
					 
					
						
						
							
							Merge rurik.mysql.com:/home/igor/mysql-5.0  
						
						... 
						
						
						
						into rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
						
						
					 
					
						2005-04-20 16:39:31 -07:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						20250dc497 
					 
					
						
						
							
							Merge rurik.mysql.com:/home/igor/mysql-4.1  
						
						... 
						
						
						
						into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
						
						
					 
					
						2005-04-20 15:08:22 -07:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						4156f9fa44 
					 
					
						
						
							
							BUG#9103 merge to 5.0  
						
						
						
						
					 
					
						2005-04-20 12:09:56 +04:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						87ade2e6f7 
					 
					
						
						
							
							Merge of the fix for bug  #9681  4.1->5.0  
						
						
						
						
					 
					
						2005-04-19 19:00:02 -07:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						25c396628a 
					 
					
						
						
							
							sql_select.cc:  
						
						... 
						
						
						
						Fixed bug #9681 .
  The bug happened with queries using derived tables specified by
  a SELECT with ROLLUP, such as:
  SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
  if column a of table t1 is declared as NOT NULL.
  This was to the fact that the first column of the temporary table
  created to contain the derived table erroneously inherited the NOT NULL
  attribute from column a.
olap.result, olap.test:
  Added a test case for bug #9681 . 
						
						
					 
					
						2005-04-19 16:54:30 -07:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						a76ecc5bc7 
					 
					
						
						
							
							Fix for BUG#9103:  
						
						... 
						
						
						
						Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
is only used to make index search tuples and data truncation that occurs here has no
relation with truncated values being saved into tables. 
						
						
					 
					
						2005-04-18 05:21:44 +04:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						285f11064d 
					 
					
						
						
							
							Merge rurik.mysql.com:/home/igor/mysql-5.0  
						
						... 
						
						
						
						into rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
						
						
					 
					
						2005-04-15 22:35:29 -07:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						0f043429e4 
					 
					
						
						
							
							subselect.result, subselect.test:  
						
						... 
						
						
						
						Added a test case for bug #9338 .
sql_select.cc:
  Fixed bug #9338 .
  When an occurence of a field reference has to be replaced
  by another field reference the whole Item_field must be
  replaced.
item.cc:
  Fixed bug #9338 .
  The method Item_field::replace_equal_field_processor was
  replaced by Item_field::replace_equal_field. The new method
  is used to replace the occurences of Item_field objects.
item.h:
  Fixed bug #9338 .
  The virtual function replace_equal_field_processor was replaced
  by replace_equal_field. The latter is supposed to be used as a
  callback function in calls of the method transform. 
						
						
					 
					
						2005-04-15 20:43:45 -07:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						303af4052e 
					 
					
						
						
							
							Add a comment to update_ref_and_keys  
						
						
						
						
					 
					
						2005-04-14 17:47:48 -07:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						740cc2e095 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-04-07 19:25:20 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						780202f130 
					 
					
						
						
							
							Moved some old test and added a new test to only be run with mysql-test-run --big  
						
						... 
						
						
						
						Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files 
						
						
					 
					
						2005-04-07 19:24:14 +03:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						280fda6093 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-bug8877-merge 
						
						
					 
					
						2005-04-07 17:48:42 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						3f6cdec788 
					 
					
						
						
							
							Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-4.1-bug8877 
						
						
					 
					
						2005-04-07 17:47:37 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						3005323e99 
					 
					
						
						
							
							Merge mysql.com:/home/psergey/mysql-4.1-bug8877  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-bug8877-merge 
						
						
					 
					
						2005-04-07 17:46:08 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						0cd5877b02 
					 
					
						
						
							
							Post-review fixes: local variable renamed  
						
						
						
						
					 
					
						2005-04-07 17:44:48 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						b591d3434a 
					 
					
						
						
							
							BUG#8877: Post-merge fixes.  
						
						
						
						
					 
					
						2005-04-07 17:42:32 +04:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						5f8d71710b 
					 
					
						
						
							
							Minor fix in cursors execution.  
						
						
						
						
					 
					
						2005-04-06 22:09:43 +04:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						70aecbb8a4 
					 
					
						
						
							
							Refactor parts of do_select() (JOIN execution).  
						
						
						
						
					 
					
						2005-04-06 21:48:16 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						ea43deb9e3 
					 
					
						
						
							
							Merge mysql.com:/home/psergey/mysql-4.1-bug8877  
						
						... 
						
						
						
						into mysql.com:/home/psergey/mysql-5.0-bug8877-merge 
						
						
					 
					
						2005-04-05 03:36:14 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						53e0b5b5db 
					 
					
						
						
							
							Removed extra comment  
						
						
						
						
					 
					
						2005-04-05 03:34:39 +04:00