diff --git a/cci/include/cas_cci.h b/cci/include/cas_cci.h index bacd7c6..a7b4551 100755 --- a/cci/include/cas_cci.h +++ b/cci/include/cas_cci.h @@ -209,7 +209,7 @@ #define SSIZEOF(val) ((ssize_t) sizeof(val)) #endif -#define CON_HANDLE_ID_FACTOR 1000000 +#define CON_HANDLE_ID_FACTOR 500000 #define GET_CON_ID(H) ((H) / CON_HANDLE_ID_FACTOR) #define GET_REQ_ID(H) ((H) % CON_HANDLE_ID_FACTOR) @@ -437,7 +437,8 @@ typedef enum CCI_SCH_IMPORTED_KEYS, CCI_SCH_EXPORTED_KEYS, CCI_SCH_CROSS_REFERENCE, - CCI_SCH_LAST = CCI_SCH_CROSS_REFERENCE + CCI_SCH_ATTR_WITH_SYNONYM, + CCI_SCH_LAST = CCI_SCH_ATTR_WITH_SYNONYM } T_CCI_SCH_TYPE; typedef enum diff --git a/cci/include/cas_error.h b/cci/include/cas_error.h deleted file mode 100755 index 6332083..0000000 --- a/cci/include/cas_error.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) 2008 Search Solution Corporation - * Copyright (C) 2016 CUBRID Corporation - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * - Neither the name of the nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - */ - -/* - * cas_error.h - - */ - -#ifndef _CAS_ERROR_H_ -#define _CAS_ERROR_H_ - -#ident "$Id$" - -#ifdef __cplusplus -extern "C" -{ -#endif - - - typedef enum - { - CAS_ER_DBMS = -10000, - CAS_ER_INTERNAL = -10001, - CAS_ER_NO_MORE_MEMORY = -10002, - CAS_ER_COMMUNICATION = -10003, - CAS_ER_ARGS = -10004, - CAS_ER_TRAN_TYPE = -10005, - CAS_ER_SRV_HANDLE = -10006, - CAS_ER_NUM_BIND = -10007, - CAS_ER_UNKNOWN_U_TYPE = -10008, - CAS_ER_DB_VALUE = -10009, - CAS_ER_TYPE_CONVERSION = -10010, - CAS_ER_PARAM_NAME = -10011, - CAS_ER_NO_MORE_DATA = -10012, - CAS_ER_OBJECT = -10013, - CAS_ER_OPEN_FILE = -10014, - CAS_ER_SCHEMA_TYPE = -10015, - CAS_ER_VERSION = -10016, - CAS_ER_FREE_SERVER = -10017, - CAS_ER_NOT_AUTHORIZED_CLIENT = -10018, - CAS_ER_QUERY_CANCEL = -10019, - CAS_ER_NOT_COLLECTION = -10020, - CAS_ER_COLLECTION_DOMAIN = -10021, - CAS_ER_NO_MORE_RESULT_SET = -10022, - CAS_ER_INVALID_CALL_STMT = -10023, - CAS_ER_STMT_POOLING = -10024, - CAS_ER_DBSERVER_DISCONNECTED = -10025, - CAS_ER_MAX_PREPARED_STMT_COUNT_EXCEEDED = -10026, - CAS_ER_HOLDABLE_NOT_ALLOWED = -10027, - CAS_ER_NOT_IMPLEMENTED = -10100, - CAS_ER_MAX_CLIENT_EXCEEDED = -10101, - CAS_ER_INVALID_CURSOR_POS = -10102, - CAS_ER_SSL_TYPE_NOT_ALLOWED = -10103, - CAS_ER_IS = -10200, - } T_CAS_ERROR_CODE; - - -#ifdef __cplusplus -} -#endif - -#endif /* _CAS_ERROR_H_ */ diff --git a/cci/include/dbtran_def.h b/cci/include/dbtran_def.h deleted file mode 100755 index fac7c6a..0000000 --- a/cci/include/dbtran_def.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2008 Search Solution Corporation. All rights reserved by Search Solution. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -/* - * Transaction isolation definitions - */ - -#ifndef _DBTRAN_DEF_H_ -#define _DBTRAN_DEF_H_ - -typedef enum -{ - TRAN_UNKNOWN_ISOLATION = 0x00, /* 0 0000 */ - - TRAN_READ_COMMITTED = 0x04, /* 0 0100 */ - TRAN_REP_CLASS_COMMIT_INSTANCE = 0x04, /* Alias of above */ - TRAN_CURSOR_STABILITY = 0x04, /* Alias of above */ - - TRAN_REPEATABLE_READ = 0x05, /* 0 0101 */ - TRAN_REP_READ = 0x05, /* Alias of above */ - TRAN_REP_CLASS_REP_INSTANCE = 0x05, /* Alias of above */ - TRAN_DEGREE_2_9999_CONSISTENCY = 0x05, /* Alias of above */ - - TRAN_SERIALIZABLE = 0x06, /* 0 0110 */ - TRAN_DEGREE_3_CONSISTENCY = 0x06, /* Alias of above */ - TRAN_NO_PHANTOM_READ = 0x06, /* Alias of above */ - - TRAN_DEFAULT_ISOLATION = TRAN_READ_COMMITTED, - MVCC_TRAN_DEFAULT_ISOLATION = TRAN_READ_COMMITTED, - - TRAN_MINVALUE_ISOLATION = 0x04, /* internal use only */ - TRAN_MAXVALUE_ISOLATION = 0x06, /* internal use only */ - - // aliases for CCI compatibility - TRAN_ISOLATION_MIN = 0x04, - TRAN_ISOLATION_MAX = 0x06, -} DB_TRAN_ISOLATION; - -#define IS_VALID_ISOLATION_LEVEL(isolation_level) \ - (TRAN_MINVALUE_ISOLATION <= (isolation_level) \ - && (isolation_level) <= TRAN_MAXVALUE_ISOLATION) - -#define TRAN_DEFAULT_ISOLATION_LEVEL() (TRAN_DEFAULT_ISOLATION) - -#define TRAN_ASYNC_WS_BIT 0x10 /* 1 0000 */ -#define TRAN_ISO_LVL_BITS 0x0F /* 0 1111 */ - -#endif // _DBTRAN_DEF_H_ diff --git a/cci/lib32/cas_cci_14.lib b/cci/lib32/cas_cci_14.lib index 2555e2c..749ecd8 100755 Binary files a/cci/lib32/cas_cci_14.lib and b/cci/lib32/cas_cci_14.lib differ diff --git a/cci/lib32/cas_cci_d_14.lib b/cci/lib32/cas_cci_d_14.lib index f40eebb..79d48eb 100755 Binary files a/cci/lib32/cas_cci_d_14.lib and b/cci/lib32/cas_cci_d_14.lib differ diff --git a/cci/lib64/cas_cci_14.lib b/cci/lib64/cas_cci_14.lib index 6965aa3..d612379 100755 Binary files a/cci/lib64/cas_cci_14.lib and b/cci/lib64/cas_cci_14.lib differ diff --git a/cci/lib64/cas_cci_d_14.lib b/cci/lib64/cas_cci_d_14.lib index f97e298..f2f9485 100755 Binary files a/cci/lib64/cas_cci_d_14.lib and b/cci/lib64/cas_cci_d_14.lib differ diff --git a/odbc_version.i b/odbc_version.i index 770894e..07227ad 100644 --- a/odbc_version.i +++ b/odbc_version.i @@ -1,5 +1,5 @@ #define MAJOR_VERSION 11 -#define MINOR_VERSION 2 -#define PATCH_VERSION 1 -#define BUILD_SERIAL_NUMBER 0060 -#define VERSION_STRING "11.2.1.0060" +#define MINOR_VERSION 3 +#define PATCH_VERSION 0 +#define BUILD_SERIAL_NUMBER 0061 +#define VERSION_STRING "11.3.0.0061"