jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						99e35c84ac 
					 
					
						
						
							
							Merge mysql.com:/home/jimw/my/mysql-4.1-clean  
						
						... 
						
						
						
						into  mysql.com:/home/jimw/my/mysql-5.0-clean 
						
						
					 
					
						2005-06-20 15:02:45 -07:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						176143413e 
					 
					
						
						
							
							Fix hang/crash with Boolean full-text search against an unindexed field for  
						
						... 
						
						
						
						which the query contained more words than we allocated space. (Bug #7858 ) 
						
						
					 
					
						2005-06-17 21:44:17 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1e09c15a8b 
					 
					
						
						
							
							don't close binlog in the destructor - use explictit MYSQL_LOG::cleanup for this  
						
						
						
						
					 
					
						2005-03-09 12:29:51 +01:00 
						 
				 
			
				
					
						
							
							
								dean@mysql.com 
							
						 
					 
					
						
						
							
						
						e7f410a14a 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-02-16 04:04:34 -06:00 
						 
				 
			
				
					
						
							
							
								dean@mysql.com 
							
						 
					 
					
						
						
							
						
						87718094aa 
					 
					
						
						
							
							fulltext.test, fulltext.result:  
						
						... 
						
						
						
						Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance(). 
						
						
					 
					
						2005-02-16 03:13:29 -06:00 
						 
				 
			
				
					
						
							
							
								svoj@mysql.com 
							
						 
					 
					
						
						
							
						
						643b602832 
					 
					
						
						
							
							Bug#8351  
						
						... 
						
						
						
						Fix for crash when using a double quote in boolean fulltext query. 
						
						
					 
					
						2005-02-14 18:54:12 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b4624288a7 
					 
					
						
						
							
							myisam/ft_boolean_search.c  
						
						... 
						
						
						
						-trunc* bug - don't increase yweaks in this case 
						
						
					 
					
						2005-01-18 11:27:38 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e8203e437a 
					 
					
						
						
							
							bug#6784  
						
						... 
						
						
						
						mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos 
						
						
					 
					
						2004-11-24 23:16:16 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2ca5a0f2b1 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2004-11-22 20:15:48 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						dca2182fdc 
					 
					
						
						
							
							ft_boolean_search.c:  
						
						... 
						
						
						
						bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
  bug#6705 
						
						
					 
					
						2004-11-22 18:37:30 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						37e872de8c 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2004-11-17 15:28:37 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2d8c21f700 
					 
					
						
						
							
							test for bug#5528  
						
						
						
						
					 
					
						2004-11-17 13:38:35 +01:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						bf2685a690 
					 
					
						
						
							
							autocommit  
						
						
						
						
					 
					
						2004-11-04 21:25:49 +05:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						d2bfefc3c1 
					 
					
						
						
							
							proper max_records estimation for sort-repair of fulltext indexes  
						
						
						
						
					 
					
						2004-10-29 14:24:06 +02:00 
						 
				 
			
				
					
						
							
							
								wax@kishkin.ru 
							
						 
					 
					
						
						
							
						
						eb7515366b 
					 
					
						
						
							
							WL#964  
						
						... 
						
						
						
						porting mysql_test_run on Linux and Windows 
						
						
					 
					
						2004-09-16 00:47:45 +06:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						78fa465b92 
					 
					
						
						
							
							bug#3964 and related issues: FTB problems with charsets where one byte can match many  
						
						... 
						
						
						
						correct prefix compare with my_strnncoll 
						
						
					 
					
						2004-06-10 21:18:57 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						518019f511 
					 
					
						
						
							
							Remove some code from sql_yacc.cc that doesn't do anything except produce warnings on VC++  
						
						
						
						
					 
					
						2004-05-28 00:03:19 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e9b7e3baa8 
					 
					
						
						
							
							merge with 4.0 to get fix to VC++ project files  
						
						
						
						
					 
					
						2004-05-27 23:45:22 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1998dd786e 
					 
					
						
						
							
							backport bug#2708 fix from 4.1  
						
						
						
						
					 
					
						2004-05-27 21:14:59 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						cd3dab49cc 
					 
					
						
						
							
							Merge with 4.0.20  
						
						
						
						
					 
					
						2004-05-17 01:52:13 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						2cbc4e71fc 
					 
					
						
						
							
							backport from 4.1:  
						
						... 
						
						
						
						"phrase search" should not match partial words (it should not match 'paraphrase searches') 
						
						
					 
					
						2004-05-10 12:39:01 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						350b433569 
					 
					
						
						
							
							merge with 4.0  
						
						
						
						
					 
					
						2004-03-16 22:41:30 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						0ea1dd850d 
					 
					
						
						
							
							bug#3011 - multi-byte charset in fulltext  
						
						
						
						
					 
					
						2004-02-29 22:58:45 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						bcd14123bc 
					 
					
						
						
							
							ftb +(+(many -parens)) bug fixed  
						
						
						
						
					 
					
						2004-02-22 00:19:36 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						050af89dd8 
					 
					
						
						
							
							Merge with public tree  
						
						
						
						
					 
					
						2004-02-16 10:31:05 +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 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						15249d6a72 
					 
					
						
						
							
							bug#2708  
						
						... 
						
						
						
						test results updated 
						
						
					 
					
						2004-02-15 20:36:12 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ce14578909 
					 
					
						
						
							
							Merge with 4.0.18  
						
						
						
						
					 
					
						2004-02-11 00:06:46 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						069f6892f7 
					 
					
						
						
							
							beautify SHOW INDEX  
						
						
						
						
					 
					
						2004-02-04 17:42:18 +01:00 
						 
				 
			
				
					
						
							
							
								antony@ltantony.rdg.cyberkinetica.homeunix.net 
							
						 
					 
					
						
						
							
						
						fcf96dbb18 
					 
					
						
						
							
							WorkLog#1323  
						
						... 
						
						
						
						Deprecate the use of TYPE=... Preferred syntax is ENGINE= 
						
						
					 
					
						2003-12-10 04:31:42 +00:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						05f1e10030 
					 
					
						
						
							
							merge with 4.0  
						
						
						
						
					 
					
						2003-11-23 14:52:02 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8ca1836207 
					 
					
						
						
							
							yet another trunc* bug  
						
						
						
						
					 
					
						2003-11-20 23:15:07 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						cb235f43c9 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2003-11-20 23:07:31 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c9ae785bc3 
					 
					
						
						
							
							Delete duplicate error message names  
						
						
						
						
					 
					
						2003-11-18 17:28:00 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						6d350964dc 
					 
					
						
						
							
							word substitution in error messages removed - can create problems for i18n  
						
						
						
						
					 
					
						2003-11-18 10:23:49 +01:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mylan 
							
						 
					 
					
						
						
							
						
						a1199c7749 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1 
						
						
					 
					
						2003-11-08 16:00:00 +01:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mylan 
							
						 
					 
					
						
						
							
						
						cdd8a2a9a5 
					 
					
						
						
							
							fulltext.test, fulltext.result, ft_nlq_search.c:  
						
						... 
						
						
						
						a bug in latin1_german2 FT fixed 
						
						
					 
					
						2003-11-08 15:41:24 +01:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mylan 
							
						 
					 
					
						
						
							
						
						05b3ff393f 
					 
					
						
						
							
							fulltext.test, fulltext.result:  
						
						... 
						
						
						
						one simple trunc* test 
						
						
					 
					
						2003-11-08 15:39:10 +01:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						f763d4c31d 
					 
					
						
						
							
							Removed some warnings reported by valgrind  
						
						... 
						
						
						
						After merge fixes.
Now code compiles, but there is still some valgrind warnings that needs to be fixed 
						
						
					 
					
						2003-11-04 14:09:03 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4e4725377d 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2003-11-04 09:40:36 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						5505abe102 
					 
					
						
						
							
							fixed a bug in boolean fts where a word queue was created based on min_word_len, while with trunc* operator one could get shorter words  
						
						
						
						
					 
					
						2003-11-03 23:18:55 +01:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						0747324ede 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-10-31 22:14:49 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e5d6035188 
					 
					
						
						
							
							post-merge fixes  
						
						
						
						
					 
					
						2003-10-30 21:04:09 +01: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 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b820d2a347 
					 
					
						
						
							
							query expansion for fulltext search  
						
						
						
						
					 
					
						2003-10-23 15:21:06 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						df69309593 
					 
					
						
						
							
							MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax  
						
						
						
						
					 
					
						2003-10-22 17:57:09 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c60ef8160f 
					 
					
						
						
							
							FULLTEXT: correct charset support (UTF included, UCS2 - not)  
						
						... 
						
						
						
						code cleanup 
						
						
					 
					
						2003-10-20 15:53:48 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						50c8b7c13b 
					 
					
						
						
							
							stricter checks on FULLTEXT index creating  
						
						
						
						
					 
					
						2003-10-15 13:40:20 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						5742f29a01 
					 
					
						
						
							
							"phrase search" should not match partial words (it should not match 'paraphrase searches')  
						
						
						
						
					 
					
						2003-10-14 16:19:13 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2263e3e51f 
					 
					
						
						
							
							Merge with 4.0.14  
						
						
						
						
					 
					
						2003-08-11 22:44:43 +03:00