ndbdev@dl145c.mysql.com 
							
						 
					 
					
						
						
							
						
						f0f8b0a97b 
					 
					
						
						
							
							Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1 
						
						
					 
					
						2005-05-20 06:25:02 +02:00 
						 
				 
			
				
					
						
							
							
								reggie@mdk10.(none) 
							
						 
					 
					
						
						
							
						
						9a1daa6957 
					 
					
						
						
							
							Merge mdk10.(none):/home/reggie/bk/mysql-4.1  
						
						... 
						
						
						
						into mdk10.(none):/home/reggie/bk/mysql-5.0 
						
						
					 
					
						2005-05-19 15:50:44 -05:00 
						 
				 
			
				
					
						
							
							
								reggie@mdk10.(none) 
							
						 
					 
					
						
						
							
						
						b5a60fe2a8 
					 
					
						
						
							
							This fixed a compile problem on Windows  
						
						... 
						
						
						
						sql_udf.cc:
  changed dl_name to udf->dl in mysql_create_function 
						
						
					 
					
						2005-05-19 15:18:49 -05:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						23a59c9857 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2005-05-19 15:20:10 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						541ff258bf 
					 
					
						
						
							
							after merge fix  
						
						
						
						
					 
					
						2005-05-19 09:47:13 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8044488d7c 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2005-05-18 22:14:08 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						50d369bb43 
					 
					
						
						
							
							udf: when banning paths from soname in CREATE FUNCTION, check for \ on windows.  
						
						... 
						
						
						
						when reporting an error, use an appropriate buffer for udf->name 
						
						
					 
					
						2005-05-18 21:31:39 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						f7cd6b8aa1 
					 
					
						
						
							
							WL 1682: After review fixes + update bitvector class + bitvector test  
						
						... 
						
						
						
						cases + bug fixes 
						
						
					 
					
						2005-05-02 15:45:33 +02:00 
						 
				 
			
				
					
						
							
							
								mronstrom@mysql.com 
							
						 
					 
					
						
						
							
						
						21347433cf 
					 
					
						
						
							
							WL 1682: Use bitvector instead of query_id to tell handler which fields  
						
						... 
						
						
						
						to read and write
Changed Server code, added new interface to handler and changed the
NDB handler, InnoDB handler and Federated handler that previously used
query_id
Bug#10202 fix (one-liner fix for memory leak) 
						
						
					 
					
						2005-04-28 14:45:27 +02:00 
						 
				 
			
				
					
						
							
							
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						dcc40a080d 
					 
					
						
						
							
							Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1  
						
						... 
						
						
						
						into xiphis.org:/var/db/bk/work-acurtis/bug6776.2 
						
						
					 
					
						2005-04-09 00:36:08 +01:00 
						 
				 
			
				
					
						
							
							
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						0998ec4264 
					 
					
						
						
							
							Fix typos in Bug#6776  
						
						
						
						
					 
					
						2005-04-09 00:21:51 +01:00 
						 
				 
			
				
					
						
							
							
								acurtis@xiphis.org 
							
						 
					 
					
						
						
							
						
						e82edda6c6 
					 
					
						
						
							
							Merge xiphis.org:/var/db/bk/work-acurtis/bug6776  
						
						... 
						
						
						
						into xiphis.org:/var/db/bk/work-acurtis/bug6776.1 
						
						
					 
					
						2005-04-08 21:40:50 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						dd4db08438 
					 
					
						
						
							
							Code cleanups during review of pushed code  
						
						
						
						
					 
					
						2005-03-15 16:07:28 +02:00 
						 
				 
			
				
					
						
							
							
								acurtis@pcgem.rdg.cyberkinetica.com 
							
						 
					 
					
						
						
							
						
						5eb393973f 
					 
					
						
						
							
							Bug#6776  
						
						... 
						
						
						
						Failure to delete rows from mysql.func table caused by missing
  charset conversion for index read by pk. 
						
						
					 
					
						2005-03-07 13:37:10 +00:00 
						 
				 
			
				
					
						
							
							
								paul@frost.snake.net 
							
						 
					 
					
						
						
							
						
						e25a5877e0 
					 
					
						
						
							
							sql_udf.cc:  
						
						... 
						
						
						
						Comment changes: use standard style; fix grammar. 
						
						
					 
					
						2005-03-05 12:42:05 -06:00 
						 
				 
			
				
					
						
							
							
								ingo@mysql.com 
							
						 
					 
					
						
						
							
						
						212388bd3c 
					 
					
						
						
							
							Merge with after merge fix  
						
						
						
						
					 
					
						2005-03-04 11:37:45 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3de51f273b 
					 
					
						
						
							
							after merge fixes  
						
						
						
						
					 
					
						2005-03-03 23:57:48 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e47d0a0e2d 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-03-03 23:07:20 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8d9a53a78c 
					 
					
						
						
							
							Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)  
						
						
						
						
					 
					
						2005-03-03 19:51:29 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						d35140a851 
					 
					
						
						
							
							First stage of table definition cache  
						
						... 
						
						
						
						Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name 
						
						
					 
					
						2005-01-06 13:00:13 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						7210195f1e 
					 
					
						
						
							
							now my_printf_error is not better then my_error, but my_error call is shorter  
						
						... 
						
						
						
						used only one implementation of format parser of (printf)
fixed multistatement 
						
						
					 
					
						2004-11-13 19:35:51 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1555469b64 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2004-11-12 15:36:31 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						31f7811183 
					 
					
						
						
							
							post-review fixes  
						
						
						
						
					 
					
						2004-11-12 14:34:00 +02: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 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						62c2f1c161 
					 
					
						
						
							
							sql_print_error cleanup  
						
						
						
						
					 
					
						2004-09-04 20:17:09 +02:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e9341da7e7 
					 
					
						
						
							
							Fix for bug#1439 UDF Corruption  
						
						
						
						
					 
					
						2004-03-19 14:35:00 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						ce14578909 
					 
					
						
						
							
							Merge with 4.0.18  
						
						
						
						
					 
					
						2004-02-11 00:06:46 +01:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						7df839e757 
					 
					
						
						
							
							Added testing of pthread_key_delete (to fix compile problem on SCO) (Bug  #2461 )  
						
						... 
						
						
						
						DROP DATABASE now assumes RAID directories are in hex. (Bug #2627 )
Don't increment 'select_full_range' and similar statistics for EXPLAIN queries. (Bug #2506 )
Test in configure if pthread_key_delete() exists (to fix compile problem on SCO) (Bug #2461 ) 
						
						
					 
					
						2004-02-05 09:12:23 +01:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						2a9cd37cd6 
					 
					
						
						
							
							now all tables of query are locked in one place (including derived tables)  
						
						... 
						
						
						
						fixed BUG#2120 and other problem with EXPLAINing derived tables 
						
						
					 
					
						2004-02-01 15:30:32 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						461d1627b3 
					 
					
						
						
							
							merge with 4.0 for more memory allocation variables.  
						
						
						
						
					 
					
						2003-10-13 15:50:30 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						c95d142f8f 
					 
					
						
						
							
							Add new user variables for tuning memory usage:  
						
						... 
						
						
						
						query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization 
						
						
					 
					
						2003-10-11 22:00:24 +03:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						a2dbfaefa3 
					 
					
						
						
							
							SCRUM  
						
						... 
						
						
						
						embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea? 
						
						
					 
					
						2003-09-19 14:44:31 +05:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						60dd8a2c4f 
					 
					
						
						
							
							hanged UDF interface to use clear() instead of reset()  
						
						
						
						
					 
					
						2003-08-27 22:30:50 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						784fb81426 
					 
					
						
						
							
							INSERT ... UPDATE ... VALUES()  
						
						
						
						
					 
					
						2003-05-03 01:16:56 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5b50426f8f 
					 
					
						
						
							
							Some optimization in CHARSET_INFO:  
						
						... 
						
						
						
						We don't need separate hash_sort() and hash_caseup()
  We don't need tosort(). strnxfrm will do the same. 
						
						
					 
					
						2003-04-01 12:45:16 +05:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4e1cc32318 
					 
					
						
						
							
							sql_udf.cc, protocol.cc:  
						
						... 
						
						
						
						Less default_charset_info 
						
						
					 
					
						2003-02-26 14:08:31 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						e327393e9d 
					 
					
						
						
							
							Fixed a lot of wrong memory references as reported by valgrind  
						
						... 
						
						
						
						Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now. 
						
						
					 
					
						2003-02-12 21:55:37 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						25de9c19b2 
					 
					
						
						
							
							After merge fixes & remove compiler warnings  
						
						... 
						
						
						
						Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files 
						
						
					 
					
						2003-02-07 15:47:24 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						023d6dd39b 
					 
					
						
						
							
							Merge with 4.0.11  
						
						
						
						
					 
					
						2003-02-04 21:52:14 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						3d28913740 
					 
					
						
						
							
							Only write to the error log if --log-error is specified and --console is not specified  
						
						... 
						
						
						
						(On Windows --log-error is enabled by default) 
						
						
					 
					
						2003-01-28 20:56:35 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						689578a099 
					 
					
						
						
							
							Fixes for Netware  
						
						... 
						
						
						
						Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL 
						
						
					 
					
						2003-01-28 08:38:28 +02:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						d844f8d02d 
					 
					
						
						
							
							correct parameter of hash_search  
						
						
						
						
					 
					
						2003-01-28 03:28:06 +05:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						dfed401e69 
					 
					
						
						
							
							correct parameter of hash_result  
						
						... 
						
						
						
						(SCRUM) 
						
						
					 
					
						2003-01-26 07:00:01 +05:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						aeff9672f2 
					 
					
						
						
							
							change structure of udf_func and parameter of functions mysql_drop_func and add_func (SCRUM)  
						
						
						
						
					 
					
						2003-01-09 18:09:21 +05:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						d40eb0dfac 
					 
					
						
						
							
							Change locks in sql_udf.cc to rw_locks (SCRUM)  
						
						
						
						
					 
					
						2002-12-31 16:58:41 +05:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						859b688476 
					 
					
						
						
							
							Merge with 4.0.6  
						
						
						
						
					 
					
						2002-12-05 19:38:42 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						fc06433a69 
					 
					
						
						
							
							Removed copying of parameters as this leads to memory leaks in embedded server.  
						
						... 
						
						
						
						Fixed 'not initialized' memory error. 
						
						
					 
					
						2002-12-05 03:40:33 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						dac6498f9b 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2002-11-21 15:56:48 +02:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						aa4e165808 
					 
					
						
						
							
							Portability fix extern "C" static -> extern "C"  
						
						
						
						
					 
					
						2002-11-07 12:49:02 +02:00 
						 
				 
			
				
					
						
							
							
								monty@butch. 
							
						 
					 
					
						
						
							
						
						a2bdf9265f 
					 
					
						
						
							
							Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.  
						
						
						
						
					 
					
						2002-11-07 03:54:00 +02:00