monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						a7708c7904 
					 
					
						
						
							
							Merge with 4.0  
						
						
						
						
					 
					
						2003-04-03 21:19:12 +03:00 
						 
				 
			
				
					
						
							
							
								jani@hynda.(none) 
							
						 
					 
					
						
						
							
						
						75015595b1 
					 
					
						
						
							
							Fixed a bug when printing error messages. stdout and stderr were  
						
						... 
						
						
						
						mixed wrongly sometimes. 
						
						
					 
					
						2003-04-03 19:55:37 +03:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						0002beb7a4 
					 
					
						
						
							
							my_strncasecmp() is not used anymore. Use my_strncoll() instead.  
						
						
						
						
					 
					
						2003-04-01 14:17:28 +05:00 
						 
				 
			
				
					
						
							
							
								greg@mysql.com 
							
						 
					 
					
						
						
							
						
						080b73ee18 
					 
					
						
						
							
							Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches  
						
						
						
						
					 
					
						2003-03-28 14:24:32 -05:00 
						 
				 
			
				
					
						
							
							
								greg@mysql.com 
							
						 
					 
					
						
						
							
						
						67985efed5 
					 
					
						
						
							
							Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC  
						
						
						
						
					 
					
						2003-03-21 16:45:39 -05:00 
						 
				 
			
				
					
						
							
							
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						3d090552da 
					 
					
						
						
							
							Fixed a bug in comment handling.  
						
						
						
						
					 
					
						2003-03-21 14:14:36 +02:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						b883a9c01c 
					 
					
						
						
							
							Merge with 4.0.12  
						
						
						
						
					 
					
						2003-03-19 22:25:44 +02:00 
						 
				 
			
				
					
						
							
							
								jani@hynda.(none) 
							
						 
					 
					
						
						
							
						
						5eddd40bc9 
					 
					
						
						
							
							Fixed a bug in --one-database.  
						
						
						
						
					 
					
						2003-03-17 15:50:56 +02:00 
						 
				 
			
				
					
						
							
							
								root@home.(none) 
							
						 
					 
					
						
						
							
						
						1daed63ed8 
					 
					
						
						
							
							mysqltest.c, mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:  
						
						... 
						
						
						
						system_charset_info was removed 
						
						
					 
					
						2003-03-16 11:20:45 +04:00 
						 
				 
			
				
					
						
							
							
								root@home.(none) 
							
						 
					 
					
						
						
							
						
						f71a7e4b05 
					 
					
						
						
							
							set_default_charset() is not used anymore  
						
						... 
						
						
						
						Some system_charset_info were removed 
						
						
					 
					
						2003-03-16 10:56:14 +04:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						eebc00a531 
					 
					
						
						
							
							A fix for mysql client program when use or connect were used  
						
						... 
						
						
						
						without arguments ... 
						
						
					 
					
						2003-03-12 21:43:40 +02:00 
						 
				 
			
				
					
						
							
							
								papa@gbichot.local 
							
						 
					 
					
						
						
							
						
						b9d94d2b6f 
					 
					
						
						
							
							Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.  
						
						... 
						
						
						
						Disabling can be safer when the server silently dies & restarts.
This is for SCRUM task #727 . 
						
						
					 
					
						2003-03-01 23:34:34 +01:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						8439a4949f 
					 
					
						
						
							
							merge fix  
						
						
						
						
					 
					
						2003-02-22 17:14:50 +02: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 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						c75fa953e3 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2003-02-13 15:16:00 +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 
							
						 
					 
					
						
						
							
						
						60556efaca 
					 
					
						
						
							
							Update lengths for fields in MYSQL_FIELD  
						
						
						
						
					 
					
						2003-02-08 01:00:35 +02:00 
						 
				 
			
				
					
						
							
							
								Sinisa@sinisa.nasamreza.org 
							
						 
					 
					
						
						
							
						
						e787b028d5 
					 
					
						
						
							
							a fix for mysql client  
						
						
						
						
					 
					
						2003-02-06 16:03:13 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						023d6dd39b 
					 
					
						
						
							
							Merge with 4.0.11  
						
						
						
						
					 
					
						2003-02-04 21:52:14 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						a9ee051a4d 
					 
					
						
						
							
							Fixed core dump bug in 'mysql' when using \p in prompt on Windows.  
						
						... 
						
						
						
						Fixed error when mysql_unix_port pointed to const string (not uncommon on windows) 
						
						
					 
					
						2003-02-02 05:13:09 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								vva@eagle.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						69b722d7d9 
					 
					
						
						
							
							changes for readline/libedit configuration  
						
						
						
						
					 
					
						2003-01-18 20:28:48 +04:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						8acc22296c 
					 
					
						
						
							
							Change client_flag to unsigned long (16 -> 32 bits) to handle more options.  
						
						... 
						
						
						
						Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows 
						
						
					 
					
						2003-01-18 16:39:21 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						96089e2b3a 
					 
					
						
						
							
							resolving conflicts  
						
						
						
						
					 
					
						2003-01-15 13:15:35 +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 
						 
				 
			
				
					
						
							
							
								miguel@hegel.br 
							
						 
					 
					
						
						
							
						
						f50abc4467 
					 
					
						
						
							
							Fix warnings and error VC++ compiler  
						
						
						
						
					 
					
						2003-01-04 01:19:17 -02:00 
						 
				 
			
				
					
						
							
							
								jani@dsl-kpogw4gb5.dial.inet.fi 
							
						 
					 
					
						
						
							
						
						ee8fa226e5 
					 
					
						
						
							
							Changed get_arg() so that it can be used to fetch more than  
						
						... 
						
						
						
						just one argument from command line.
Fixed a bug in interactive 'connect' command, which earlier
couldn't take quoted arguments.
How-to-repeat:
mysql> connect `stupid db` localhost 
						
						
					 
					
						2002-12-25 23:57:01 +02:00 
						 
				 
			
				
					
						
							
							
								jani@dsl-kpogw4gb5.dial.inet.fi 
							
						 
					 
					
						
						
							
						
						a684fa70ed 
					 
					
						
						
							
							mysql multiline comment, by Sergey Gluhov.  
						
						
						
						
					 
					
						2002-12-24 00:53:07 +02:00 
						 
				 
			
				
					
						
							
							
								hf@deer.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						e3b3b68307 
					 
					
						
						
							
							Big purge about embedded library (scrum)  
						
						
						
						
					 
					
						2002-12-16 17:33:29 +04:00 
						 
				 
			
				
					
						
							
							
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						8f75c90df1 
					 
					
						
						
							
							Fixed a bug in mysql 'use' command. 'use' can now take quoted arguments.  
						
						
						
						
					 
					
						2002-12-11 16:03:50 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						eb49d011e6 
					 
					
						
						
							
							mysql.cc has to support older readline to compile on FreeBSD :((  
						
						
						
						
					 
					
						2002-11-26 14:03:25 +01:00 
						 
				 
			
				
					
						
							
							
								vva@genie.(none) 
							
						 
					 
					
						
						
							
						
						5aabbf55a9 
					 
					
						
						
							
							upgrade readline to version 4.3  
						
						
						
						
					 
					
						2002-11-19 18:26:53 +04:00 
						 
				 
			
				
					
						
							
							
								wax@mysql.com 
							
						 
					 
					
						
						
							
						
						e91d1b2cbe 
					 
					
						
						
							
							Add shared memory protocol and option --protocol  
						
						
						
						
					 
					
						2002-11-15 00:16:30 +05:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						95ffd436a6 
					 
					
						
						
							
							Fixes for fault about String::copy()  
						
						
						
						
					 
					
						2002-11-10 14:05:17 +04:00 
						 
				 
			
				
					
						
							
							
								vva@genie.(none) 
							
						 
					 
					
						
						
							
						
						9adf688be6 
					 
					
						
						
							
							add help command on server side  
						
						
						
						
					 
					
						2002-10-28 17:44:19 +04:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						fbf6ab4465 
					 
					
						
						
							
							merge with 4.0.5  
						
						
						
						
					 
					
						2002-10-16 19:30:24 +03:00 
						 
				 
			
				
					
						
							
							
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						4143937723 
					 
					
						
						
							
							Fixed some bugs in mysql, mysqladmin and mysqld.  
						
						
						
						
					 
					
						2002-10-15 23:34:55 +03:00 
						 
				 
			
				
					
						
							
							
								monty@hundin.mysql.fi 
							
						 
					 
					
						
						
							
						
						a975cecf42 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2002-10-14 17:50:44 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mysql.com 
							
						 
					 
					
						
						
							
						
						fcb8bc061d 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2002-10-14 11:36:48 +00:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						3c7f6a9835 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2002-10-14 12:07:16 +03:00 
						 
				 
			
				
					
						
							
							
								bar@bar.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						50c391538a 
					 
					
						
						
							
							my_sortcmp -> my_strnncoll  
						
						
						
						
					 
					
						2002-10-09 16:33:35 +05:00 
						 
				 
			
				
					
						
							
							
								monty@narttu.mysql.fi 
							
						 
					 
					
						
						
							
						
						da2abaf887 
					 
					
						
						
							
							Portability fixes to be able to compile MySQL with VC++  
						
						
						
						
					 
					
						2002-10-08 22:28:24 +03:00 
						 
				 
			
				
					
						
							
							
								jani@rhols221.adsl.netsonic.fi 
							
						 
					 
					
						
						
							
						
						d4fc18bf5f 
					 
					
						
						
							
							Small fixes in mysql and myisampack  
						
						
						
						
					 
					
						2002-10-04 17:18:41 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						0f39457613 
					 
					
						
						
							
							Merge with 4.0.4  
						
						
						
						
					 
					
						2002-10-02 17:55:12 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mashka.mysql.fi 
							
						 
					 
					
						
						
							
						
						d69250a969 
					 
					
						
						
							
							Fixes and code cleanups after merge with 4.0.3  
						
						... 
						
						
						
						Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22 
						
						
					 
					
						2002-10-02 13:33:08 +03:00