← Back to branch summary

~ubuntu-branches/ubuntu/precise/mysql-5.5/precise-201203300109

« back to all changes in this revision

Viewing changes to storage/innobase/row/row0mysql.c

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-02-14 23:59:22 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120214235922-cux5uek1e5l0hje9
Tags: 5.5.20-0ubuntu1
https://launchpad.net/bugs/688541
https://launchpad.net/bugs/907465
https://launchpad.net/bugs/917542
https://launchpad.net/bugs/912487
http://bugs.debian.org/659566
* New upstream release.
* d/mysql-server-5.5.mysql.upstart: Fix stop on to make sure mysql is
  fully stopped before shutdown commences. (LP: #688541) Also simplify
  start on as it is redundant.
* d/control: Depend on upstart version which has apparmor profile load
  script to prevent failure on upgrade from lucid to precise.
  (LP: #907465)
* d/apparmor-profile: need to allow /run since that is the true path
  of /var/run files. (LP: #917542)
* d/control: mysql-server-5.5 has files in it that used to be owned
  by libmysqlclient-dev, so it must break/replace it. (LP: #912487)
* d/rules, d/control: 5.5.20 Fixes segfault on tests with gcc 4.6,
  change compiler back to system default.
* d/rules: Turn off embedded libedit/readline.(Closes: #659566)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/row/row0mysql.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 2000, 2010, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 2000, 2011, Oracle and/or its affiliates. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
289
289
                /* space=0x0020 */
290
290
                pad_end = pad + len;
291
291
                ut_a(!(len % 2));
292
 
                do {
 
292
                while (pad < pad_end) {
293
293
                        *pad++ = 0x00;
294
294
                        *pad++ = 0x20;
295
 
                } while (pad < pad_end);
 
295
                };
296
296
                break;
297
297
        case 4:
298
298
                /* space=0x00000020 */
299
299
                pad_end = pad + len;
300
300
                ut_a(!(len % 4));
301
 
                do {
 
301
                while (pad < pad_end) {
302
302
                        *pad++ = 0x00;
303
303
                        *pad++ = 0x00;
304
304
                        *pad++ = 0x00;
305
305
                        *pad++ = 0x20;
306
 
                } while (pad < pad_end);
 
306
                }
307
307
                break;
308
308
        }
309
309
}
3995
3995
                        trx->error_state = DB_SUCCESS;
3996
3996
                        trx_general_rollback_for_mysql(trx, NULL);
3997
3997
                        trx->error_state = DB_SUCCESS;
 
3998
                        err = DB_ERROR;
3998
3999
                        goto funct_exit;
3999
4000
                }
4000
4001