venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						24d5cd37d2 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into myvenu.com:/home/venu/work/sql/dev-4.1 
						
						
					 
					
						2003-04-12 20:07:52 -07: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 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8cf9ada977 
					 
					
						
						
							
							Use of CHARSWT_INFO *result_collation  
						
						... 
						
						
						
						instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests 
						
						
					 
					
						2003-04-08 14:38:17 +05:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e165845d39 
					 
					
						
						
							
							sys_var_collation is now abstract class  
						
						... 
						
						
						
						Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables. 
						
						
					 
					
						2003-04-07 16:10:27 +05:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e0caf3f225 
					 
					
						
						
							
							New methods to store strings with "convert to" argimument  
						
						
						
						
					 
					
						2003-04-07 13:52:48 +05:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						06f075888e 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into myvenu.com:/home/venu/work/sql/dev-4.1 
						
						
					 
					
						2003-04-04 13:25:53 -05:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						8eeecd9c86 
					 
					
						
						
							
							Fix to support update + bianry logs with prepared statements (Dynamic query)  
						
						
						
						
					 
					
						2003-04-04 12:33:17 -05:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						736e78251e 
					 
					
						
						
							
							Merging 4.1 to 5.0.  
						
						
						
						
					 
					
						2003-04-04 13:45:35 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						4a4838059f 
					 
					
						
						
							
							Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT)  
						
						
						
						
					 
					
						2003-04-03 21:19:14 +03:00 
						 
				 
			
				
					
						
							
							
								wax@kishkin.ru 
							
						 
					 
					
						
						
							
						
						8c0de640e3 
					 
					
						
						
							
							resolve new updates group_concat  
						
						
						
						
					 
					
						2003-04-02 19:16:19 +06:00 
						 
				 
			
				
					
						
							
							
								wax@kishkin.ru 
							
						 
					 
					
						
						
							
						
						77eb790ec5 
					 
					
						
						
							
							SCRUM  
						
						... 
						
						
						
						correct sql_alloc, ORDER BY and NULL value in group_concat
add comments
move test msg_arg
add test on NULL 
						
						
					 
					
						2003-04-02 17:55:53 +06: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 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						c77699ca93 
					 
					
						
						
							
							Merged 4.1 into 5.0.  
						
						
						
						
					 
					
						2003-03-27 12:09:11 +01:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4532985221 
					 
					
						
						
							
							New variable to turn off automatic charset conversion of query results  
						
						... 
						
						
						
						Some speed improvements 
						
						
					 
					
						2003-03-21 15:18:52 +04:00 
						 
				 
			
				
					
						
							
							
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						d00b3ba511 
					 
					
						
						
							
							Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into genie.(none):/home/hf/work/mysql-5.0.kil 
						
						
					 
					
						2003-03-21 10:06:04 +04:00 
						 
				 
			
				
					
						
							
							
								hf@genie.(none) 
							
						 
					 
					
						
						
							
						
						dd49c33f20 
					 
					
						
						
							
							SCRUM  
						
						... 
						
						
						
						two versions of KILL implementation 
						
						
					 
					
						2003-03-21 09:37:01 +04:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						9f200ede0d 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into narttu.mysql.fi:/my/mysql-4.1 
						
						
					 
					
						2003-03-20 02:06:08 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						48a9c1239c 
					 
					
						
						
							
							Added support for ULONG division with DIV  
						
						... 
						
						
						
						Fixed non fatal memory leak in slave code. 
						
						
					 
					
						2003-03-19 21:23:13 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						4a171efd6f 
					 
					
						
						
							
							Merged 4.1 -> 5.0.  
						
						
						
						
					 
					
						2003-03-18 16:12:50 +01:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8103c4c537 
					 
					
						
						
							
							CONVERT class was removed  
						
						
						
						
					 
					
						2003-03-18 17:01:32 +04:00 
						 
				 
			
				
					
						
							
							
								wax@kishkin.ru 
							
						 
					 
					
						
						
							
						
						12f1cb55b5 
					 
					
						
						
							
							This is full commit of group_concat with support subselects  
						
						
						
						
					 
					
						2003-03-18 04:07:40 +05:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						e7288f279e 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Don't create temporary objects with no table name 
						
						
					 
					
						2003-03-17 15:05:04 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a434bca704 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2003-03-16 19:17:54 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						77eb6e5063 
					 
					
						
						
							
							Better fix for "Halloween" effect ...  
						
						
						
						
					 
					
						2003-03-12 17:11:48 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						40c744a3ac 
					 
					
						
						
							
							A  bug fix for multi-table updates with InnoDB storage engine  
						
						
						
						
					 
					
						2003-03-11 19:40:49 +02:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						3d61d2d973 
					 
					
						
						
							
							Conflicts relsolving  
						
						
						
						
					 
					
						2003-03-11 16:32:17 +04:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e7f4bf5b27 
					 
					
						
						
							
							Added 'PURGE LOGS BEFORE' command  
						
						... 
						
						
						
						Added expire-logs-days option 
						
						
					 
					
						2003-03-11 13:49:06 +04:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						6897b00216 
					 
					
						
						
							
							--new option and local variable to optionally turn on  
						
						... 
						
						
						
						"very new functions" - for now 4.1-compatible TIMESTAMT format 
						
						
					 
					
						2003-03-05 18:43:56 +01:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						4ffd74e5de 
					 
					
						
						
							
							Coercibility is now stored in user vars  
						
						
						
						
					 
					
						2003-03-03 13:16:39 +04:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						8049daf202 
					 
					
						
						
							
							Made FUNCTIONs work in insert and select queries, as well as nested function invocations.  
						
						... 
						
						
						
						Had to add a cahing mechanism which is in parts an ugly kludge, but it will be
reworked once the real SP caching is implemented. 
						
						
					 
					
						2003-03-02 19:17:41 +01:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						47b16dae7a 
					 
					
						
						
							
							posreview changing (SCRUM)  
						
						... 
						
						
						
						increased compatibility
postmerge changing 
						
						
					 
					
						2003-02-27 20:31:54 +02:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						2be430da8e 
					 
					
						
						
							
							sql_class.h:  
						
						... 
						
						
						
						New method to simplify access to thd charset 
						
						
					 
					
						2003-02-26 14:50:59 +04:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						dd7ecee561 
					 
					
						
						
							
							Merge vkishkin@work.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/wax/mysql-4n 
						
						
					 
					
						2003-02-24 23:54:58 +05:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						ee2b888696 
					 
					
						
						
							
							Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM  
						
						
						
						
					 
					
						2003-02-20 14:14:37 -08:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						45ada60304 
					 
					
						
						
							
							add option default-week-format and variable default_week_format  
						
						... 
						
						
						
						(SCRUM) 
						
						
					 
					
						2003-02-19 17:05:35 +05:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						97dc6a528e 
					 
					
						
						
							
							Merging 4.1 into 5.0  
						
						
						
						
					 
					
						2003-02-18 15:05:35 +01:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						352a338147 
					 
					
						
						
							
							client port number added to SHOW PROCESSLIST (SCRUM?)  
						
						
						
						
					 
					
						2003-02-17 22:07:26 +02:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						2022b7b68f 
					 
					
						
						
							
							SCRUM: 'Replication: PURGE LOGS with date' task  
						
						... 
						
						
						
						Added:
PURGE [MASTER] LOGS BEFORE date/date_expression
expire-logs-days option
  With this option old files are deleted when
      - mysqld is started
      - log is rotated
      - someone does FLUSH LOGS 
						
						
					 
					
						2003-02-16 20:39:12 +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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						291f8a225a 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/work-select-4.1 
						
						
					 
					
						2003-02-02 17:39:27 +02:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						8d3c43880d 
					 
					
						
						
							
							conflicts resolving  
						
						
						
						
					 
					
						2003-01-31 09:43:53 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						e294751c41 
					 
					
						
						
							
							fixed bug in determinating uncacheable queries  
						
						... 
						
						
						
						new fatal_error interface to assign is_fatal_error and ne.report_error
commant about Item_row 
						
						
					 
					
						2003-01-30 22:15:44 +02:00 
						 
				 
			
				
					
						
							
							
								gluh@gluh.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						57a805de6c 
					 
					
						
						
							
							'Replicate user variables' task  
						
						
						
						
					 
					
						2003-01-30 21:39:54 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						2f04313db5 
					 
					
						
						
							
							Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1  
						
						... 
						
						
						
						into sanja.is.com.ua:/home/bell/mysql/work-select-4.1 
						
						
					 
					
						2003-01-30 18:19:28 +02:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						5ed5dac01b 
					 
					
						
						
							
							cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation  
						
						
						
						
					 
					
						2003-01-30 14:35:07 +02:00 
						 
				 
			
				
					
						
							
							
								venu@myvenu.com 
							
						 
					 
					
						
						
							
						
						7e09f1db4b 
					 
					
						
						
							
							Fix 'n' concurrent prepared executions  
						
						
						
						
					 
					
						2003-01-30 00:38:11 -08:00