After merge fixes

mysql-test/r/func_group.result:
  Update results after merge (things moved around when aligning 4.1 and 5.0 tests)
mysql-test/r/mysqldump.result:
  Update results after merge (things moved around when aligning 4.1 and 5.0 tests)
mysql-test/r/ps_grant.result:
  Update results after merge (test moved to another file)
mysql-test/t/mysqldump.test:
  Align with other lines
sql/lock.cc:
  Removed compiler warning
  Fixed typo during merge

mysql-test/r/func_group.result

@@ -795,6 +795,32 @@ show columns from t2;
 Field	Type	Null	Key	Default	Extra
 f2	datetime	NO		0000-00-00 00:00:00	
 drop table t2, t1;
+CREATE TABLE t1(
+id int PRIMARY KEY,
+a  int,
+b  int,
+INDEX i_b_id(a,b,id),
+INDEX i_id(a,id)
+);
+INSERT INTO t1 VALUES 
+(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
+SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
+MAX(id)
+NULL
+DROP TABLE t1;
+CREATE TABLE t1(
+id int PRIMARY KEY,
+a  int,
+b  int,
+INDEX i_id(a,id),
+INDEX i_b_id(a,b,id)
+);
+INSERT INTO t1 VALUES 
+(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
+SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
+MAX(id)
+NULL
+DROP TABLE t1;
 create table t2 (ff double);
 insert into t2 values (2.2);
 select cast(sum(distinct ff) as decimal(5,2)) from t2;
@@ -860,32 +886,6 @@ select col1,sum(col1),max(col1),min(col1) from t1 group by col1;
 col1	sum(col1)	max(col1)	min(col1)
 5.000000000010	10.000000000020	5.000000000010	5.000000000010
 DROP TABLE t1;
-CREATE TABLE t1(
-id int PRIMARY KEY,
-a  int,
-b  int,
-INDEX i_b_id(a,b,id),
-INDEX i_id(a,id)
-);
-INSERT INTO t1 VALUES 
-(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
-SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
-MAX(id)
-NULL
-DROP TABLE t1;
-CREATE TABLE t1(
-id int PRIMARY KEY,
-a  int,
-b  int,
-INDEX i_id(a,id),
-INDEX i_b_id(a,b,id)
-);
-INSERT INTO t1 VALUES 
-(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
-SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
-MAX(id)
-NULL
-DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(400));
 INSERT INTO t1 (a) VALUES ("A"), ("a"), ("a "), ("a   "),
 ("B"), ("b"), ("b "), ("b   ");

mysql-test/r/ps_grant.result

@@ -88,8 +88,3 @@ revoke all privileges on test.t1 from drop_user@localhost ;
 prepare stmt3 from ' drop user drop_user@localhost ';
 ERROR HY000: This command is not supported in the prepared statement protocol yet
 drop user drop_user@localhost;
-prepare stmt4 from ' show full processlist ';
-execute stmt4;
-Id	User	Host	db	Command	Time	State	Info
-number	root	localhost	test	Execute	time	NULL	show full processlist
-deallocate prepare stmt4;

mysql-test/t/mysqldump.test

@@ -578,6 +578,7 @@ select '------ Testing with illegal table names ------' as test_sequence ;
 --enable_query_log
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db "\d-2-1.sql" 2>&1
+
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db  "\t1" 2>&1
 

sql/lock.cc

@@ -99,14 +99,15 @@ static void print_lock_error(int error, const char *);
     NULL on error.
 */
 
+static int thr_lock_errno_to_mysql[]=
+{ 0, 1, ER_LOCK_WAIT_TIMEOUT, ER_LOCK_DEADLOCK };
+
 MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count, uint flags)
 {
   MYSQL_LOCK *sql_lock;
   TABLE *write_lock_used;
   int rc;
   /* Map the return value of thr_lock to an error from errmsg.txt */
-  const static int thr_lock_errno_to_mysql[]=
-  { 0, 1, ER_LOCK_WAIT_TIMEOUT, ER_LOCK_DEADLOCK };
   DBUG_ENTER("mysql_lock_tables");
 
   for (;;)
@@ -624,8 +625,8 @@ int lock_table_name(THD *thd, TABLE_LIST *table_list)
   }
   
   /* Return 1 if table is in use */
-  DBUG_RETURN(test(remove_table_from_cache(thd, db, table_list->real_name,
-                                           RTFC_NO_FLAG)))
+  DBUG_RETURN(test(remove_table_from_cache(thd, db, table_list->table_name,
+                                           RTFC_NO_FLAG)));
 }