← Back to branch summary

~ubuntu-branches/ubuntu/maverick/mysql-5.1/maverick-proposed

« back to all changes in this revision

Viewing changes to sql/sql_rename.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 14:16:05 UTC
  • mto: This revision was merged to the branch mainline in revision 20.
  • Revision ID: package-import@ubuntu.com-20120222141605-nxlu9yzc6attylc2
Tags: upstream-5.1.61
Import upstream version 5.1.61

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_rename.cc
1
 
/* Copyright (C) 2000-2006 MySQL AB
 
1
/*
 
2
   Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
2
3
 
3
4
   This program is free software; you can redistribute it and/or modify
4
5
   it under the terms of the GNU General Public License as published by
11
12
 
12
13
   You should have received a copy of the GNU General Public License
13
14
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
15
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
16
*/
15
17
 
16
18
/*
17
19
  Atomic rename of table;  RENAME TABLE t1 to t2, tmp to t1 [,...]
99
101
            */
100
102
            my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), ren_table->table_name,
101
103
                     ren_table->table_name);
102
 
            DBUG_RETURN(1);
 
104
            goto err;
103
105
          }
104
106
        }
105
107
        else
112
114
            */
113
115
            my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), ren_table->table_name,
114
116
                     ren_table->table_name);
115
 
            DBUG_RETURN(1);
 
117
            goto err;
116
118
          }
117
119
          else
118
120
          {
130
132
      else
131
133
        my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), rename_log_table[1],
132
134
                 rename_log_table[1]);
133
 
      DBUG_RETURN(1);
 
135
      goto err;
134
136
    }
135
137
  }
136
138