From b8fc731804f53a2bab0d19793601dfc35364b8e0 Mon Sep 17 00:00:00 2001
From: "kostja@bodhi.(none)" <>
Date: Tue, 17 Jul 2007 00:59:21 +0400
Subject: Post-merge fixes (merge from the main).

---
 sql/sql_show.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'sql/sql_show.h')

diff --git a/sql/sql_show.h b/sql/sql_show.h
index d5c3f3bf675..57004323ca9 100644
--- a/sql/sql_show.h
+++ b/sql/sql_show.h
@@ -20,9 +20,8 @@
 class String;
 class THD;
 struct st_ha_create_information;
-struct st_table_list;
 typedef st_ha_create_information HA_CREATE_INFO;
-typedef st_table_list TABLE_LIST;
+struct TABLE_LIST;
 
 enum find_files_result {
   FIND_FILES_OK,
-- 
cgit v1.2.1