← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/trx/trx0sys.cc

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/trx/trx0sys.cc
52
52
                                        fields */
53
53
};
54
54
 
55
 
#include <drizzled/errmsg_print.h>
56
 
 
57
55
/** The file format tag */
58
56
typedef struct file_format_struct       file_format_t;
59
57
 
1029
1027
                format_id = DICT_TF_FORMAT_MIN;
1030
1028
        }
1031
1029
 
1032
 
        drizzled::errmsg_printf(drizzled::error::INFO, "InnoDB: highest supported file format is %s",
1033
 
                                trx_sys_file_format_id_to_name(DICT_TF_FORMAT_MAX));
 
1030
        ut_print_timestamp(stderr);
 
1031
        fprintf(stderr,
 
1032
                "  InnoDB: highest supported file format is %s.\n",
 
1033
                trx_sys_file_format_id_to_name(DICT_TF_FORMAT_MAX));
1034
1034
 
1035
1035
        if (format_id > DICT_TF_FORMAT_MAX) {
1036
1036
 
1037
1037
                ut_a(format_id < FILE_FORMAT_NAME_N);
1038
1038
 
1039
 
                drizzled::errmsg_printf(drizzled::error::ERROR,
1040
 
                        "InnoDB: %s: the system tablespace is in a file "
1041
 
                        "format that this version doesn't support - %s",
 
1039
                ut_print_timestamp(stderr);
 
1040
                fprintf(stderr,
 
1041
                        "  InnoDB: %s: the system tablespace is in a file "
 
1042
                        "format that this version doesn't support - %s\n",
1042
1043
                        ((max_format_id <= DICT_TF_FORMAT_MAX)
1043
1044
                                ? "Error" : "Warning"),
1044
1045
                        trx_sys_file_format_id_to_name(format_id));