From 3d4632b80fb7fc545794444cc9e1b233d97213fe Mon Sep 17 00:00:00 2001
From: unknown <elliot@mysql.com>
Date: Fri, 23 Jun 2006 17:59:24 -0400
Subject: [PATCH] Post merge fix.

---
 mysql-test/r/lock_multi.result | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result
index b9500d1d4f9..f8cf539bd02 100644
--- a/mysql-test/r/lock_multi.result
+++ b/mysql-test/r/lock_multi.result
@@ -80,3 +80,19 @@ lock tables t1 write;
  alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //
 unlock tables;
 drop table t1;
+use mysql;
+LOCK TABLES columns_priv WRITE, db WRITE, host WRITE, user WRITE;
+FLUSH TABLES;
+use mysql;
+ SELECT user.Select_priv FROM user, db WHERE user.user = db.user LIMIT 1;
+OPTIMIZE TABLES columns_priv, db, host, user;
+Table	Op	Msg_type	Msg_text
+mysql.columns_priv	optimize	status	OK
+mysql.db	optimize	status	OK
+mysql.host	optimize	status	OK
+mysql.user	optimize	status	OK
+UNLOCK TABLES;
+Select_priv
+N
+use test;
+use test;