← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2008-07-13 22:45:08 UTC
  • Revision ID: brian@tangent.org-20080713224508-hb20z4okblotb39a
longlong replacement

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
70
70
 
71
71
#define INSIDE_HA_INNOBASE_CC
72
72
 
 
73
typedef int64_t longlong;
 
74
 
73
75
/* Include necessary InnoDB headers */
74
76
extern "C" {
75
77
#include "../storage/innobase/include/univ.i"
2036
2038
 
2037
2039
        /* TODO: use provided savepoint data area to store savepoint data */
2038
2040
 
2039
 
        longlong2str((ulint)savepoint, name, 36);
 
2041
        int64_t2str((ulint)savepoint, name, 36);
2040
2042
 
2041
2043
        error = (int) trx_rollback_to_savepoint_for_mysql(trx, name,
2042
2044
                                                &mysql_binlog_cache_pos);
2066
2068
 
2067
2069
        /* TODO: use provided savepoint data area to store savepoint data */
2068
2070
 
2069
 
        longlong2str((ulint)savepoint, name, 36);
 
2071
        int64_t2str((ulint)savepoint, name, 36);
2070
2072
 
2071
2073
        error = (int) trx_release_savepoint_for_mysql(trx, name);
2072
2074
 
2112
2114
 
2113
2115
        /* TODO: use provided savepoint data area to store savepoint data */
2114
2116
        char name[64];
2115
 
        longlong2str((ulint)savepoint,name,36);
 
2117
        int64_t2str((ulint)savepoint,name,36);
2116
2118
 
2117
2119
        error = (int) trx_savepoint_for_mysql(trx, name, (ib_longlong)0);
2118
2120
 
3789
3791
            && (trx->duplicates & (TRX_DUP_IGNORE | TRX_DUP_REPLACE))
3790
3792
                == TRX_DUP_IGNORE)  {
3791
3793
 
3792
 
                longlong        auto_inc;
 
3794
                int64_t auto_inc;
3793
3795
 
3794
3796
                auto_inc = table->next_number_field->val_int();
3795
3797
 
5825
5827
        }
5826
5828
 
5827
5829
        if (flag & HA_STATUS_AUTO && table->found_next_number_field) {
5828
 
                longlong        auto_inc;
 
5830
                int64_t auto_inc;
5829
5831
                int             ret;
5830
5832
 
5831
5833
                /* The following function call can the first time fail in
7191
7193
/*=========================================*/
7192
7194
                                                /* out: 0 or generic MySQL
7193
7195
                                                error code */
7194
 
        longlong*       value)                  /* out: the autoinc value */
 
7196
        int64_t*        value)                  /* out: the autoinc value */
7195
7197
{
7196
 
        longlong        auto_inc;
 
7198
        int64_t auto_inc;
7197
7199
        ibool           stmt_start;
7198
7200
        int             mysql_error = 0;
7199
7201
        dict_table_t*   innodb_table = prebuilt->table;
7581
7583
ha_innobase::get_mysql_bin_log_pos()
7582
7584
{
7583
7585
        /* trx... is ib_longlong, which is a typedef for a 64-bit integer
7584
 
        (__int64 or longlong) so it's ok to cast it to uint64_t. */
 
7586
        (__int64 or int64_t) so it's ok to cast it to uint64_t. */
7585
7587
 
7586
7588
        return(trx_sys_mysql_bin_log_pos);
7587
7589
}