monty@mysql.com 
							
						 
					 
					
						
						
							
						
						62f3cd6a31 
					 
					
						
						
							
							Merge with 4.0 for 4.1 release  
						
						... 
						
						
						
						Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied 
						
						
					 
					
						2004-10-06 19:14:33 +03:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						5db0d20b88 
					 
					
						
						
							
							- Rename the *.cnf files to *.ini for the Windows source distribution  
						
						
						
						
					 
					
						2004-10-05 14:42:15 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mishka.local 
							
						 
					 
					
						
						
							
						
						be4ca46fbe 
					 
					
						
						
							
							More fixes for strict mode:  
						
						... 
						
						
						
						More tests.
Better error messages.
Fixed bug when checking if we updated all needed columns for INSERT.
Give an error if we encounter a wrong float value during parsing.
Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS.
Fixed UPDATE IGNORE when using STRICT mode. 
						
						
					 
					
						2004-10-02 22:20:08 +03:00 
						 
				 
			
				
					
						
							
							
								tomas@poseidon.(none) 
							
						 
					 
					
						
						
							
						
						5488f207db 
					 
					
						
						
							
							mysql_install_db should do skip-ndbcluster  
						
						... 
						
						
						
						set a printout in SocketClient only for debug 
						
						
					 
					
						2004-09-16 08:22:22 +00:00 
						 
				 
			
				
					
						
							
							
								patg@krsna.patg.net 
							
						 
					 
					
						
						
							
						
						78fa3aeff4 
					 
					
						
						
							
							another small change for bug 5531  
						
						
						
						
					 
					
						2004-09-14 14:10:29 -07:00 
						 
				 
			
				
					
						
							
							
								patg@krsna.patg.net 
							
						 
					 
					
						
						
							
						
						484d54b231 
					 
					
						
						
							
							fixed bug 5531  
						
						
						
						
					 
					
						2004-09-14 12:23:18 -07:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						3c239d0bec 
					 
					
						
						
							
							fixed privilege system upgrade script, to allow VIEW privileges for used who have CREATE privilege (BUG#5329)  
						
						
						
						
					 
					
						2004-09-11 18:46:06 +03:00 
						 
				 
			
				
					
						
							
							
								hf@deer.(none) 
							
						 
					 
					
						
						
							
						
						2eec5d460d 
					 
					
						
						
							
							Fix for bug #5396(libmysql depends on SSL)  
						
						... 
						
						
						
						Since libmysqld has libmysql's capabilities it needs lssl to compile 
						
						
					 
					
						2004-09-10 19:55:43 +05:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						413a8753e2 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2004-09-07 15:18:53 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						707def6fd0 
					 
					
						
						
							
							better fix for bug#5001  
						
						
						
						
					 
					
						2004-09-07 13:48:38 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						31122efde7 
					 
					
						
						
							
							Merge with 4.1  
						
						... 
						
						
						
						(Includes merge of arena code in 4.1 and 5.0) 
						
						
					 
					
						2004-09-06 15:14:10 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						9d8555c0f0 
					 
					
						
						
							
							Merge with 4.0 to get latest bug fixes  
						
						
						
						
					 
					
						2004-09-04 15:59:49 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						9153fd2ae4 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2004-09-03 22:12:27 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e66d0fa7d8 
					 
					
						
						
							
							add engine=MyISAM to all create table statements in  
						
						... 
						
						
						
						mysql_create_system_tables, just in case 
						
						
					 
					
						2004-09-03 17:20:00 +02:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						f37df2fdcc 
					 
					
						
						
							
							Bug#4338 mysql-test-run fails if compiled with non-latin1 character set  
						
						
						
						
					 
					
						2004-09-02 12:34:27 +05:00 
						 
				 
			
				
					
						
							
							
								patg@krsna.patg.net 
							
						 
					 
					
						
						
							
						
						54eac3b8d4 
					 
					
						
						
							
							Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0  
						
						... 
						
						
						
						into krsna.patg.net:/home/patg/mysql-4.0 
						
						
					 
					
						2004-08-31 19:04:07 -07:00 
						 
				 
			
				
					
						
							
							
								patg@krsna.patg.net 
							
						 
					 
					
						
						
							
						
						e277145911 
					 
					
						
						
							
							mysqld_safe.sh:  
						
						... 
						
						
						
						bug #5001 , added conditional if to test if port set, then only kill the processes
  for this port, not all processes (in the case of this bug where multiple servers 
  are killed.)
  The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's
  discovery that mysqld_safe would get killed. 
  In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file"
  was the case that evaluated as true, so in order to test, I had to comment that block
  out. 
						
						
					 
					
						2004-08-31 18:59:41 -07:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						521643c85a 
					 
					
						
						
							
							Bu#4526 building with utf8_bin collation causes help to be case sensitive  
						
						
						
						
					 
					
						2004-08-27 21:12:53 +05:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e1237cbc53 
					 
					
						
						
							
							manually merged  
						
						
						
						
					 
					
						2004-08-18 19:57:55 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						3c963455c1 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-4.0/  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-4.0 
						
						
					 
					
						2004-08-10 16:36:11 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						b49b5e9c68 
					 
					
						
						
							
							disable safe-updates for mysql_fix_privilege_tables  
						
						
						
						
					 
					
						2004-08-10 16:34:29 +02:00 
						 
				 
			
				
					
						
							
							
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						f49d4f5350 
					 
					
						
						
							
							Fix for bug  #4508  "CONVERT_TZ() function with new time zone as param crashes server".  
						
						... 
						
						
						
						Instead of trying to open time zone tables during calculation of CONVERT_TZ() function
or setting of @@time_zone variable we should open and lock them with the rest of 
statement's table (so we should add them to global table list) and after that use such 
pre-opened tables for loading info about time zones. 
						
						
					 
					
						2004-08-10 12:42:31 +04:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						1097805cf2 
					 
					
						
						
							
							- rename: EXCEPTIONS->EXCEPTIONS-CLIENT  
						
						
						
						
					 
					
						2004-08-05 17:05:11 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						26f0fdd5e8 
					 
					
						
						
							
							- More changes to include the FLOSS License Exception in the  
						
						... 
						
						
						
						various distributions 
						
						
					 
					
						2004-08-05 11:22:02 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						e5cb60dcaa 
					 
					
						
						
							
							- applied the required changes to create the FOSS License exception  
						
						... 
						
						
						
						file "EXCEPTIONS" and include it in the source and binary 
   distributions 
						
						
					 
					
						2004-08-05 01:54:04 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						0d0a50ce6a 
					 
					
						
						
							
							language fix  
						
						
						
						
					 
					
						2004-07-29 23:33:23 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						0b8fd9d66d 
					 
					
						
						
							
							- match shared library file name suffixes on Mac OS X (.dylib)  
						
						... 
						
						
						
						and HP-UX (.sl) for creating "mysql-shared" packages there 
						
						
					 
					
						2004-07-23 12:44:09 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8d080cbcfa 
					 
					
						
						
							
							manual merge  
						
						
						
						
					 
					
						2004-07-20 15:34:57 +02:00 
						 
				 
			
				
					
						
							
							
								paul@ice.snake.net 
							
						 
					 
					
						
						
							
						
						849de1e629 
					 
					
						
						
							
							mysql_fix_privilege_tables.sql:  
						
						... 
						
						
						
						Fix the other typo, too. :-) 
						
						
					 
					
						2004-07-18 22:16:42 -05:00 
						 
				 
			
				
					
						
							
							
								paul@ice.snake.net 
							
						 
					 
					
						
						
							
						
						d74b122fd9 
					 
					
						
						
							
							mysql_fix_privilege_tables.sql:  
						
						... 
						
						
						
						Fix typo in comments. 
						
						
					 
					
						2004-07-18 22:11:47 -05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						166a9ab465 
					 
					
						
						
							
							changes in system db creation procedure for view privileges  
						
						
						
						
					 
					
						2004-07-16 12:25:26 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						9336d36cf8 
					 
					
						
						
							
							VIEW  
						
						... 
						
						
						
						two TABLE_LIST copy eliminated 
						
						
					 
					
						2004-07-16 01:15:55 +03:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						20389c1e9a 
					 
					
						
						
							
							Merge mysql.com:/space/my/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/space/my/mysql-4.1-build 
						
						
					 
					
						2004-07-15 21:19:16 +02:00 
						 
				 
			
				
					
						
							
							
								lenz@mysql.com 
							
						 
					 
					
						
						
							
						
						fe2425b725 
					 
					
						
						
							
							- Avoid the error message "Can't read index header from..."  
						
						... 
						
						
						
						when copying a small index file because the value returned
   for $length is < 1024. This can happen if the filehandle
   was open()ed as an UTF-8 encoded file with Unicode characters
   (In this case read() returns characters not bytes)
   (Thanks to Mike Bethune) for this hint) 
						
						
					 
					
						2004-07-15 21:18:31 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						5b3c418b48 
					 
					
						
						
							
							After merge fixes  
						
						... 
						
						
						
						Note: The following tests fails
- fulltext (Sergei has promised to fix)
- rpl_charset (Guilhem should fix)
- rpl_timezone (Dimitray has promised to fix)
Sanja needs to check out the calling of close_thread_tables() in sp_head.cc 
						
						
					 
					
						2004-07-15 04:19:07 +03:00 
						 
				 
			
				
					
						
							
							
								paul@kite-hub.kitebird.com 
							
						 
					 
					
						
						
							
						
						791bdf2c48 
					 
					
						
						
							
							mysql_fix_privilege_tables.sh:  
						
						... 
						
						
						
						Language fixups. 
						
						
					 
					
						2004-07-14 11:33:00 -05:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						31fe2837f9 
					 
					
						
						
							
							Merge with 4.1  
						
						
						
						
					 
					
						2004-07-12 08:20:24 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						56d5e56cc6 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2004-07-11 12:16:25 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8064f06562 
					 
					
						
						
							
							mysqlhotcopy:  
						
						... 
						
						
						
						fix MYI copying with scp
  safer tempfile creation 
						
						
					 
					
						2004-07-09 14:30:51 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						1e31199995 
					 
					
						
						
							
							Merge with 4.1.3-beta  
						
						
						
						
					 
					
						2004-07-07 11:29:39 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						021242bc6c 
					 
					
						
						
							
							mysql_fix_privilege_tables.sh:  
						
						... 
						
						
						
						various fixes (for mysql-test-run at least):
  * accept --no-defaults
  * 4.0 compatible password handling (only it no other argumensts, only if doesn't start with --)
ps_3innodb.test:
  only run ps_3innodb.test if innodb is present
mysql-test-run.sh:
  it's --verbose, not --verbose=1 
						
						
					 
					
						2004-07-06 16:29:26 +02:00 
						 
				 
			
				
					
						
							
							
								paul@kite-hub.kitebird.com 
							
						 
					 
					
						
						
							
						
						f1218f982a 
					 
					
						
						
							
							Message/comment touchup.  
						
						
						
						
					 
					
						2004-06-28 11:26:54 -05:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						00394f591e 
					 
					
						
						
							
							Merge gbichot@213.136.52.20:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/home/mysql_src/mysql-4.1-874 
						
						
					 
					
						2004-06-28 15:39:04 +02:00 
						 
				 
			
				
					
						
							
							
								guilhem@mysql.com 
							
						 
					 
					
						
						
							
						
						ba22a7aaa9 
					 
					
						
						
							
							Fix for BUG#4240 "mysql_fix_privilege_tables Does not use --password properly"  
						
						... 
						
						
						
						Pass password if it is NOT empty. Typo fixed. 
						
						
					 
					
						2004-06-28 15:37:42 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						380ff9c228 
					 
					
						
						
							
							Fix to be able to cross-compile for modesto  
						
						
						
						
					 
					
						2004-06-27 18:20:06 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						137b8517c4 
					 
					
						
						
							
							Cleanup for creating windows source distribution  
						
						
						
						
					 
					
						2004-06-26 10:57:00 +03:00 
						 
				 
			
				
					
						
							
							
								patg@krsna.patg.net 
							
						 
					 
					
						
						
							
						
						6fa7e370f9 
					 
					
						
						
							
							make_win_src_distribution.sh:  
						
						... 
						
						
						
						4.1 tree must use installshield project files due to new tables 
						
						
					 
					
						2004-06-25 19:25:36 -07:00 
						 
				 
			
				
					
						
							
							
								patg@krsna.patg.net 
							
						 
					 
					
						
						
							
						
						a65f2afbae 
					 
					
						
						
							
							mysql_create_system_tables.sh:  
						
						... 
						
						
						
						fix to user table during make_win_src_distribution 
						
						
					 
					
						2004-06-25 19:11:46 -07:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b1d08ba2b4 
					 
					
						
						
							
							Merge with 4.0 to get the latest bug patches to 4.1  
						
						
						
						
					 
					
						2004-06-25 20:13:05 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b878240940 
					 
					
						
						
							
							Add missing .cnf files to windows installation (Bug  #4216 )  
						
						
						
						
					 
					
						2004-06-25 18:54:43 +03:00