← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/mysql-5.1/oneiric-updates

« back to all changes in this revision

Viewing changes to sql/sql_base.cc

  • Committer: Bazaar Package Importer
  • Author(s): Norbert Tretkowski
  • Date: 2011-07-17 17:26:27 UTC
  • mfrom: (1.3.8 upstream)
  • mto: This revision was merged to the branch mainline in revision 27.
  • Revision ID: james.westby@ubuntu.com-20110717172627-6ml4e6l16adhecmy
Tags: 5.1.58-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_base.cc
4008
4008
     {
4009
4009
       /* Give right error message */
4010
4010
       thd->clear_error();
4011
 
       my_error(ER_NOT_KEYFILE, MYF(0), share->table_name.str, my_errno);
 
4011
       my_error(ER_NOT_KEYFILE, MYF(0), share->table_name.str);
4012
4012
       sql_print_error("Couldn't repair table: %s.%s", share->db.str,
4013
4013
                       share->table_name.str);
4014
4014
       if (entry->file)
7686
7686
  }
7687
7687
  if (tablenr > MAX_TABLES)
7688
7688
  {
7689
 
    my_error(ER_TOO_MANY_TABLES,MYF(0),MAX_TABLES);
 
7689
    my_error(ER_TOO_MANY_TABLES, MYF(0), static_cast<int>(MAX_TABLES));
7690
7690
    DBUG_RETURN(1);
7691
7691
  }
7692
7692
  for (table_list= tables;