← Back to branch summary

~ubuntu-branches/ubuntu/wily/mysql-5.6/wily

« back to all changes in this revision

Viewing changes to storage/federated/ha_federated.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-04-16 20:07:10 UTC
  • mto: (1.3.9 vivid-proposed)
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: package-import@ubuntu.com-20150416200710-pcrsa022082zj46k
Tags: upstream-5.6.24
Import upstream version 5.6.24

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/federated/ha_federated.cc
1
 
/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
 
1
/* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
2
2
 
3
3
  This program is free software; you can redistribute it and/or modify
4
4
  it under the terms of the GNU General Public License as published by
402
402
 
403
403
/* Variables used when chopping off trailing characters */
404
404
static const uint sizeof_trailing_comma= sizeof(", ") - 1;
405
 
static const uint sizeof_trailing_closeparen= sizeof(") ") - 1;
406
405
static const uint sizeof_trailing_and= sizeof(" AND ") - 1;
407
406
static const uint sizeof_trailing_where= sizeof(" WHERE ") - 1;
408
407
 
2902
2901
 
2903
2902
  }
2904
2903
 
2905
 
  if (flag & HA_STATUS_AUTO)
 
2904
  if ((flag & HA_STATUS_AUTO) && mysql)
2906
2905
    stats.auto_increment_value= mysql->insert_id;
2907
2906
 
2908
2907
  mysql_free_result(result);