← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/my_redel.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 04:19:44 UTC
  • mto: (2192.1.1 drizzle-staging)
  • mto: This revision was merged to the branch mainline in revision 2193.
  • Revision ID: brian@tangent.org-20110222041944-furz1h252ecz7mpd
Merge in modifications such that we check both schema and table for
replication option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/my_redel.cc
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
15
15
 
16
 
#include "config.h"
 
16
#include <config.h>
17
17
 
18
 
#include "drizzled/internal/my_sys.h"
19
 
#include "drizzled/internal/m_string.h"
20
 
#include "drizzled/error.h"
 
18
#include <drizzled/internal/my_sys.h>
 
19
#include <drizzled/internal/m_string.h>
 
20
#include <drizzled/error.h>
21
21
#if defined(HAVE_UTIME_H)
22
22
#include <utime.h>
23
23
#elif defined(HAVE_SYS_UTIME_H)
65
65
                  MyFlags))
66
66
      goto end;
67
67
  }
68
 
  else if (my_delete_allow_opened(org_name, MyFlags))
 
68
  else if (my_delete(org_name, MyFlags))
69
69
      goto end;
70
70
  if (my_rename(tmp_name,org_name,MyFlags))
71
71
    goto end;