Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						5dc8dbea5f 
					 
					
						
						
							
							merge fix  
						
						
						
						
					 
					
						2003-04-26 15:26:28 +03:00 
						 
				 
			
				
					
						
							
							
								igor@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						80615fade2 
					 
					
						
						
							
							Many files:  
						
						... 
						
						
						
						Added the MAX_LENGTH_FOR_SORT_DATA option
filesort.cc:
  Added the MAX_LENGTH_FOR_SORT_DATA option 
						
						
					 
					
						2003-04-24 14:33:33 +03:00 
						 
				 
			
				
					
						
							
							
								serg@sergbook.mysql.com 
							
						 
					 
					
						
						
							
						
						fa456991fa 
					 
					
						
						
							
							bug 283: FULLTEXT index on a TEXT filed converted to a CHAR field doesn't work anymore  
						
						
						
						
					 
					
						2003-04-23 15:44:39 +04:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						f79cabdc8f 
					 
					
						
						
							
							a fix for a crashing bug when attempting to create InnoDB table  
						
						... 
						
						
						
						with GEOMETRY field type. 
						
						
					 
					
						2003-04-08 20:39:50 +03:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						5d4e9f95f2 
					 
					
						
						
							
							Merging  
						
						
						
						
					 
					
						2003-04-08 19:43:24 +05:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						0428d08606 
					 
					
						
						
							
							SCRUM  
						
						... 
						
						
						
						two KILL versions
code trimming with headquarter's suggestions 
						
						
					 
					
						2003-04-08 19:18:33 +05:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						10957fb0f3 
					 
					
						
						
							
							One test case, one bug fix and one new feature  
						
						
						
						
					 
					
						2003-04-03 20:24:15 +03:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						654410a3d3 
					 
					
						
						
							
							Deprecated the update log (Sprint task  #792 ). Now --log-update  
						
						... 
						
						
						
						just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
is handled in two ways (see mysqld.cc for comments). 
						
						
					 
					
						2003-04-02 00:15:20 +02:00 
						 
				 
			
				
					
						
							
							
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						0ee0589e93 
					 
					
						
						
							
							Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into genie.(none):/home/hf/work/mysql-5.0.kil 
						
						
					 
					
						2003-03-31 13:42:37 +05:00 
						 
				 
			
				
					
						
							
							
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						f8f0b70380 
					 
					
						
						
							
							SCRUM  
						
						... 
						
						
						
						two KILL commands implementation (version 2) 
						
						
					 
					
						2003-03-31 13:39:46 +05:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						5dd970c335 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into narttu.mysql.fi:/my/mysql-4.1 
						
						
					 
					
						2003-03-17 15:06:06 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						caf31a0790 
					 
					
						
						
							
							Preparing to client<->server autoconvert  
						
						
						
						
					 
					
						2003-03-17 13:14:04 +04:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a434bca704 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2003-03-16 19:17:54 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						968e9a73d4 
					 
					
						
						
							
							merge with 3.23 to get:  
						
						... 
						
						
						
						- Fix for empty table/column names 
						
						
					 
					
						2003-03-15 04:41:57 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						5ee1dbbe58 
					 
					
						
						
							
							Check for empty table/column names  
						
						
						
						
					 
					
						2003-03-14 17:08:42 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						fae2711297 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-03-10 14:13:46 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d56e2acf50 
					 
					
						
						
							
							Merge to get fix for LOCK TABLES + DROP TABLE in another thread  
						
						
						
						
					 
					
						2003-03-07 01:20:56 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						21cc72bfe8 
					 
					
						
						
							
							Merge with 3.23 to get fix for deadlock when doing LOCK TABLES in one thread and DROP TABLE in another thread  
						
						
						
						
					 
					
						2003-03-04 13:36:59 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						8c51eb2c12 
					 
					
						
						
							
							Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another  
						
						
						
						
					 
					
						2003-03-03 20:42:49 +02:00 
						 
				 
			
				
					
						
							
							
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						2870719c70 
					 
					
						
						
							
							All segments of SPATIAL keys MUST be NOT NULL.  
						
						... 
						
						
						
						Allow NULL geometry fields. 
						
						
					 
					
						2003-02-26 20:25:48 +04:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e3579917da 
					 
					
						
						
							
							set_var.cc, sql_table.cc, handler.cc, field.cc:  
						
						... 
						
						
						
						Less default_charset_info 
						
						
					 
					
						2003-02-26 13:34:35 +04:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						9a46698e1e 
					 
					
						
						
							
							Merge with 4.0.11  
						
						
						
						
					 
					
						2003-02-26 01:03:47 +02:00 
						 
				 
			
				
					
						
							
							
								ram@mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						f4e1a2f292 
					 
					
						
						
							
							Forbid NULL geometry fields  
						
						
						
						
					 
					
						2003-02-25 11:45:32 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						e7715445f3 
					 
					
						
						
							
							ALTER TABLE closes all open HANDLER's for the table in question  
						
						... 
						
						
						
						fixed error handling in HANDLER ... READ FIRST 
						
						
					 
					
						2003-02-22 18:00:34 +01:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						7f21fb31b2 
					 
					
						
						
							
							DATABASE character set is never blank anymore  
						
						
						
						
					 
					
						2003-02-21 18:24:41 +04:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						d0f198ff5d 
					 
					
						
						
							
							sql_table.cc, field.cc:  
						
						... 
						
						
						
						Bug fix
opt_range.cc:
  Buf fix 
						
						
					 
					
						2003-02-17 16:47:48 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						90bf074438 
					 
					
						
						
							
							Merge with 4.0.11 tree to get latest bug fixes  
						
						
						
						
					 
					
						2003-02-17 05:43:37 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6051b2f998 
					 
					
						
						
							
							Fixed multi-table-delete for InnoDB tables  
						
						... 
						
						
						
						Novell patches 
						
						
					 
					
						2003-02-17 02:14:37 +02: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 
							
						 
					 
					
						
						
							
						
						48558055ed 
					 
					
						
						
							
							Move tmp_table_used to THD  
						
						... 
						
						
						
						Optimize depending sub querys
Remove valgrind warnings 
						
						
					 
					
						2003-02-10 17:59:16 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						023d6dd39b 
					 
					
						
						
							
							Merge with 4.0.11  
						
						
						
						
					 
					
						2003-02-04 21:52:14 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						b025fa8b32 
					 
					
						
						
							
							Fixed compilation error on windows  
						
						
						
						
					 
					
						2003-01-29 19:10:33 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						9199252c22 
					 
					
						
						
							
							Merge work:/home/bk/mysql-4.0  
						
						... 
						
						
						
						into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0 
						
						
					 
					
						2003-01-28 14:37:12 +01:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						4fb3244014 
					 
					
						
						
							
							fixed "DROP table_open_in_handler" hang  
						
						
						
						
					 
					
						2003-01-28 14:36:22 +01: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 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						44d8a8cdab 
					 
					
						
						
							
							merging  
						
						
						
						
					 
					
						2003-01-25 13:19:46 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						d56e23f64e 
					 
					
						
						
							
							fixed subselects with temporary tables (SCRUM)  
						
						... 
						
						
						
						fixed memory leacks 
						
						
					 
					
						2003-01-25 02:25:52 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9ec97f2c08 
					 
					
						
						
							
							fixed table invalidation in simple renaming  
						
						
						
						
					 
					
						2003-01-24 01:54:39 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						7436e9ec97 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2003-01-21 21:28:51 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						25c393a12e 
					 
					
						
						
							
							Portability fixes (for windows)  
						
						... 
						
						
						
						Some changes to the prepared statement protocol to make it easier to use and faster. 
						
						
					 
					
						2003-01-21 21:07:59 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						389680e04e 
					 
					
						
						
							
							Conflicts resolving  
						
						
						
						
					 
					
						2003-01-20 18:59:45 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						529e4a76c5 
					 
					
						
						
							
							Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1  
						
						
						
						
					 
					
						2003-01-18 19:31:37 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c66302c23b 
					 
					
						
						
							
							Superfluous prepare_for_resend bugfix  
						
						
						
						
					 
					
						2003-01-18 16:20:22 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						76f146a175 
					 
					
						
						
							
							Merge with 4.0.9  
						
						
						
						
					 
					
						2003-01-18 03:13:37 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f4b950df96 
					 
					
						
						
							
							Merge with 3.23  
						
						
						
						
					 
					
						2003-01-16 20:47:46 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						96089e2b3a 
					 
					
						
						
							
							resolving conflicts  
						
						
						
						
					 
					
						2003-01-15 13:15:35 +04:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						c59bff7c96 
					 
					
						
						
							
							SCRUM  
						
						... 
						
						
						
						embedded library trimming 
						
						
					 
					
						2003-01-15 12:11:44 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						1f6ecc0cd3 
					 
					
						
						
							
							Changed mysql-test to print warnings for not existing table to DROP TABLE  
						
						... 
						
						
						
						Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print() 
						
						
					 
					
						2003-01-06 01:48:59 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						f9772317ee 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-01-04 15:40:55 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						6d6f051178 
					 
					
						
						
							
							Added support for DROP TEMPORARY TABLE  
						
						... 
						
						
						
						Removed mysql_warnings() API function.
Post merge fixes. 
						
						
					 
					
						2003-01-04 15:37:20 +02:00