← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Monty Taylor
  • Date: 2009-12-25 02:36:12 UTC
  • mfrom: (1253 build)
  • mto: (1253.2.3 out-of-tree)
  • mto: This revision was merged to the branch mainline in revision 1258.
  • Revision ID: mordred@inaugust.com-20091225023612-7hekryz87dtus3ph
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
64
64
 
65
65
#include "drizzled/error.h"
66
66
#include "drizzled/errmsg_print.h"
67
 
#include "mystrings/m_ctype.h"
68
 
#include "mystrings/m_string.h"
69
 
#include "mysys/my_sys.h"
70
 
#include "mysys/hash.h"
71
 
#include "mysys/mysys_err.h"
 
67
#include "drizzled/charset_info.h"
 
68
#include "drizzled/internal/m_string.h"
 
69
#include "drizzled/internal/my_sys.h"
 
70
#include "drizzled/my_hash.h"
 
71
#include "drizzled/my_error.h"
72
72
#include "drizzled/plugin.h"
73
73
#include "drizzled/show.h"
74
74
#include "drizzled/data_home.h"
75
75
#include "drizzled/error.h"
76
76
#include "drizzled/field.h"
 
77
#include "drizzled/charset.h"
77
78
#include "drizzled/session.h"
78
79
#include "drizzled/current_session.h"
79
80
#include "drizzled/table.h"
1183
1184
                my_close(). */
1184
1185
                fd2 = dup(fd);
1185
1186
                if (fd2 < 0) {
1186
 
                        my_errno=errno;
 
1187
                        errno=errno;
1187
1188
                        my_error(EE_OUT_OF_FILERESOURCES,
1188
1189
                                 MYF(ME_BELL+ME_WAITTANG),
1189
 
                                 "ib*", my_errno);
 
1190
                                 "ib*", errno);
1190
1191
                }
1191
1192
                my_close(fd, MYF(MY_WME));
1192
1193
        }
2773
2774
                                norm_name);
2774
2775
                free_share(share);
2775
2776
                free(upd_buff);
2776
 
                my_errno = ENOENT;
 
2777
                errno = ENOENT;
2777
2778
 
2778
2779
                return(HA_ERR_NO_SUCH_TABLE);
2779
2780
        }
2789
2790
                                norm_name);
2790
2791
                free_share(share);
2791
2792
                free(upd_buff);
2792
 
                my_errno = ENOENT;
 
2793
                errno = ENOENT;
2793
2794
 
2794
2795
                dict_table_decrement_handle_count(ib_table, FALSE);
2795
2796
                return(HA_ERR_NO_SUCH_TABLE);
5922
5923
                /* We only handle TRUNCATE TABLE t as a special case.
5923
5924
                DELETE FROM t will have to use ha_innobase::delete_row(),
5924
5925
                because DELETE is transactional while TRUNCATE is not. */
5925
 
                return(my_errno=HA_ERR_WRONG_COMMAND);
 
5926
                return(errno=HA_ERR_WRONG_COMMAND);
5926
5927
        }
5927
5928
 
5928
5929
        /* Truncate the table in InnoDB */