diff --git a/build.sh b/build.sh index 394ea3c02460beb3ad9fb90f8d10d5495acd4d91..e99e1d67c725f3a7409657725bd6e933931fbed7 100755 --- a/build.sh +++ b/build.sh @@ -90,7 +90,7 @@ function do_rpm() { set -x sw - PACKAGE=obproxy + PACKAGE=obproxy-ce VERSION=3.2.0 RELEASE=1 PREFIX=/home/admin/obproxy @@ -106,7 +106,7 @@ function do_rpm() mkdir -p ${TMP_DIR}/RPMS mkdir -p ${TMP_DIR}/SOURCES mkdir -p ${TMP_DIR}/SRPMS - cp obproxy-${VERSION}.tar.gz ${TMP_DIR}/SOURCES + cp ${PACKAGE}-${VERSION}.tar.gz ${TMP_DIR}/SOURCES cd ${TMP_DIR}/BUILD echo "[BUILD] make rpms..._prefix=${PREFIX} spec_file=${SPEC_FILE}" diff --git a/configure.ac b/configure.ac index cffaf5ad516b84fa56d51e9e4c32b3823e26af3a..0efb6d94fa7081f9b801710498b52075ab444456 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_INIT([OceanBase], [3.2.0], [wgs13579@gmail.com], - [obproxy], + [obproxy-ce], [http://oceanbase.taobao.org/]) obapi_version="3.2.0" diff --git a/src/obproxy/proxy/api/ob_api.cpp b/src/obproxy/proxy/api/ob_api.cpp index 3be1b05c98e86eab3e24578984e6f2dbc97d8ef5..22f7ffb896c12e45738aa5c05a775a20e8418093 100644 --- a/src/obproxy/proxy/api/ob_api.cpp +++ b/src/obproxy/proxy/api/ob_api.cpp @@ -21,7 +21,7 @@ #include "proxy/plugins/ob_mysql_response_prepare_transform_plugin.h" #include "proxy/plugins/ob_mysql_request_compress_transform_plugin.h" #include "proxy/plugins/ob_mysql_response_cursor_transform_plugin.h" -#include "proxy/plugins/ob_mysql_response_prepare_execute_transform_plugin.h" +#include "proxy/plugins/ob_mysql_response_new_ps_transform_plugin.h" /**************************************************************** * IMPORTANT - READ ME diff --git a/src/obproxy/proxy/plugins/Makemodule.am b/src/obproxy/proxy/plugins/Makemodule.am index ec6fe5a1ef70cc836bd3d626d8f31522ba85c8b9..69fd1b449380d9f7a03b880bf0c386e1ce0f3110 100644 --- a/src/obproxy/proxy/plugins/Makemodule.am +++ b/src/obproxy/proxy/plugins/Makemodule.am @@ -9,5 +9,5 @@ obproxy/proxy/plugins/ob_mysql_request_prepare_transform_plugin.cpp\ obproxy/proxy/plugins/ob_mysql_request_prepare_transform_plugin.h\ obproxy/proxy/plugins/ob_mysql_response_cursor_transform_plugin.cpp\ obproxy/proxy/plugins/ob_mysql_response_cursor_transform_plugin.h\ -obproxy/proxy/plugins/ob_mysql_response_prepare_execute_transform_plugin.cpp\ -obproxy/proxy/plugins/ob_mysql_response_prepare_execute_transform_plugin.h +obproxy/proxy/plugins/ob_mysql_response_new_ps_transform_plugin.cpp\ +obproxy/proxy/plugins/ob_mysql_response_new_ps_transform_plugin.h diff --git a/src/obproxy/proxy/plugins/ob_mysql_response_prepare_execute_transform_plugin.cpp b/src/obproxy/proxy/plugins/ob_mysql_response_new_ps_transform_plugin.cpp similarity index 99% rename from src/obproxy/proxy/plugins/ob_mysql_response_prepare_execute_transform_plugin.cpp rename to src/obproxy/proxy/plugins/ob_mysql_response_new_ps_transform_plugin.cpp index 1c5040f9c9c2479fb1f5b72dd3ad41a8a5d9a8a0..c1fa79502fa68240fd5c8a3cf6a7759c4d5c3b85 100644 --- a/src/obproxy/proxy/plugins/ob_mysql_response_prepare_execute_transform_plugin.cpp +++ b/src/obproxy/proxy/plugins/ob_mysql_response_new_ps_transform_plugin.cpp @@ -10,7 +10,7 @@ * See the Mulan PubL v2 for more details. */ -#include "ob_mysql_response_prepare_execute_transform_plugin.h" +#include "ob_mysql_response_new_ps_transform_plugin.h" #include "ob_mysql_response_cursor_transform_plugin.h" #include "rpc/obmysql/packet/ompk_prepare.h" #include "rpc/obmysql/packet/ompk_field.h" diff --git a/src/obproxy/proxy/plugins/ob_mysql_response_prepare_execute_transform_plugin.h b/src/obproxy/proxy/plugins/ob_mysql_response_new_ps_transform_plugin.h similarity index 100% rename from src/obproxy/proxy/plugins/ob_mysql_response_prepare_execute_transform_plugin.h rename to src/obproxy/proxy/plugins/ob_mysql_response_new_ps_transform_plugin.h