~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/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:
1
1
# vim:ft=automake
2
 
#  Copyright (C) 2009 Sun Microsystems, Inc.
 
2
#  Copyright (C) 2009 Sun Microsystems
3
3
#
4
4
#  This program is free software; you can redistribute it and/or modify
5
5
#  it under the terms of the GNU General Public License as published by
19
19
EXTRA_DIST+= drizzled/internal/CHARSET_INFO.txt
20
20
noinst_HEADERS+= \
21
21
                drizzled/internal/aio_result.h \
 
22
                drizzled/internal/getrusage.h \
22
23
                drizzled/internal/iocache.h \
23
24
                drizzled/internal/m_string.h \
24
25
                drizzled/internal/my_bit.h \
43
44
                                          drizzled/internal/bmove_upp.cc \
44
45
                                          drizzled/internal/checksum.cc \
45
46
                                          drizzled/internal/default.cc \
 
47
                                          drizzled/internal/dtoa.cc \
46
48
                                          drizzled/internal/int2str.cc \
47
49
                                          drizzled/internal/iocache.cc \
48
50
                                          drizzled/internal/llstr.cc \
73
75
                                          drizzled/internal/my_redel.cc \
74
76
                                          drizzled/internal/my_rename.cc \
75
77
                                          drizzled/internal/my_static.cc \
 
78
                                          drizzled/internal/my_strtoll10.cc \
76
79
                                          drizzled/internal/my_symlink.cc \
77
80
                                          drizzled/internal/my_symlink2.cc \
78
81
                                          drizzled/internal/my_sync.cc \