← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/release_savepoint.cc

  • 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:
drizzled/statement/release_savepoint.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2009 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2009 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
40
40
   * unbind it from our deque.
41
41
   */
42
42
  TransactionServices &transaction_services= TransactionServices::singleton();
43
 
  deque<NamedSavepoint> &savepoints= getSession()->transaction.savepoints;
 
43
  deque<NamedSavepoint> &savepoints= session->transaction.savepoints;
44
44
  deque<NamedSavepoint>::iterator iter;
45
45
 
46
46
  for (iter= savepoints.begin();
50
50
    NamedSavepoint &sv= *iter;
51
51
    const string &sv_name= sv.getName();
52
52
    if (my_strnncoll(system_charset_info,
53
 
                     (unsigned char *) getSession()->lex->ident.str,
54
 
                     getSession()->lex->ident.length,
 
53
                     (unsigned char *) session->lex->ident.str,
 
54
                     session->lex->ident.length,
55
55
                     (unsigned char *) sv_name.c_str(),
56
56
                     sv_name.size()) == 0)
57
57
      break;
59
59
  if (iter != savepoints.end())
60
60
  {
61
61
    NamedSavepoint &sv= *iter;
62
 
    (void) transaction_services.releaseSavepoint(*getSession(), sv);
 
62
    (void) transaction_services.releaseSavepoint(session, sv);
63
63
    savepoints.erase(iter);
64
 
    getSession()->my_ok();
 
64
    session->my_ok();
65
65
  }
66
66
  else
67
67
  {
68
68
    my_error(ER_SP_DOES_NOT_EXIST, 
69
69
             MYF(0), 
70
70
             "SAVEPOINT", 
71
 
             getSession()->lex->ident.str);
 
71
             session->lex->ident.str);
72
72
  }
73
73
  return false;
74
74
}