kostja@oak.local 
							
						 
					 
					
						
						
							
						
						7dab500b7a 
					 
					
						
						
							
							Merge oak.local:/home/kostja/mysql/mysql-4.1-root  
						
						 
						
						... 
						
						
						
						into oak.local:/home/kostja/mysql/mysql-4.1 
						
						
					 
					
						2003-07-17 14:55:13 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						91d93f6f61 
					 
					
						
						
							
							ELT passes the first argument in args[0] instead of having a separate Item.  
						
						 
						
						
						
						
					 
					
						2003-07-15 18:11:49 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4542d142d7 
					 
					
						
						
							
							Portability fixes  
						
						 
						
						
						
						
					 
					
						2003-07-15 13:10:20 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						f4518cdc31 
					 
					
						
						
							
							Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into myvenu.com:/home/venu/work/sql/dev-4.1 
						
						
					 
					
						2003-07-13 09:53:31 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								miguel@hegel.local 
							
						 
					 
					
						
						
							
						
						0d3a73efb3 
					 
					
						
						
							
							Removed unreferenced local variable  
						
						 
						
						
						
						
					 
					
						2003-07-13 01:20:15 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						7d094db001 
					 
					
						
						
							
							Add the support of 'SUBSTR' function compatible with Oracle and SAPDB (SCRUM  #872 )  
						
						 
						
						
						
						
					 
					
						2003-07-11 18:55:03 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						0f28677af6 
					 
					
						
						
							
							Merge oak.local:/home/kostja/mysql/mysql-4.1-root  
						
						 
						
						... 
						
						
						
						into oak.local:/home/kostja/mysql/mysql-4.1 
						
						
					 
					
						2003-07-08 12:03:46 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a3fe7c0959 
					 
					
						
						
							
							Remove compiler warnings  
						
						 
						
						... 
						
						
						
						Simple cleanup of previous pull 
						
						
					 
					
						2003-07-04 23:06:19 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						1d20b23247 
					 
					
						
						
							
							Bug fixes for authentication  
						
						 
						
						... 
						
						
						
						OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions. 
						
						
					 
					
						2003-07-04 20:52:04 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						d209cf70f8 
					 
					
						
						
							
							More code was reused  
						
						 
						
						
						
						
					 
					
						2003-07-04 20:19:07 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3fbc765b04 
					 
					
						
						
							
							Better arguments format to allow reuse more code  
						
						 
						
						
						
						
					 
					
						2003-07-04 19:56:32 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						0c2041cfdf 
					 
					
						
						
							
							New methods  
						
						 
						
						... 
						
						
						
						Item_func::agg_arg_collations()
  Item_func::arr_arg_collations_for_comparison()
 to aggregate argument collations.
It helps to reuse a lot of code. 
						
						
					 
					
						2003-07-04 18:12:23 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						fd4a1d4e54 
					 
					
						
						
							
							Fix for  #739  
						
						 
						
						... 
						
						
						
						check for negative count in RPAD added 
						
						
					 
					
						2003-07-03 23:24:23 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						eb7ab936bf 
					 
					
						
						
							
							Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0  
						
						 
						
						... 
						
						
						
						into deer.(none):/home/hf/work/mysql-4.0.628 
						
						
					 
					
						2003-07-03 16:50:17 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						74b74ad5e7 
					 
					
						
						
							
							There is no Item->binary() anymore. It was remain from 4.0.  
						
						 
						
						
						
						
					 
					
						2003-07-02 18:34:43 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kostja@oak.local 
							
						 
					 
					
						
						
							
						
						7df0475847 
					 
					
						
						
							
							First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1)  
						
						 
						
						... 
						
						
						
						For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 
- password.c: new functions were implemented, old rolled back to 4.0 state
- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)
- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)
- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)
- mysqladmin.c was fixed to work correctly with new passwords
Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary. 
						
						
					 
					
						2003-07-01 23:40:59 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						9fb7e863ad 
					 
					
						
						
							
							Optimized old patches  
						
						 
						
						... 
						
						
						
						Don't set field to DEFAULT value when set to NULL 
						
						
					 
					
						2003-07-01 14:38:38 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						5dab55de73 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.0  
						
						 
						
						... 
						
						
						
						into mashka.mysql.fi:/home/my/mysql-4.0 
						
						
					 
					
						2003-07-01 13:30:55 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						65335d37ff 
					 
					
						
						
							
							New messages for 3-adic and N-adic operations  
						
						 
						
						... 
						
						
						
						REPLACE() now processed arguments collations according to standard 
						
						
					 
					
						2003-06-26 15:45:04 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7655f05dc2 
					 
					
						
						
							
							LEFT JOIN optimization: Change LEFT JOIN to normal join if possible  
						
						 
						
						
						
						
					 
					
						2003-06-26 05:38:19 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c6c4e8b8e1 
					 
					
						
						
							
							LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()  
						
						 
						
						... 
						
						
						
						now process arguments according to standard SQL collation determation
rules. 
						
						
					 
					
						2003-06-25 15:07:20 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						cb4539e8de 
					 
					
						
						
							
							String comparison functions now use the same DTCollation with  
						
						 
						
						... 
						
						
						
						CONCAT() and other string functions. This allows to reuse a lot
if code and to simplify further development. 
						
						
					 
					
						2003-06-24 17:12:07 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						7371150f2d 
					 
					
						
						
							
							New class DTCollation (SQL:2003 calls it "declared type collation")  
						
						 
						
						... 
						
						
						
						It's a combination of collation and its derivation (precedence order) 
						
						
					 
					
						2003-06-24 15:11:07 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						b24fd86a91 
					 
					
						
						
							
							Fix for bug  #628  
						
						 
						
						
						
						
					 
					
						2003-06-21 20:17:50 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						27c67fbfe7 
					 
					
						
						
							
							Fix for bug  #666  (Nice number, yeah?)  
						
						 
						
						
						
						
					 
					
						2003-06-20 20:04:52 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						8f4794822f 
					 
					
						
						
							
							Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1  
						
						 
						
						... 
						
						
						
						into mysql.com:/space/my/mysql-4.1 
						
						
					 
					
						2003-06-19 12:19:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lenz@kallisto.local 
							
						 
					 
					
						
						
							
						
						1908cc62b6 
					 
					
						
						
							
							- revert wrong include of zlib.h as zlib is not part of the source  
						
						 
						
						... 
						
						
						
						distribution - better use -I../zlib where appropriate (usually we use
   the zlib installed in the system) 
						
						
					 
					
						2003-06-19 12:18:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						ebb88ec6ea 
					 
					
						
						
							
							LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations  
						
						 
						
						
						
						
					 
					
						2003-06-19 13:12:55 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						69af692a5c 
					 
					
						
						
							
							These functions now return a result of proper collation:  
						
						 
						
						... 
						
						
						
						BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE 
						
						
					 
					
						2003-06-19 11:36:44 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5b9db52966 
					 
					
						
						
							
							Function INSERT() now works according to coercibility rules  
						
						 
						
						... 
						
						
						
						Test for INSERT() has been added 
						
						
					 
					
						2003-06-10 16:41:42 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3d08cfecd4 
					 
					
						
						
							
							Some more functions work according to coercibility now:  
						
						 
						
						... 
						
						
						
						repeat, reverse, quote, soundex, substring
Test func_str has been extended to check them 
						
						
					 
					
						2003-06-10 14:54:03 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						7a54334443 
					 
					
						
						
							
							Merge with 4.0.13  
						
						 
						
						
						
						
					 
					
						2003-06-05 17:33:38 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jani@ua126d19.elisa.omakaista.fi 
							
						 
					 
					
						
						
							
						
						4b55fbe092 
					 
					
						
						
							
							Fixed a bug in concat_ws(), which did not add concat separator  
						
						 
						
						... 
						
						
						
						in case of an empty string. Bug ID 586. 
						
						
					 
					
						2003-06-05 15:06:19 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						1ef8b2e34a 
					 
					
						
						
							
							LTRIM, RTRIM and TRIM now honors coercibility  
						
						 
						
						... 
						
						
						
						LTRIM, RTRIM and TRIM now work fine with ucs2 
						
						
					 
					
						2003-06-03 16:57:14 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						759214fa41 
					 
					
						
						
							
							MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)  
						
						 
						
						... 
						
						
						
						Some default_charset_info were removed 
						
						
					 
					
						2003-06-03 14:59:17 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						a36d4212fc 
					 
					
						
						
							
							Moved spatial functions to the sql/item_geofunc.cc file.  
						
						 
						
						
						
						
					 
					
						2003-05-30 15:22:34 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8192d169a2 
					 
					
						
						
							
							CHARSET_INFO structure reorganization for easier maintainance  
						
						 
						
						
						
						
					 
					
						2003-05-23 17:45:52 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8514caa1da 
					 
					
						
						
							
							CREATE TABLE t1 SELECT left(_latin2'a',1)  didn't work, the charset got lost  
						
						 
						
						... 
						
						
						
						Collation and coercibility tests for string functions 
						
						
					 
					
						2003-05-23 11:32:35 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						ff02bddc1a 
					 
					
						
						
							
							Automatic conversion into supersets (utf8, ucs2) for comparison in some cases  
						
						 
						
						... 
						
						
						
						USER(), DATABASE() and VERSION() return in utf8 now 
						
						
					 
					
						2003-05-23 10:45:46 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						cb7061ebe4 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2003-05-22 02:57:27 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6aa8929cf3 
					 
					
						
						
							
							After merge fixes  
						
						 
						
						... 
						
						
						
						Added initialization of all important global variables 
						
						
					 
					
						2003-05-21 21:39:58 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5b788e660a 
					 
					
						
						
							
							A separate, better error message when it's impossible to aggregate strings for some operation  
						
						 
						
						
						
						
					 
					
						2003-05-20 16:36:59 +05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						dd2b7918cd 
					 
					
						
						
							
							Merge with 4.0.13  
						
						 
						
						
						
						
					 
					
						2003-05-19 16:35:49 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						da0e28b7d6 
					 
					
						
						
							
							Proper replication of CONNECTION_ID() and 4.1 PASSWORD() (bugs 177 and 344),  
						
						 
						
						... 
						
						
						
						new test for this. 
						
						
					 
					
						2003-05-13 22:50:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						4bde719df7 
					 
					
						
						
							
							Safety fix to enable RAID in max binaries  
						
						 
						
						... 
						
						
						
						Better fix for format('nan')
Fix for HAVING COUNT(DISTINCT...) 
						
						
					 
					
						2003-05-13 10:54:07 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						ee8190f293 
					 
					
						
						
							
							Merge  
						
						 
						
						
						
						
					 
					
						2003-05-02 15:22:04 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						8cf4e72923 
					 
					
						
						
							
							Fixed bug in Item_func_compress::val_str() on MacOS X (bigendian); the length  
						
						 
						
						... 
						
						
						
						was not properly stored in the buffer. 
						
						
					 
					
						2003-04-30 13:10:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						b086445181 
					 
					
						
						
							
							merge fix  
						
						 
						
						
						
						
					 
					
						2003-04-29 14:35:10 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						51eed4b48c 
					 
					
						
						
							
							Fix for openssl on Solaris  
						
						 
						
						... 
						
						
						
						Fix for grant bug with SELECT * 
						
						
					 
					
						2003-04-28 10:32:56 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						bf6cfd2948 
					 
					
						
						
							
							Fix for -fbranch-probabilites (bug 268)  
						
						 
						
						... 
						
						
						
						Fix for LEFT/RIGHT/MID with multi-byte-character sets (bug 314)
Fix for new bison 1.875
max_insert_delayed_threads and delayed_insert_timeout now works as documented (bug 211)
Don't show port in SHOW PROCESSLIST for system threads
Fix problem with ORDER BY being discarded for some DISTINCT queries (bug 275)
Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
using many joined tables (Bug 212) 
						
						
					 
					
						2003-04-26 20:43:28 +03:00