From 4e7c4ab929b85eaaa91a8c678872c44fc421c396 Mon Sep 17 00:00:00 2001
From: unknown <gluh@mysql.com/eagle.(none)>
Date: Fri, 29 Feb 2008 17:50:01 +0400
Subject: [PATCH] wrong merge fix

---
 sql/sql_parse.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 9e2a4bb77ac..fd16435ff9c 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -76,8 +76,6 @@ static void remove_escape(char *name);
 static bool append_file_to_dir(THD *thd, const char **filename_ptr,
 			       const char *table_name);
 static bool check_show_create_table_access(THD *thd, TABLE_LIST *table);
-static TABLE_LIST* get_table_by_alias(TABLE_LIST* tl, const char* db,
-  const char* alias);
 static bool test_if_data_home_dir(const char *dir);
 
 const char *any_db="*any*";	// Special symbol for check_access