monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e7a01ed3dc 
					 
					
						
						
							
							After merge fixes  
						
						
						
						
					 
					
						2004-06-25 21:56:23 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b511996ff4 
					 
					
						
						
							
							workaround for gcc 2.95.3 bug  
						
						... 
						
						
						
						anybody knows how to distinguish 2.95.3 from 2.95.4 (which is ok) ? 
						
						
					 
					
						2004-06-25 01:25:02 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1ff21a9e64 
					 
					
						
						
							
							bug#4089 - JOIN::join_free calling mysql_unlock w/o index_end() before  
						
						
						
						
					 
					
						2004-06-24 19:46:50 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c03addab79 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2004-06-23 12:36:07 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3f1c4ba745 
					 
					
						
						
							
							handler interface cleanups:  
						
						... 
						
						
						
						more logical table/index_flags
  return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
  max_keys and other limits renamed to max_supported_keys/etc
  max_keys/etc are now wrappers to max_supported_keys/etc 
  ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing 
						
						
					 
					
						2004-06-23 12:29:05 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						f874071a26 
					 
					
						
						
							
							Range optimizer fix:  
						
						... 
						
						
						
						If cost(full_scan_on_shortest_covering_index) < cost(best_range_scan) <  cost(full_table_scan)
  use full_scan_on_shortest_covering_index
(before this fix best_range_scan was used) 
						
						
					 
					
						2004-06-22 04:47:28 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b11d258835 
					 
					
						
						
							
							Merge with 4.0.21  
						
						
						
						
					 
					
						2004-06-18 04:38:58 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						fd6858dccd 
					 
					
						
						
							
							Fixed unlikely bug in the range optimzer when using many IN() queries on different key parts. (Bug  #4157 )  
						
						
						
						
					 
					
						2004-06-18 02:31:11 +03:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						cd98a2d82d 
					 
					
						
						
							
							Post-merge fixes  
						
						
						
						
					 
					
						2004-06-14 12:39:46 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						ee0a516ccd 
					 
					
						
						
							
							Manual merge  
						
						
						
						
					 
					
						2004-06-14 11:18:56 +04:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						12b65b31b8 
					 
					
						
						
							
							Post-merge fixes.  
						
						
						
						
					 
					
						2004-06-07 12:08:13 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						3dcd7e53af 
					 
					
						
						
							
							Post-merge fixes.  
						
						... 
						
						
						
						Not finished, will not be pushed until additional fixes have been made. 
						
						
					 
					
						2004-06-03 19:36:36 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						2e93dfaf42 
					 
					
						
						
							
							More code cleanup, debug prints removed  
						
						... 
						
						
						
						Fixed an incorrect optimizer choice for ror-intersect(key, clustered_primary)
Typo bug fixed in multitable update 
						
						
					 
					
						2004-06-01 15:31:58 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						5843eec521 
					 
					
						
						
							
							Manual merge  
						
						
						
						
					 
					
						2004-05-29 20:55:46 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						742b759df7 
					 
					
						
						
							
							* Undo of range optimizer fix from previous changeset  
						
						... 
						
						
						
						* Fixed test results. 
						
						
					 
					
						2004-05-29 17:50:05 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						dff98a8ef7 
					 
					
						
						
							
							* New index_merge EXPLAIN output format  
						
						... 
						
						
						
						* Fixed a problem with wrong query results for partially covering keys in ROR-index_merge
 * ROR-intersection retrieval plan choice algorithm now uses less disk IO
   - and properly processes clustered PK range scans 
 * Fixed several minor range optimizer problems
 * Added more comments
 * Code cleanup 
						
						
					 
					
						2004-05-29 02:04:01 +04:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						71eddc362e 
					 
					
						
						
							
							Merging 4.1 to 5.0.  
						
						
						
						
					 
					
						2004-05-26 17:04:45 +02:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						f207b33a7b 
					 
					
						
						
							
							Support for character set conversion in binary protocol: another go  
						
						... 
						
						
						
						after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
  connection on the fly, because they first should be written to the binary
  log.
  To support efficient conversion we need to rewrite prepared statements
  binlogging code first. 
						
						
					 
					
						2004-05-25 02:03:49 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						56c0258536 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Remove compiler warnings
Update windows project files 
						
						
					 
					
						2004-05-24 14:42:34 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						314a8bf114 
					 
					
						
						
							
							key_cmp -> key_cmp_if_same  
						
						... 
						
						
						
						New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys 
						
						
					 
					
						2004-05-16 14:48:32 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						ec92106535 
					 
					
						
						
							
							Post-merge fixes.  
						
						... 
						
						
						
						Note: One sp.test still fails (prime), and rpl_server_id2.test fails (will be fixed by guilhem ASAP). 
						
						
					 
					
						2004-05-14 16:00:57 +02:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						3b29cad05c 
					 
					
						
						
							
							Manual merge  
						
						
						
						
					 
					
						2004-05-13 01:49:47 +04:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						a46d7542c9 
					 
					
						
						
							
							This is first cset for WL#1394 "Optimize index merge when all involved index ranges include only values with equal keys"  
						
						... 
						
						
						
						The main idea is to exploit the fact that key scans for "key=const" return ordered sequences of rowids. 
						
						
					 
					
						2004-05-13 01:38:40 +04:00 
						 
				 
			
				
					
						
							
							
								miguel@hegel.local 
							
						 
					 
					
						
						
							
						
						8d1480f7c5 
					 
					
						
						
							
							Windows fixes for VC++ compiler compability  
						
						
						
						
					 
					
						2004-05-05 02:59:17 -03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						00738a2be0 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2004-04-08 15:02:25 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						43546e7a82 
					 
					
						
						
							
							Moved reading of ranges from opt_range.cc to handler.cc  
						
						... 
						
						
						
						This gives the handler more optimization possiblities and is needed for NDB cluster
Fixed not-initialized memory error detected by valgrind 
						
						
					 
					
						2004-04-08 13:58:06 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e94d935221 
					 
					
						
						
							
							Cleanup/optimizations of structures and key usage to make it easier to move key-range-search to handler  
						
						
						
						
					 
					
						2004-04-08 01:50:59 +03:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						dfd59e296e 
					 
					
						
						
							
							Merge 4.1 -> 5.0.  
						
						
						
						
					 
					
						2004-04-07 19:07:44 +02: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 
							
						 
					 
					
						
						
							
						
						53c810cda4 
					 
					
						
						
							
							merge fixes (use old code)  
						
						
						
						
					 
					
						2004-03-18 00:16:04 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						5868807b92 
					 
					
						
						
							
							Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-4.1.233 
						
						
					 
					
						2004-03-17 14:04:02 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						350b433569 
					 
					
						
						
							
							merge with 4.0  
						
						
						
						
					 
					
						2004-03-16 22:41:30 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						ceaac59c42 
					 
					
						
						
							
							Fix for  #233  (the second one)  
						
						
						
						
					 
					
						2004-03-16 13:26:37 +04:00 
						 
				 
			
				
					
						
							
							
								miguel@hegel.local 
							
						 
					 
					
						
						
							
						
						0c92e90441 
					 
					
						
						
							
							Cast for VC++ compiler errors  
						
						
						
						
					 
					
						2004-03-12 18:05:51 -03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						4ee44751d9 
					 
					
						
						
							
							Fixed memory leak in DROP DATABASE when using RAID tables (Bug  #2882 )  
						
						
						
						
					 
					
						2004-03-10 13:46:11 +02:00 
						 
				 
			
				
					
						
							
							
								Greg@greg-laptop. 
							
						 
					 
					
						
						
							
						
						f4ebcaff4d 
					 
					
						
						
							
							Changes to fix errors encountered in test builds on Windows.  
						
						
						
						
					 
					
						2004-02-27 16:51:01 +01:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						e720c2ce69 
					 
					
						
						
							
							sql_select.cc, opt_range.cc, item.cc:  
						
						... 
						
						
						
						After merge fixes. 
						
						
					 
					
						2004-02-19 12:04:46 -08:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						d24a2296bb 
					 
					
						
						
							
							Manual merge  
						
						
						
						
					 
					
						2004-02-19 01:12:49 -08:00 
						 
				 
			
				
					
						
							
							
								igor@rurik.mysql.com 
							
						 
					 
					
						
						
							
						
						09fa16424a 
					 
					
						
						
							
							Many files:  
						
						... 
						
						
						
						After review fixes for Item_equal. 
						
						
					 
					
						2004-02-18 22:21:37 -08:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d1d48a9dd5 
					 
					
						
						
							
							Merge with 4.0 to get fix for mysqlbinlog  
						
						
						
						
					 
					
						2004-02-16 10:15:52 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f43093ec0e 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t) 
						
						
					 
					
						2004-02-16 10:03:25 +02:00 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5b369431f1 
					 
					
						
						
							
							fixed copying of color in SEL_ARG::clone (fixed bug  #2968 )  
						
						
						
						
					 
					
						2004-02-12 23:45:39 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ce14578909 
					 
					
						
						
							
							Merge with 4.0.18  
						
						
						
						
					 
					
						2004-02-11 00:06:46 +01:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						c8585f3283 
					 
					
						
						
							
							Merge 4.1 into 5.0.  
						
						
						
						
					 
					
						2004-02-10 18:44:02 +01: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 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						480b082cf4 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-02-05 18:14:48 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						6bfede9639 
					 
					
						
						
							
							Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects. Needed for proper fix for bug  #2479 .  
						
						... 
						
						
						
						Added 'select_to_file' class to be able to merge identical code for select_export and select_dump 
						
						
					 
					
						2004-02-05 10:22:08 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f7e65a7620 
					 
					
						
						
							
							Fixed problem with range optimization over overlapping ranges ( #2448 )  
						
						
						
						
					 
					
						2004-02-04 09:51:13 +01:00 
						 
				 
			
				
					
						
							
							
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3243678040 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2419 
						
						
					 
					
						2004-02-02 19:33:45 +04:00 
						 
				 
			
				
					
						
							
							
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						f16dfb9d36 
					 
					
						
						
							
							Added a comment for NULL range creation.  
						
						
						
						
					 
					
						2004-02-02 19:32:49 +04:00