Deleted Added
full compact
apr_dbd_mysql.c (253734) apr_dbd_mysql.c (272076)
1/* Licensed to the Apache Software Foundation (ASF) under one or more
2 * contributor license agreements. See the NOTICE file distributed with
3 * this work for additional information regarding copyright ownership.
4 * The ASF licenses this file to You under the Apache License, Version 2.0
5 * (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0

--- 1036 unchanged lines hidden (view full) ---

1045 /* rollback on error or explicit rollback request */
1046 if (trans->errnum || TXN_DO_ROLLBACK(trans)) {
1047 trans->errnum = 0;
1048 ret = mysql_rollback(trans->handle->conn);
1049 }
1050 else {
1051 ret = mysql_commit(trans->handle->conn);
1052 }
1/* Licensed to the Apache Software Foundation (ASF) under one or more
2 * contributor license agreements. See the NOTICE file distributed with
3 * this work for additional information regarding copyright ownership.
4 * The ASF licenses this file to You under the Apache License, Version 2.0
5 * (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0

--- 1036 unchanged lines hidden (view full) ---

1045 /* rollback on error or explicit rollback request */
1046 if (trans->errnum || TXN_DO_ROLLBACK(trans)) {
1047 trans->errnum = 0;
1048 ret = mysql_rollback(trans->handle->conn);
1049 }
1050 else {
1051 ret = mysql_commit(trans->handle->conn);
1052 }
1053 ret |= mysql_autocommit(trans->handle->conn, 1);
1054 trans->handle->trans = NULL;
1053 }
1055 }
1054 ret |= mysql_autocommit(trans->handle->conn, 1);
1055 trans->handle->trans = NULL;
1056 return ret;
1057}
1058/* Whether or not transactions work depends on whether the
1059 * underlying DB supports them within MySQL. Unfortunately
1060 * it fails silently with the default InnoDB.
1061 */
1062
1063static int dbd_mysql_transaction(apr_pool_t *pool, apr_dbd_t *handle,

--- 242 unchanged lines hidden ---
1056 return ret;
1057}
1058/* Whether or not transactions work depends on whether the
1059 * underlying DB supports them within MySQL. Unfortunately
1060 * it fails silently with the default InnoDB.
1061 */
1062
1063static int dbd_mysql_transaction(apr_pool_t *pool, apr_dbd_t *handle,

--- 242 unchanged lines hidden ---