~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/message/include.am

  • Committer: Stewart Smith
  • Author(s): Marko Mäkelä, Stewart Smith
  • Date: 2010-11-17 05:52:09 UTC
  • mto: (2021.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1971.
  • Revision ID: stewart@flamingspork.com-20101117055209-69m035q6h7e1txrc
Merge Revision revid:marko.makela@oracle.com-20100629113248-fvl48lnzr44z94gg from MySQL InnoDB

Original revid:marko.makela@oracle.com-20100629113248-fvl48lnzr44z94gg

Original Authors: Marko Mkel <marko.makela@oracle.com>
Original commit message:
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4

Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
  ------------------------------------------------------------------------
  r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines

  branches/6.0: Allow the minimum length of a multi-byte character to be
  up to 4 bytes. (Bug #35391)

  dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
  In this way, the 5 bits can hold two values of 0..4, and the storage size
  of the fields will not cross the 64-bit boundary.  Encode the values as
  DATA_MBMAX * mbmaxlen + mbminlen.  Define the auxiliary macros
  DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
  DB_MINMAXLEN(mbminlen, mbmaxlen).

  Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.

  Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
  ha_innobase::store_key_val_for_row() now does that, but the added function
  row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.

  rb://49 approved by Heikki Tuuri
  ------------------------------------------------------------------------

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
               ${LIBPROTOBUF} \
22
22
               ${LIBUUID} \
23
23
               ${LTLIBINTL} \
24
 
               $(GCOV_LIBS)
 
24
               $(GCOV_LIBS) \
 
25
                drizzled/internal/libinternal.la
25
26
 
26
 
MESSAGE_AM_CXXFLAGS = ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS} ${NO_VISIBILITY}
 
27
MESSAGE_AM_CXXFLAGS = ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS}
27
28
 
28
29
noinst_PROGRAMS+= \
29
 
                  drizzled/message/catalog_reader \
30
 
                  drizzled/message/catalog_writer \
31
30
                  drizzled/message/schema_reader \
32
31
                  drizzled/message/schema_writer \
33
32
                  drizzled/message/table_raw_reader \
42
41
drizzled_message_libdrizzledmessage_la_SOURCES = drizzled/message/statement_transform.cc
43
42
drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF} $(GCOV_LIBS) drizzled/libcharset.la
44
43
 
45
 
nobase_dist_pkginclude_HEADERS+= \
46
 
                              drizzled/message/statement_transform.h
47
 
 
48
 
nodist_drizzled_message_libdrizzledmessage_la_SOURCES= \
49
 
                                                       drizzled/message/catalog.pb.cc \
50
 
                                                       drizzled/message/engine.pb.cc \
51
 
                                                       drizzled/message/event.pb.cc \
52
 
                                                       drizzled/message/resultset.pb.cc \
53
 
                                                       drizzled/message/schema.pb.cc \
54
 
                                                       drizzled/message/table.pb.cc \
55
 
                                                       drizzled/message/transaction.pb.cc
56
 
 
57
 
nobase_nodist_pkginclude_HEADERS+= \
58
 
                                drizzled/message/catalog.pb.h \
 
44
nobase_dist_include_HEADERS+= drizzled/message/statement_transform.h
 
45
 
 
46
nodist_drizzled_message_libdrizzledmessage_la_SOURCES = \
 
47
                                                        drizzled/message/event.pb.cc \
 
48
                                                        drizzled/message/engine.pb.cc \
 
49
                                                        drizzled/message/transaction.pb.cc \
 
50
                                                        drizzled/message/schema.pb.cc \
 
51
                                                        drizzled/message/resultset.pb.cc \
 
52
                                                        drizzled/message/table.pb.cc
 
53
 
 
54
nobase_nodist_include_HEADERS+= \
 
55
                                drizzled/message/event.pb.h \
59
56
                                drizzled/message/engine.pb.h \
60
 
                                drizzled/message/event.pb.h \
61
 
                                drizzled/message/resultset.pb.h \
 
57
                                drizzled/message/transaction.pb.h \
62
58
                                drizzled/message/schema.pb.h \
63
 
                                drizzled/message/table.pb.h \
64
 
                                drizzled/message/transaction.pb.h
 
59
                                drizzled/message/resultset.pb.h \
 
60
                                drizzled/message/table.pb.h 
65
61
 
66
62
noinst_HEADERS+= \
67
 
                 drizzled/message/ioutil.h
68
 
 
69
 
drizzled_message_catalog_reader_SOURCES =  drizzled/message/catalog_reader.cc
70
 
drizzled_message_catalog_reader_LDADD = ${MESSAGE_LDADD}
71
 
drizzled_message_catalog_reader_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}
72
 
 
73
 
drizzled_message_catalog_writer_SOURCES =  drizzled/message/catalog_writer.cc
74
 
drizzled_message_catalog_writer_LDADD = ${MESSAGE_LDADD}
75
 
drizzled_message_catalog_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}
 
63
                drizzled/message/ioutil.h \
 
64
                drizzled/message/all.h
 
65
 
76
66
 
77
67
drizzled_message_schema_reader_SOURCES =  drizzled/message/schema_reader.cc
78
68
drizzled_message_schema_reader_LDADD = ${MESSAGE_LDADD}
99
89
drizzled_message_transaction_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
100
90
 
101
91
EXTRA_DIST += \
102
 
              ${MESSAGE_DIR}/catalog.proto \
103
 
              ${MESSAGE_DIR}/engine.proto \
104
 
              ${MESSAGE_DIR}/event.proto \
105
 
              ${MESSAGE_DIR}/resultset.proto \
106
 
              ${MESSAGE_DIR}/schema.proto \
107
 
              ${MESSAGE_DIR}/table.proto \
108
 
              ${MESSAGE_DIR}/transaction.proto
 
92
                ${MESSAGE_DIR}/event.proto \
 
93
                ${MESSAGE_DIR}/engine.proto \
 
94
                ${MESSAGE_DIR}/schema.proto \
 
95
                ${MESSAGE_DIR}/table.proto \
 
96
                ${MESSAGE_DIR}/resultset.proto \
 
97
                ${MESSAGE_DIR}/transaction.proto
109
98
 
110
99
BUILT_SOURCES += \
111
 
                 ${MESSAGE_DIR}/catalog.pb.h \
112
 
                 ${MESSAGE_DIR}/engine.pb.h \
113
 
                 ${MESSAGE_DIR}/event.pb.h \
114
 
                 ${MESSAGE_DIR}/resultset.pb.h \
115
 
                 ${MESSAGE_DIR}/schema.pb.h \
116
 
                 ${MESSAGE_DIR}/table.pb.h \
117
 
                 ${MESSAGE_DIR}/transaction.pb.h
 
100
                ${MESSAGE_DIR}/event.pb.h \
 
101
                ${MESSAGE_DIR}/engine.pb.h \
 
102
                ${MESSAGE_DIR}/schema.pb.h \
 
103
                ${MESSAGE_DIR}/table.pb.h \
 
104
                ${MESSAGE_DIR}/resultset.pb.h \
 
105
                ${MESSAGE_DIR}/transaction.pb.h
118
106
 
119
107
CLEANFILES += \
120
 
              ${MESSAGE_DIR}/catalog.pb.cc \
121
 
              ${MESSAGE_DIR}/catalog.pb.h \
122
 
              ${MESSAGE_DIR}/engine.pb.cc \
123
 
              ${MESSAGE_DIR}/engine.pb.h \
124
 
              ${MESSAGE_DIR}/event.pb.cc \
125
 
              ${MESSAGE_DIR}/event.pb.h \
126
 
              ${MESSAGE_DIR}/resultset.pb.cc \
127
 
              ${MESSAGE_DIR}/resultset.pb.h \
128
 
              ${MESSAGE_DIR}/schema.pb.cc \
129
 
              ${MESSAGE_DIR}/schema.pb.h \
130
 
              ${MESSAGE_DIR}/table.pb.cc \
131
 
              ${MESSAGE_DIR}/table.pb.h \
132
 
              ${MESSAGE_DIR}/transaction.pb.cc \
133
 
              ${MESSAGE_DIR}/transaction.pb.h
 
108
            ${MESSAGE_DIR}/event.pb.h \
 
109
            ${MESSAGE_DIR}/event.pb.cc \
 
110
            ${MESSAGE_DIR}/engine.pb.h \
 
111
            ${MESSAGE_DIR}/engine.pb.cc \
 
112
            ${MESSAGE_DIR}/schema.pb.h \
 
113
            ${MESSAGE_DIR}/schema.pb.cc \
 
114
            ${MESSAGE_DIR}/table.pb.h \
 
115
            ${MESSAGE_DIR}/table.pb.cc \
 
116
            ${MESSAGE_DIR}/resultset.pb.h \
 
117
            ${MESSAGE_DIR}/resultset.pb.cc \
 
118
            ${MESSAGE_DIR}/transaction.pb.h \
 
119
            ${MESSAGE_DIR}/transaction.pb.cc
134
120
 
135
121
SUFFIXES += .proto .pb.cc .pb.h
136
122