serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						8d1a7a9752 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-03-31 17:50:22 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						e5a50e1927 
					 
					
						
						
							
							decimal_div bug#9501  
						
						
						
						
					 
					
						2005-03-31 17:46:36 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						830b088fde 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-03-31 12:57:16 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.com 
							
						 
					 
					
						
						
							
						
						bb27307778 
					 
					
						
						
							
							Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/usr/local/bk/mysql-5.0 
						
						
					 
					
						2005-03-31 10:54:15 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						c732cae6e0 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-03-31 10:51:00 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						f4e3bcc015 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-4.1 
						
						
					 
					
						2005-03-31 10:47:32 +02:00 
						 
				 
			
				
					
						
							
							
								gluh@eagle.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						1f38b5bdd1 
					 
					
						
						
							
							Fix for bug  #9344  INFORMATION_SCHEMA, wrong content, numeric columns  
						
						... 
						
						
						
						The columns CHARACTER_MAXIMUM_LENGTH and CHARACTER_OCTET_LENGTH 
  of INFORMATION_SCHEMA.COLUMNS must be NULL for numeric columns 
						
						
					 
					
						2005-03-31 13:44:42 +05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						05d4ed14e4 
					 
					
						
						
							
							merge 4.1->5.0  
						
						
						
						
					 
					
						2005-03-31 10:39:48 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						aa4f352230 
					 
					
						
						
							
							Remove result.es files and support for them, which requires splitting  
						
						... 
						
						
						
						up a couple of tests and adjusting the output of others. Exposes two
bugs (9472 and 9508). 
						
						
					 
					
						2005-03-30 17:32:44 -08:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						e9205dc0f0 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-03-30 23:42:53 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						b43b7dc128 
					 
					
						
						
							
							Enabled more tests of STR_TO_DATE()  
						
						... 
						
						
						
						Fixed that datetime gives warning for zero dates in traditional mode 
						
						
					 
					
						2005-03-30 23:41:42 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						dc87075f86 
					 
					
						
						
							
							postmerge fixes  
						
						
						
						
					 
					
						2005-03-30 23:08:03 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						c64efa6062 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2005-03-30 22:11:08 +03:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						2e2ff0459f 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-5.0 
						
						
					 
					
						2005-03-30 17:54:10 +02:00 
						 
				 
			
				
					
						
							
							
								pem@mysql.comhem.se 
							
						 
					 
					
						
						
							
						
						8df8afc270 
					 
					
						
						
							
							Fixed BUG#6600: Stored procedure crash after repeated calls with check table.  
						
						... 
						
						
						
						Sedond attempt: Simply disallow CHECK in SPs, since it can't work. 
						
						
					 
					
						2005-03-30 17:43:52 +02:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						fac67f091c 
					 
					
						
						
							
							Merge bk-internal.mysql.com:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into mysql.com:/home/my/mysql-5.0 
						
						
					 
					
						2005-03-30 16:01:30 +03:00 
						 
				 
			
				
					
						
							
							
								monty@mysql.com 
							
						 
					 
					
						
						
							
						
						332b7ed4a1 
					 
					
						
						
							
							Give warnings if wrong date/time/datetime argument for STR_TO_DATE  
						
						... 
						
						
						
						Small fixes while doing review of new pushed code
More test cases for decimal 
						
						
					 
					
						2005-03-30 16:00:31 +03:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						b7ab584096 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced 
						
						
					 
					
						2005-03-30 14:33:55 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						c93ae4f8a1 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-03-30 14:32:53 +02:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						9471e922f1 
					 
					
						
						
							
							Merge neptunus.(none):/home/msvensson/mysql/bug8807  
						
						... 
						
						
						
						into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced 
						
						
					 
					
						2005-03-30 14:30:32 +02:00 
						 
				 
			
				
					
						
							
							
								ramil@mysql.com 
							
						 
					 
					
						
						
							
						
						e9dbf09dfc 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-03-30 17:07:40 +05:00 
						 
				 
			
				
					
						
							
							
								sergefp@mysql.com 
							
						 
					 
					
						
						
							
						
						86e3a378ea 
					 
					
						
						
							
							Fix for BUG#9213: GROUP BY returns wrong query results:  
						
						... 
						
						
						
						Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
different from the index join optimizer has choosen. 
						
						
					 
					
						2005-03-30 15:57:42 +04:00 
						 
				 
			
				
					
						
							
							
								msvensson@neptunus.(none) 
							
						 
					 
					
						
						
							
						
						382a8c0048 
					 
					
						
						
							
							BUG#8807 Select crash server  
						
						... 
						
						
						
						- Add function Item_param::fix_fields which will update any subselect they are part of and indicate that the subsleect is not const during prepare phase, and thus should not be executed during prepare. 
						
						
					 
					
						2005-03-30 12:14:37 +02:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						63d2f81a07 
					 
					
						
						
							
							Remove .opt file for faster test running.  
						
						
						
						
					 
					
						2005-03-30 14:10:27 +05:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						dcdda90a11 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-03-30 10:27:36 +03:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						4fdb0f48e7 
					 
					
						
						
							
							postreview changes  
						
						... 
						
						
						
						fixed bug in IN/ALL/ANY subqeries with HAVING clause (BUG#9350) 
						
						
					 
					
						2005-03-30 10:07:08 +03:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						690183d1a0 
					 
					
						
						
							
							Eliminate most of the remaining hardcoded list of tests to skip  
						
						... 
						
						
						
						by adding check for embedded server within tests and splitting some
tests into multiple test files. 
						
						
					 
					
						2005-03-29 17:17:46 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						bfa7520356 
					 
					
						
						
							
							Clean up InnoDB testing with embedded server.  
						
						
						
						
					 
					
						2005-03-29 16:10:43 -08:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						46eda5b998 
					 
					
						
						
							
							Shift skipping of some tests with embedded server from within  
						
						... 
						
						
						
						mysql-test-run to the tests themselves. 
						
						
					 
					
						2005-03-29 15:50:16 -08:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						884abd39fc 
					 
					
						
						
							
							Merge bk-internal:/home/bk/mysql-5.0  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-5.0 
						
						
					 
					
						2005-03-30 00:27:35 +02:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						ab5c10c100 
					 
					
						
						
							
							after merge fix  
						
						
						
						
					 
					
						2005-03-30 00:24:58 +02:00 
						 
				 
			
				
					
						
							
							
								joerg@mysql.com 
							
						 
					 
					
						
						
							
						
						27a0de2443 
					 
					
						
						
							
							Propagate the new '--with-big-tables' flag from 4.1 to 5.0.  
						
						... 
						
						
						
						Incomplete, as the macro body must ne in the new file 'config/ac-macros/misc.m4'
which will follow in a separate changeset. 
						
						
					 
					
						2005-03-29 21:06:22 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						4bd90706e4 
					 
					
						
						
							
							init_db.sql:  
						
						... 
						
						
						
						Updates to be in sync with 'mysql_create_system_tables' 
						
						
					 
					
						2005-03-29 19:04:19 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						e2d973bda0 
					 
					
						
						
							
							Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
						
						
					 
					
						2005-03-29 18:53:44 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						b88ed6c723 
					 
					
						
						
							
							Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
						
						
					 
					
						2005-03-29 18:48:31 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						fb65ac1551 
					 
					
						
						
							
							Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1  
						
						... 
						
						
						
						into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
						
						
					 
					
						2005-03-29 17:56:34 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						f8101348f5 
					 
					
						
						
							
							New test result  
						
						
						
						
					 
					
						2005-03-29 15:36:02 +02:00 
						 
				 
			
				
					
						
							
							
								mskold@mysql.com 
							
						 
					 
					
						
						
							
						
						c91034fea8 
					 
					
						
						
							
							Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started  
						
						
						
						
					 
					
						2005-03-29 15:15:28 +02:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						e8b86b0410 
					 
					
						
						
							
							type_bit.result:  
						
						... 
						
						
						
						after merge fix
  , 
						
						
					 
					
						2005-03-29 17:41:17 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						7131f313be 
					 
					
						
						
							
							after merge fix  
						
						
						
						
					 
					
						2005-03-29 17:37:10 +05:00 
						 
				 
			
				
					
						
							
							
								bar@mysql.com 
							
						 
					 
					
						
						
							
						
						ba115894c5 
					 
					
						
						
							
							Better error message.  
						
						... 
						
						
						
						Bugs#9057: Incorrect errormsg for too-large char field in table definition 
						
						
					 
					
						2005-03-29 15:43:00 +05:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						d917683515 
					 
					
						
						
							
							Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl  
						
						... 
						
						
						
						into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile 
						
						
					 
					
						2005-03-29 08:06:43 +02:00 
						 
				 
			
				
					
						
							
							
								kent@mysql.com 
							
						 
					 
					
						
						
							
						
						0544c68e1c 
					 
					
						
						
							
							mysql-test-run.pl:  
						
						... 
						
						
						
						Corrected typo
mtr_diff.pl:
  A simplified unified diff in Perl
  new file 
						
						
					 
					
						2005-03-29 07:29:38 +02:00 
						 
				 
			
				
					
						
							
							
								pekka@mysql.com 
							
						 
					 
					
						
						
							
						
						727015dbb3 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2005-03-28 23:06:19 +02:00 
						 
				 
			
				
					
						
							
							
								dlenev@mysql.com 
							
						 
					 
					
						
						
							
						
						6d6d04a0ba 
					 
					
						
						
							
							Fix for bug  #8894  "TIMESTAMP values scrambled/misaligned when using --new".  
						
						... 
						
						
						
						Fixed Field_timestamp::val_int() so now it works correctly in --new mode
(or for TIMESTAMP(19) columns). 
Also removed unused Field_timestamp::fill_and_store() method. 
						
						
					 
					
						2005-03-28 23:36:25 +04:00 
						 
				 
			
				
					
						
							
							
								jimw@mysql.com 
							
						 
					 
					
						
						
							
						
						9c86b35194 
					 
					
						
						
							
							Fix reconnect when using prepared statements, and add  
						
						... 
						
						
						
						--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866 ) 
						
						
					 
					
						2005-03-28 09:59:41 -08:00 
						 
				 
			
				
					
						
							
							
								dlenev@brandersnatch.localdomain 
							
						 
					 
					
						
						
							
						
						aae37f5ea5 
					 
					
						
						
							
							Fix for bug  #8068  "TIMEDIFF with first negative argument gives wrong  
						
						... 
						
						
						
						result" (and similar bug in ADDTIME/SUBTIME).
Both Item_func_add_time/Item_func_timediff::val_str() now use
calc_time_diff() function which was backported from 5.0 (and which
was was fixed to properly handle microseconds part of its second 
argument). Also now we correctly set sign of result in case when
first argument is negative and second is positive. 
						
						
					 
					
						2005-03-28 16:20:55 +04:00 
						 
				 
			
				
					
						
							
							
								bell@sanja.is.com.ua 
							
						 
					 
					
						
						
							
						
						1659dacab1 
					 
					
						
						
							
							fixed mechanism of detection selection from table wich we update  
						
						... 
						
						
						
						(BUG##9398, BUG#8703)
fixed wrong join view detection in multi-delete which lead to server crash 
						
						
					 
					
						2005-03-28 15:13:31 +03:00 
						 
				 
			
				
					
						
							
							
								serg@serg.mylan 
							
						 
					 
					
						
						
							
						
						55d3d94c3b 
					 
					
						
						
							
							Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/  
						
						... 
						
						
						
						into serg.mylan:/usr/home/serg/Abk/mysql-4.1 
						
						
					 
					
						2005-03-28 13:56:27 +02:00 
						 
				 
			
				
					
						
							
							
								bar@eagle.intranet.mysql.r18.ru 
							
						 
					 
					
						
						
							
						
						f0d41136df 
					 
					
						
						
							
							Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1  
						
						... 
						
						
						
						into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0 
						
						
					 
					
						2005-03-28 14:23:03 +05:00