serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						fbf4299b5c 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-4.1/  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-4.1 
						
						
					 
					
						2004-01-22 14:46:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						c4a52e4ac4 
					 
					
						
						
							
							enforcing coding style to cause an intentional merge conflict with 4.0  
						
						 
						
						
						
						
					 
					
						2004-01-22 12:55:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4a668f95ce 
					 
					
						
						
							
							added test for bug  #2290  "output truncated with ELT when using DISTINCT"  
						
						 
						
						
						
						
					 
					
						2004-01-21 02:18:51 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						7dda8c102f 
					 
					
						
						
							
							Merge deer.(none):/home/hf/work/mysql-4.1.clean  
						
						 
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-4.1.1676 
						
						
					 
					
						2004-01-19 21:06:27 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e289783cf8 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2182 
						
						
					 
					
						2004-01-19 13:00:51 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						55d84200f4 
					 
					
						
						
							
							item_strfunc.cc:  
						
						 
						
						... 
						
						
						
						Unnesessary copying was fixed 
						
						
					 
					
						2004-01-15 12:12:55 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						cc21589839 
					 
					
						
						
							
							item_strfunc.cc:  
						
						 
						
						... 
						
						
						
						We don't need to copy if start is 0, we can return the original value. 
						
						
					 
					
						2004-01-14 17:26:30 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						362d697c9f 
					 
					
						
						
							
							item_strfunc.cc:  
						
						 
						
						... 
						
						
						
						Comment typo fix
  , 
						
						
					 
					
						2004-01-14 14:02:51 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						81f10f9f07 
					 
					
						
						
							
							item_strfunc.cc:  
						
						 
						
						... 
						
						
						
						Unnesessary code was removed. Comment was added. 
						
						
					 
					
						2004-01-13 17:27:21 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						4a87597984 
					 
					
						
						
							
							Merge deer.(none):/home/hf/work/mysql-4.1.clean  
						
						 
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-4.1.1676 
						
						
					 
					
						2003-12-30 19:43:53 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@deer.(none) 
							
						 
					 
					
						
						
							
						
						b13808d55f 
					 
					
						
						
							
							logging_ok:  
						
						 
						
						... 
						
						
						
						Logging to logging@openlogging.org  accepted
item_strfunc.cc:
  Bug wich appeared in ctype_tis620 is fixed 
						
						
					 
					
						2003-12-29 18:45:13 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						73a36f1997 
					 
					
						
						
							
							Fix & test for the bug  #2182 : lpad returns incorrect result.  
						
						 
						
						
						
						
					 
					
						2003-12-22 19:00:51 +04: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						f995a5f4aa 
					 
					
						
						
							
							Fix autoincrement for signed columns (Bug  #1366 )  
						
						 
						
						... 
						
						
						
						Fixed problem with char > 128 in QUOTE() function. (Bug #1868 )
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651 )
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711 )
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998 )
Fixed timestamp.test 
						
						
					 
					
						2003-12-12 22:26:58 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						6a95123971 
					 
					
						
						
							
							Added checking of return value from my_once_alloc() in charset  
						
						 
						
						... 
						
						
						
						Added checking of return value from malloc() in reg_init() 
						
						
					 
					
						2003-12-10 00:00:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						d626c313e5 
					 
					
						
						
							
							Fix for  bug#1944 'Function RPad() sometimes produce unexpected result'  
						
						 
						
						
						
						
					 
					
						2003-12-04 14:12:01 +04: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d12b287e00 
					 
					
						
						
							
							fixed:  
						
						 
						
						... 
						
						
						
						==2761== Thread 10:
==2761== Conditional jump or move depends on uninitialised value(s)
==2761==    at 0x8115FD2: Item_func_uncompressed_length::val_int() (sql_string.h:90)
==2761==    by 0x8105658: Arg_comparator::compare_int() (item_cmpfunc.cc:356)
and
==2761== Thread 10:
==2761== Conditional jump or move depends on uninitialised value(s)
==2761==    at 0x8116101: Item_func_compress::val_str(String*) (sql_string.h:90)
==2761==    by 0x80E9193: Item::save_in_field(Field*, bool) (item.cc:1155) 
						
						
					 
					
						2003-11-04 23:04:07 +02: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c56e75e2c1 
					 
					
						
						
							
							after review fix  
						
						 
						
						
						
						
					 
					
						2003-11-03 12:28:36 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						934fa2a104 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-10-22 20:52:47 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						0d34e50f39 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mashka.mysql.fi:/home/my/mysql-4.1 
						
						
					 
					
						2003-10-15 22:52:31 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						9ef2a83fbe 
					 
					
						
						
							
							Portability fixes for windows  
						
						 
						
						... 
						
						
						
						After merge fixes 
						
						
					 
					
						2003-10-15 22:40:36 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bell@laptop.sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ddf4d1e529 
					 
					
						
						
							
							fixed printability of Items (all items except subselects)  
						
						 
						
						... 
						
						
						
						(SCRUM) (WL#1274) 
						
						
					 
					
						2003-10-12 17:56:05 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						32fed1e877 
					 
					
						
						
							
							wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed.  
						
						 
						
						... 
						
						
						
						typo in error message text corrected.
new tests added 
						
						
					 
					
						2003-10-12 15:16:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						6056cfadfc 
					 
					
						
						
							
							Merge with 4.0.16  
						
						 
						
						
						
						
					 
					
						2003-10-07 15:42:26 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						5f8e7fef27 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-09-26 15:40:26 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						ba8fa76fa2 
					 
					
						
						
							
							SCRUM:  
						
						 
						
						... 
						
						
						
						WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server 
						
						
					 
					
						2003-09-26 15:33:13 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						ebbc1dc13e 
					 
					
						
						
							
							LPAD() and RPAD() are now multibyte-compatible  
						
						 
						
						
						
						
					 
					
						2003-09-25 17:31:20 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mishka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c22c1d8a4d 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-09-24 10:24:56 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						6312ad254c 
					 
					
						
						
							
							Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into gw.mysql.r18.ru:/usr/home/ram/work/4.1 
						
						
					 
					
						2003-09-22 11:39:29 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@gw.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						50254237de 
					 
					
						
						
							
							Fix for the bug  #1333 : COMPRESS(NULL) segfaults.  
						
						 
						
						
						
						
					 
					
						2003-09-19 12:25:03 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						e89e3ff753 
					 
					
						
						
							
							SCRUM  
						
						 
						
						... 
						
						
						
						embedded library
some dirty places cleaned:
uint removed from mysql.h as Miguel suggested
empty_string renamed as my_empty_string to get rid of name's intersections
using embedded library 
						
						
					 
					
						2003-09-18 18:58:02 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f300e3a164 
					 
					
						
						
							
							Remove 'extern' references from .cc files  
						
						 
						
						
						
						
					 
					
						2003-09-13 11:35:29 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						1c11077d60 
					 
					
						
						
							
							Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with  
						
						 
						
						... 
						
						
						
						their newer DES_ versions.
Provided macros for backward compatibility. 
						
						
					 
					
						2003-09-12 22:33:43 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						44d6102f81 
					 
					
						
						
							
							Fix for the bug  #1209 : SELECT DATABASE().  
						
						 
						
						
						
						
					 
					
						2003-09-08 17:30:53 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						7d2b0a0ce7 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-4.1/  
						
						 
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-4.1 
						
						
					 
					
						2003-09-03 15:40:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						36dd82c1d5 
					 
					
						
						
							
							merge commit, hope that none of bar and dlenev changes were  
						
						 
						
						... 
						
						
						
						lost. 
						
						
					 
					
						2003-09-03 14:12:10 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						755455e15c 
					 
					
						
						
							
							merged  
						
						 
						
						
						
						
					 
					
						2003-09-03 12:07:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						58bdc6f5e1 
					 
					
						
						
							
							use crc32() from bundled zlib if system zlib is unavailable  
						
						 
						
						
						
						
					 
					
						2003-08-21 18:30:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						08d7f298ee 
					 
					
						
						
							
							fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib  
						
						 
						
						... 
						
						
						
						moved them all from different places to item_strfunc.{h,cc}
checksum table command
Com_xxx status variables updated 
						
						
					 
					
						2003-08-21 16:15:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						2263e3e51f 
					 
					
						
						
							
							Merge with 4.0.14  
						
						 
						
						
						
						
					 
					
						2003-08-11 22:44:43 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						c23975aace 
					 
					
						
						
							
							Merge oak.local:/home/kostja/mysql/mysql-4.1-root  
						
						 
						
						... 
						
						
						
						into oak.local:/home/kostja/mysql/mysql-4.1 
						
						
					 
					
						2003-08-07 13:29:25 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						a60acfcfe0 
					 
					
						
						
							
							Old style charset() and set_charset() were removed.  
						
						 
						
						
						
						
					 
					
						2003-08-05 12:52:37 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						50d3291aee 
					 
					
						
						
							
							manual merge  
						
						 
						
						
						
						
					 
					
						2003-07-31 17:11:52 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c2a7768b56 
					 
					
						
						
							
							A new separate error message: Unknown collation 'blablabla'  
						
						 
						
						
						
						
					 
					
						2003-07-29 17:12:14 +05:00