← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Removed my_vsnprintf and my_snprintf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
5707
5707
                        prebuilt->trx->op_info = "returning various info to MySQL";
5708
5708
                }
5709
5709
 
5710
 
                my_snprintf(path, sizeof(path), "%s/%s%s",
5711
 
                                mysql_data_home, ib_table->name, reg_ext);
 
5710
                snprintf(path, sizeof(path), "%s/%s%s",
 
5711
                         mysql_data_home, ib_table->name, reg_ext);
5712
5712
 
5713
5713
                unpack_filename(path,path);
5714
5714
 
6479
6479
                    binlog_format == BINLOG_FORMAT_STMT)
6480
6480
                {
6481
6481
                        char buf[256];
6482
 
                        my_snprintf(buf, sizeof(buf),
6483
 
                                    "Transaction level '%s' in"
6484
 
                                    " InnoDB is not safe for binlog mode '%s'",
6485
 
                                    tx_isolation_names[tx_isolation],
6486
 
                                    binlog_format_names[binlog_format]);
 
6482
                        snprintf(buf, sizeof(buf),
 
6483
                                 "Transaction level '%s' in"
 
6484
                                 " InnoDB is not safe for binlog mode '%s'",
 
6485
                                 tx_isolation_names[tx_isolation],
 
6486
                                 binlog_format_names[binlog_format]);
6487
6487
                        my_error(ER_BINLOG_LOGGING_IMPOSSIBLE, MYF(0), buf);
6488
6488
                        DBUG_RETURN(HA_ERR_LOGGING_IMPOSSIBLE);
6489
6489
                }
6840
6840
#ifdef UNIV_DEBUG
6841
6841
                if (mutex->mutex_type != 1) {
6842
6842
                        if (mutex->count_using > 0) {
6843
 
                                buf1len= my_snprintf(buf1, sizeof(buf1),
 
6843
                                buf1len= snprintf(buf1, sizeof(buf1),
6844
6844
                                        "%s:%s",
6845
6845
                                        mutex->cmutex_name, mutex->cfile_name);
6846
 
                                buf2len= my_snprintf(buf2, sizeof(buf2),
 
6846
                                buf2len= snprintf(buf2, sizeof(buf2),
6847
6847
                                        "count=%lu, spin_waits=%lu,"
6848
6848
                                        " spin_rounds=%lu, "
6849
6849
                                        "os_waits=%lu, os_yields=%lu,"
6873
6873
                        rw_lock_wait_time += mutex->lspent_time;
6874
6874
                }
6875
6875
#else /* UNIV_DEBUG */
6876
 
                buf1len= my_snprintf(buf1, sizeof(buf1), "%s:%lu",
6877
 
                                     mutex->cfile_name, (ulong) mutex->cline);
6878
 
                buf2len= my_snprintf(buf2, sizeof(buf2), "os_waits=%lu",
6879
 
                                     mutex->count_os_wait);
 
6876
                buf1len= snprintf(buf1, sizeof(buf1), "%s:%lu",
 
6877
                                  mutex->cfile_name, (ulong) mutex->cline);
 
6878
                buf2len= snprintf(buf2, sizeof(buf2), "os_waits=%lu",
 
6879
                                  mutex->count_os_wait);
6880
6880
 
6881
6881
                if (stat_print(thd, innobase_hton_name,
6882
6882
                               hton_name_len, buf1, buf1len,
6892
6892
        mutex_exit_noninline(&mutex_list_mutex);
6893
6893
 
6894
6894
#ifdef UNIV_DEBUG
6895
 
        buf2len= my_snprintf(buf2, sizeof(buf2),
 
6895
        buf2len= snprintf(buf2, sizeof(buf2),
6896
6896
                "count=%lu, spin_waits=%lu, spin_rounds=%lu, "
6897
6897
                "os_waits=%lu, os_yields=%lu, os_wait_times=%lu",
6898
6898
                rw_lock_count, rw_lock_count_spin_loop,