From f2b26ffb3171e8adab2dab3539934a05eb341419 Mon Sep 17 00:00:00 2001
From: "monty@tik.mysql.fi" <>
Date: Wed, 11 Jul 2001 10:49:27 +0300
Subject: [PATCH] Final fix for bad merge

---
 sql/sql_show.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 507139de1eb..4ed59f7d1b0 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -110,7 +110,7 @@ int mysqld_show_open_tables(THD *thd,const char *wild)
   if (send_fields(thd,field_list,1))
     DBUG_RETURN(1);
 
-  if (!(list_open_tables(thd,&tables,db,wild)) && thd->fatal_error)
+  if (!(open_list=list_open_tables(thd,wild)) && thd->fatal_error)
     DBUG_RETURN(-1);
 
   for ( ; open_list ; open_list=open_list->next)
-- 
2.30.9