=== modified file 'driver/catalog.c'
--- driver/catalog.c	2012-04-26 18:12:59 +0000
+++ driver/catalog.c	2012-05-17 14:07:32 +0000
@@ -152,8 +152,8 @@
                                          my_bool      show_views)
 {
   MYSQL *mysql= &stmt->dbc->mysql;
-  /** @todo determine real size for buffer */
-  char buff[255], *to;
+  
+  char buff[255+2*NAME_CHAR_LEN], *to;
   my_bool clause_added= FALSE;
 
   to= strmov(buff, "SELECT TABLE_NAME, TABLE_COMMENT, TABLE_TYPE, TABLE_SCHEMA \
@@ -391,6 +391,12 @@
   if (type_len == SQL_NTS)
     type_len= type ? (SQLSMALLINT)strlen((char *)type) : 0;
 
+  if(catalog_len > NAME_CHAR_LEN || schema_len > NAME_CHAR_LEN ||
+     table_len > NAME_CHAR_LEN)
+  {
+    return set_stmt_error(stmt, "HY090", "One or more parameters exceed the maximum allowed name length", 0);
+  }
+
   if (server_has_i_s(stmt->dbc) && !stmt->dbc->ds->no_information_schema)
   {
     return i_s_tables(hstmt, catalog, catalog_len, schema, schema_len,

=== modified file 'test/my_catalog.c'
--- test/my_catalog.c	2012-04-27 22:08:34 +0000
+++ test/my_catalog.c	2012-05-17 13:58:05 +0000
@@ -2462,6 +2462,95 @@
 }
 
 
+/**
+ Bug#14085211 test. LONG TABLE NAMES CRASH OBDC DRIVER
+ We will try creating databases, tables and columns with the
+ maximum allowed length of 64 symbols and also try to give
+ the driver very long (>1024 symbols) names to make it crash.
+*/
+DECLARE_TEST(t_bug14085211_part1)
+{
+  SQLCHAR  buff[8192];
+  SQLCHAR  db_64_name[65]  = "database_64_symbols_long_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+  SQLCHAR  tab_64_name[65] = "table____64_symbols_long_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+  SQLCHAR  col_64_name[65] = "column___64_symbols_long_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+
+  SQLCHAR  tab_1024_name[1025] = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"\
+                             "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+
+  sprintf(buff, "DROP DATABASE IF EXISTS %s", db_64_name);
+  ok_stmt(hstmt, SQLExecDirect(hstmt, buff, SQL_NTS));
+
+  sprintf(buff, "CREATE DATABASE %s", db_64_name);
+  ok_stmt(hstmt, SQLExecDirect(hstmt, buff, SQL_NTS));
+
+  sprintf(buff, "CREATE TABLE %s.%s(%s varchar(10))", db_64_name, tab_64_name, col_64_name);
+  ok_stmt(hstmt, SQLExecDirect(hstmt, buff, SQL_NTS));
+
+  /* Lets check if SQLTables can get these long names  */
+  ok_stmt(hstmt, SQLTables(hstmt, (SQLCHAR *)db_64_name, SQL_NTS, NULL, SQL_NTS,
+                                  (SQLCHAR *)tab_64_name, SQL_NTS, 
+                                  "TABLE,VIEW", SQL_NTS));
+
+  ok_stmt(hstmt, SQLFetch(hstmt));
+  /* check the database name */
+  is_str(my_fetch_str(hstmt, buff, 1), db_64_name, 64);
+
+  /* check the table name */
+  is_str(my_fetch_str(hstmt, buff, 3), tab_64_name, 64);
+  
+  /* only one db/table match, so nothing should be in the results */
+  expect_stmt(hstmt, SQLFetch(hstmt), SQL_NO_DATA_FOUND);
+
+  /* Lets check if SQLTables can ignore 1024-characters for table name */
+  ok_stmt(hstmt, SQLTables(hstmt, (SQLCHAR *)tab_1024_name, SQL_NTS, NULL, SQL_NTS,
+                                  (SQLCHAR *)tab_1024_name, SQL_NTS, 
+                                  "TABLE,VIEW", SQL_NTS));
+
+  ok_stmt(hstmt, SQLFetch(hstmt));
+  /* check the database name */
+  is_str(my_fetch_str(hstmt, buff, 1), db_64_name, 64);
+
+  /* check the table name */
+  is_str(my_fetch_str(hstmt, buff, 3), tab_64_name, 64);
+  
+  /* only one db/table match, so nothing should be in the results */
+  expect_stmt(hstmt, SQLFetch(hstmt), SQL_NO_DATA_FOUND);
+
+
+  ok_stmt(hstmt, SQLFreeStmt(hstmt, SQL_CLOSE));
+
+  sprintf(buff, "DROP DATABASE IF EXISTS %s", db_64_name);
+  ok_stmt(hstmt, SQLExecDirect(hstmt, buff, SQL_NTS));
+
+  return OK;
+}
+
+
+DECLARE_TEST(t_bug14085211_part2)
+{
+  /* 
+    TODO: test all catalog functions for extreme lengths of
+          database, table and column names     
+  */
+  return OK;
+}
+
+
 BEGIN_TESTS
   ADD_TEST(my_columns_null)
   ADD_TEST(my_drop_table)
@@ -2506,6 +2595,8 @@
   ADD_TEST(t_bug31067)
   ADD_TEST(bug12824839)
   ADD_TEST(sqlcolumns_nodbselected)
+  ADD_TEST(t_bug14085211_part1)
+  ADD_TODO(t_bug14085211_part2)
 END_TESTS
 
 myoption &= ~(1 << 30);