bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7eae926e26 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0 
						
						
					 
					
						2004-11-06 12:46:46 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						064b02203f 
					 
					
						
						
							
							new lock for multiupdate:  
						
						... 
						
						
						
						- open and create derived tables
- detect which tables should be locked for write
- lock and fill derived tables
some unitialized variables fixed 
						
						
					 
					
						2004-11-05 17:29:47 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						071001950e 
					 
					
						
						
							
							Merge with 4.1 to get in latest bug fixes  
						
						
						
						
					 
					
						2004-11-04 15:06:24 +02:00 
						 
				 
			
				
					
						
							
							
								lars@mysql.com 
							
						 
					 
					
						
						
							
						
						485de9cbb7 
					 
					
						
						
							
							Fix for bug#5551 (Version 4).  
						
						... 
						
						
						
						The idea of the fix is that the administrative statements 
OPTIMIZE TABLE, REPAIR TABLE and ANALYZE TABLE should not 
generate binlog errors if there is no errors on the master. 
						
						
					 
					
						2004-11-03 18:23:58 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7d3be517a4 
					 
					
						
						
							
							Merge on pull  
						
						
						
						
					 
					
						2004-11-03 13:01:38 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						47bbf768d4 
					 
					
						
						
							
							Fixes after merge with 4.1  
						
						... 
						
						
						
						FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete 
						
						
					 
					
						2004-11-03 12:39:38 +02:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4c65a9447e 
					 
					
						
						
							
							WL#1437 :don't create new users with GRANT  
						
						
						
						
					 
					
						2004-11-02 17:45:26 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						afbe601302 
					 
					
						
						
							
							merge with 4.1  
						
						
						
						
					 
					
						2004-10-29 19:26:52 +03:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						7577c8bfc9 
					 
					
						
						
							
							A fix according to Monty's request:  
						
						... 
						
						
						
						"uint *errors" is now a non-optional parameter in String:copy()
and copy_and_convert(). 
						
						
					 
					
						2004-10-29 17:00:39 +05:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						4375e59901 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0/  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2004-10-28 21:22:15 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						dff05eb951 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-10-28 11:02:48 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3493f54a5e 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2004-10-27 19:52:41 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7698054d19 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2004-10-26 19:30:57 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						6fbc869d18 
					 
					
						
						
							
							A lot of fixes for prepared statements (PS):  
						
						... 
						
						
						
						New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb 
						
						
					 
					
						2004-10-26 19:30:01 +03:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						a18cee7a18 
					 
					
						
						
							
							Bug 6206: ENUMs are not case sensitive even if declared BINARY  
						
						... 
						
						
						
						The same problem with SET columns:
find_set() now executes find_type2() to do charset aware search,
instead of always using system_charset_info comparison. 
						
						
					 
					
						2004-10-26 13:17:37 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						6c4263edfb 
					 
					
						
						
							
							Reuse more code: two equal pieces for ENUM and SET where moved  
						
						... 
						
						
						
						into a function. 
						
						
					 
					
						2004-10-26 09:13:52 +05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3d389a038e 
					 
					
						
						
							
							fixed detection of updating table on which we select (BUG#6032)  
						
						
						
						
					 
					
						2004-10-25 17:32:28 +03:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						217d83a69f 
					 
					
						
						
							
							Bug#6202: ENUMs are not case sensitive even if declared BINARY  
						
						
						
						
					 
					
						2004-10-25 17:51:26 +05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d774e2c892 
					 
					
						
						
							
							removed unneed variable  
						
						
						
						
					 
					
						2004-10-24 11:54:58 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3abe558fa8 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0 
						
						
					 
					
						2004-10-24 11:32:08 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						0ddef9ecf8 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1 
						
						
					 
					
						2004-10-23 10:27:34 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						66124a5ec1 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1/  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-4.1 
						
						
					 
					
						2004-10-22 22:44:08 +02:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						796ccbf478 
					 
					
						
						
							
							Manual merge of fix for bug  #6081  "Call to deprecated mysql_create_db()  
						
						... 
						
						
						
						function crashes server" with main tree. 
						
						
					 
					
						2004-10-22 22:51:55 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						1e60c59102 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1/  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-4.1 
						
						
					 
					
						2004-10-22 20:34:25 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						123ce649b4 
					 
					
						
						
							
							added missing command names to command_name[] array  
						
						
						
						
					 
					
						2004-10-22 20:33:10 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						2c428ca09d 
					 
					
						
						
							
							Fixed BUG#6030: Stored procedure has no appropriate DROP privilege.  
						
						... 
						
						
						
						...and no ALTER privilege either.
  For now, only the definer and root can drop or alter an SP. 
						
						
					 
					
						2004-10-22 20:29:06 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						ebf8dc0da6 
					 
					
						
						
							
							Fixed BUG#6027: Stored procedures can be renamed.  
						
						... 
						
						
						
						Removed the support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway. 
						
						
					 
					
						2004-10-22 19:05:17 +02:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						2d5f423988 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-4.1-bg6081 
						
						
					 
					
						2004-10-22 20:59:00 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						a308981257 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-4.1 
						
						
					 
					
						2004-10-22 19:51:04 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e5f30a8375 
					 
					
						
						
							
							After merge fixes  
						
						
						
						
					 
					
						2004-10-22 19:50:31 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						fbdc20e0af 
					 
					
						
						
							
							Manual merge of fix for bug  #6081  "Call to deprecated mysql_create_db() function crashes  
						
						... 
						
						
						
						server" with main tree. 
						
						
					 
					
						2004-10-22 20:21:56 +04:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						0ea8f29186 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-4.1-tzfix 
						
						
					 
					
						2004-10-22 20:21:55 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						bd04041264 
					 
					
						
						
							
							Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1  
						
						
						
						
					 
					
						2004-10-22 18:46:35 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						3afecef4df 
					 
					
						
						
							
							Fix compiler warnings (detected by Intel's C++ compiler)  
						
						... 
						
						
						
						Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094 ) 
						
						
					 
					
						2004-10-22 18:44:51 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						6b6692dc4d 
					 
					
						
						
							
							Part of fix for bug  #6081  "Call to deprecated mysql_create_db() function  
						
						... 
						
						
						
						crashes server"
(in 4.0 we fix only connection stalling in case of error, crash itself is
fixed in 4.1, the test case for this code is also there). 
						
						
					 
					
						2004-10-22 19:27:43 +04:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						bd3d0f6cea 
					 
					
						
						
							
							sql_parse.cc:  
						
						... 
						
						
						
						Bug#6167 One element missing in 'uc_update_queries[]' 
						
						
					 
					
						2004-10-22 08:54:14 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						ed7b229a28 
					 
					
						
						
							
							added support of view and CHECK OPTION of view to LOAD DATA (BUG#5996)  
						
						
						
						
					 
					
						2004-10-21 21:53:27 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						e6a44b719a 
					 
					
						
						
							
							Fix for bug  #6116  "SET time_zone := ... requires access to  
						
						... 
						
						
						
						mysql.time_zone* tables".
We are excluding implicitly used time zone tables from privilege
checking. 
						
						
					 
					
						2004-10-21 22:18:00 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						318fe9db96 
					 
					
						
						
							
							smarter ALTER TABLE - don't copy the table if only comment or default values are changed  
						
						
						
						
					 
					
						2004-10-21 18:10:58 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d409547de4 
					 
					
						
						
							
							changed  function name to prevent injection wrong code from 4.1 (WL#2133)  
						
						
						
						
					 
					
						2004-10-20 16:06:54 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						a10ce662b4 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/dlenev/src/mysql-4.1-secfix 
						
						
					 
					
						2004-10-20 17:02:15 +04:00 
						 
				 
			
				
					
						
							
							
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						75d816627c 
					 
					
						
						
							
							Fix for bug  #6173  "One can circumvent missing UPDATE privilege if  
						
						... 
						
						
						
						he has SELECT and INSERT privileges for table with primary key"
Now we set lex->duplicates= DUP_UPDATE right in parser if INSERT has
ON DUPLICATE KEY UPDATE clause, this simplifies insert_precheck()
function (this also fixes a bug) and some other code. 
						
						
					 
					
						2004-10-20 16:04:43 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4714a6e744 
					 
					
						
						
							
							errors without code removed  
						
						... 
						
						
						
						net_printf/send_error calls replaced by my_error family functions
-1/1 (sent/unsent) error reporting removed
(WL#2133) 
						
						
					 
					
						2004-10-20 04:04:37 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						72fca68a1d 
					 
					
						
						
							
							fixed retsult code  
						
						
						
						
					 
					
						2004-10-19 11:54:33 +03:00 
						 
				 
			
				
					
						
							
							
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						b7a957d127 
					 
					
						
						
							
							Fix for bug  #6081  "Call to deprecated mysql_create_db() function crashes  
						
						... 
						
						
						
						server".
Altough mysql_create_db()/mysql_drop_db() API calls are deprecated
since 4.0, they should not crash server and should not stall connection
in case of errors. 
						
						
					 
					
						2004-10-17 13:59:46 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						57a85986ac 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mishka.local:/home/my/mysql-4.1 
						
						
					 
					
						2004-10-14 18:06:38 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						719c88e38f 
					 
					
						
						
							
							true,false -> TRUE, FALSE  
						
						... 
						
						
						
						Simple fixes/optimization of things discovered during review of new pushed code 
						
						
					 
					
						2004-10-14 18:03:46 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						6a749c8f58 
					 
					
						
						
							
							we can't rely on current variables implementation, so have to use String pointer returned by val_str  
						
						... 
						
						
						
						fixed handling errors in case of out of memory in SQL interfase of prepared statements 
						
						
					 
					
						2004-10-14 15:47:00 +03:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						9b2cc44e74 
					 
					
						
						
							
							Followup to Bug#5985: fixing one thing that went wrong.  
						
						
						
						
					 
					
						2004-10-14 03:37:20 +04:00 
						 
				 
			
				
					
						
							
							
								konstantin@mysql.com 
							
						 
					 
					
						
						
							
						
						5abc3de22b 
					 
					
						
						
							
							A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)"  
						
						... 
						
						
						
						crashes server." The fix makes Item_func_rand prepared-statements
aware plus it fixes the case when RAND is used in prepared
statements and replication is on (as well as several similar issues).
Until now we did not reset THD before every execution of a prepared
statement, so if some execution had set thd->time_zone_used
or thd->rand_used they would not be reset until next mysql_parse.
Some of post-review fixes done. 
						
						
					 
					
						2004-10-14 02:53:59 +04:00