unknown d1c80dd648 
	
	
	Merge mysql.com:/home/jimw/my/mysql-4.1-clean ... 
			into  mysql.com:/home/jimw/my/mysql-5.0-clean
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
myisam/mi_extra.c:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysys/my_access.c:
  Auto merged
BitKeeper/deleted/.del-extra.c~706f29d72beb2565:
  Auto merged
sql/examples/ha_tina.cc:
  Resolve conflict 
		
	 
		2005-08-31 19:12:16 -07:00 
	 
	
	
	
		 
	
	
		
			
			
			
			
			
			2005-04-07 19:24:14 +03:00 
		 
	
		
			
			
			
			
			
			2003-08-28 06:08:17 +03:00 
		 
	
		
			
			
			
			
			
			2004-12-10 17:58:13 +04:00 
		 
	
		
			
			
			
			
			
			2005-01-13 18:12:04 +04:00 
		 
	
		
			
			
			
			
			
			2005-07-06 17:16:22 +05:00 
		 
	
		
			
			
			
			
			
			2004-12-01 19:25:05 +04:00 
		 
	
		
			
			
			
			
			
			2005-07-15 17:33:47 -07:00 
		 
	
		
			
			
			
			
			
			2005-07-15 17:33:47 -07:00 
		 
	
		
			
			
			
			
			
			2004-05-25 13:27:01 -07:00 
		 
	
		
			
			
			
			
			
			2001-10-04 15:42:25 -06:00 
		 
	
		
			
			
			
			
			
			2003-12-24 16:59:48 +04:00 
		 
	
		
			
			
			
			
			
			2005-03-22 16:10:39 -08:00 
		 
	
		
			
			
			
			
			
			2003-04-09 20:50:30 -04:00 
		 
	
		
			
			
			
			
			
			2005-05-05 10:36:17 -07:00 
		 
	
		
			
			
			
			
			
			2005-03-03 14:15:37 +04:00 
		 
	
		
			
			
			
			
			
			2003-01-28 08:38:28 +02:00 
		 
	
		
			
			
			
			
			
			2004-08-12 20:57:18 -07:00 
		 
	
		
			
			
			
			
			
			2004-06-20 19:11:02 +02:00 
		 
	
		
			
			
			
			
			
			2005-02-01 14:37:51 +04:00 
		 
	
		
			
			
			
			
			
			2004-08-13 17:14:36 -07:00 
		 
	
		
			
			
			
			
			
			2005-01-20 18:36:40 -08:00 
		 
	
		
			
			
			
			
			
			2005-07-22 21:06:02 +05:00 
		 
	
		
			
			
			
			
			
			2004-05-27 20:31:30 +05:00 
		 
	
		
			
			
			
			
			
			2001-10-04 15:42:25 -06:00 
		 
	
		
			
			
			
			
			
			2005-08-18 22:27:12 +02:00 
		 
	
		
			
			
			
			
			
			2005-03-07 10:21:38 +01:00 
		 
	
		
			
			
			
			
			
			2005-02-07 18:05:11 +01:00 
		 
	
		
			
			
			
			
			
			2003-03-11 13:41:53 +04:00 
		 
	
		
			
			
			
			
			
			2001-10-04 15:42:25 -06:00 
		 
	
		
			
			
			
			
			
			2005-05-08 22:56:58 +01:00 
		 
	
		
			
			
			
			
			
			2004-10-26 19:30:01 +03:00 
		 
	
		
			
			
			
			
			
			2004-03-25 14:29:56 +04:00 
		 
	
		
			
			
			
			
			
			2003-12-25 20:11:01 +04:00 
		 
	
		
			
			
			
			
			
			2003-05-23 15:10:05 +05:00 
		 
	
		
			
			
			
			
			
			2003-05-23 15:10:05 +05:00 
		 
	
		
			
			
			
			
			
			2003-03-03 23:12:17 +01:00 
		 
	
		
			
			
			
			
			
			2005-01-26 14:38:13 +01:00 
		 
	
		
			
			
			
			
			
			2003-05-21 21:39:58 +03:00 
		 
	
		
			
			
			
			
			
			2005-06-17 18:07:46 +02:00 
		 
	
		
			
			
			
			
			
			2005-08-03 17:38:55 -07:00 
		 
	
		
			
			
			
			
			
			2005-08-25 06:55:48 +03:00 
		 
	
		
			
			
			
			
			
			2005-06-20 12:09:00 +02:00 
		 
	
		
			
			
			
			
			
			2004-12-13 21:00:43 +01:00 
		 
	
		
			
			
			
			
			
			2005-06-07 14:11:36 +04:00 
		 
	
		
			
			
			
			
			
			2005-08-23 18:08:04 +03:00 
		 
	
		
			
			
			
			
			
			2004-09-25 19:08:02 +04:00 
		 
	
		
			
			
			
			
			
			2005-06-17 14:03:27 +02:00 
		 
	
		
			
			
			
			
			
			2005-06-16 12:46:09 +02:00 
		 
	
		
			
			
			
			
			
			2005-06-15 19:16:17 +02:00 
		 
	
		
			
			
			
			
			
			2005-03-08 17:40:43 -08:00 
		 
	
		
			
			
			
			
			
			2005-05-08 22:56:58 +01:00 
		 
	
		
			
			
			
			
			
			2005-01-26 10:19:28 +01:00 
		 
	
		
			
			
			
			
			
			2005-08-15 13:02:29 +04:00 
		 
	
		
			
			
			
			
			
			2005-08-31 18:32:15 -07:00