提交 081e91d1 编写于 作者: S Shengliang Guan

Merge from 2.0

...@@ -16,6 +16,30 @@ steps: ...@@ -16,6 +16,30 @@ steps:
- cd debug - cd debug
- cmake .. - cmake ..
- make - make
trigger:
event:
- pull_request
when:
branch:
- develop
- master
---
kind: pipeline
name: test_arm64_bionic
platform:
os: linux
arch: arm64
steps:
- name: build
image: arm64v8/ubuntu:bionic
commands:
- apt-get update
- apt-get install -y cmake build-essential
- mkdir debug
- cd debug
- cmake .. -DCPUTYPE=aarch64 > /dev/null
- make
trigger: trigger:
event: event:
- pull_request - pull_request
...@@ -26,7 +50,7 @@ steps: ...@@ -26,7 +50,7 @@ steps:
- 2.0 - 2.0
--- ---
kind: pipeline kind: pipeline
name: test_arm64 name: test_arm64_focal
platform: platform:
os: linux os: linux
...@@ -34,10 +58,61 @@ platform: ...@@ -34,10 +58,61 @@ platform:
steps: steps:
- name: build - name: build
image: gcc image: arm64v8/ubuntu:focal
commands: commands:
- echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
- apt-get update - apt-get update
- apt-get install -y cmake build-essential - apt-get install -y -qq cmake build-essential
- mkdir debug
- cd debug
- cmake .. -DCPUTYPE=aarch64 > /dev/null
- make
trigger:
event:
- pull_request
when:
branch:
- develop
- master
- 2.0
---
kind: pipeline
name: test_arm64_centos7
platform:
os: linux
arch: arm64
steps:
- name: build
image: arm64v8/centos:7
commands:
- yum install -y gcc gcc-c++ make cmake git
- mkdir debug
- cd debug
- cmake .. -DCPUTYPE=aarch64 > /dev/null
- make
trigger:
event:
- pull_request
when:
branch:
- develop
- master
- 2.0
---
kind: pipeline
name: test_arm64_centos8
platform:
os: linux
arch: arm64
steps:
- name: build
image: arm64v8/centos:8
commands:
- dnf install -y gcc gcc-c++ make cmake epel-release git libarchive
- mkdir debug - mkdir debug
- cd debug - cd debug
- cmake .. -DCPUTYPE=aarch64 > /dev/null - cmake .. -DCPUTYPE=aarch64 > /dev/null
...@@ -52,7 +127,7 @@ steps: ...@@ -52,7 +127,7 @@ steps:
- 2.0 - 2.0
--- ---
kind: pipeline kind: pipeline
name: test_arm name: test_arm_bionic
platform: platform:
os: linux os: linux
...@@ -75,8 +150,6 @@ steps: ...@@ -75,8 +150,6 @@ steps:
branch: branch:
- develop - develop
- master - master
- 2.0
--- ---
kind: pipeline kind: pipeline
name: build_trusty name: build_trusty
...@@ -103,7 +176,6 @@ steps: ...@@ -103,7 +176,6 @@ steps:
branch: branch:
- develop - develop
- master - master
- 2.0
--- ---
kind: pipeline kind: pipeline
name: build_xenial name: build_xenial
...@@ -129,7 +201,6 @@ steps: ...@@ -129,7 +201,6 @@ steps:
branch: branch:
- develop - develop
- master - master
- 2.0
--- ---
kind: pipeline kind: pipeline
...@@ -155,7 +226,6 @@ steps: ...@@ -155,7 +226,6 @@ steps:
branch: branch:
- develop - develop
- master - master
- 2.0
--- ---
kind: pipeline kind: pipeline
name: build_centos7 name: build_centos7
...@@ -179,28 +249,4 @@ steps: ...@@ -179,28 +249,4 @@ steps:
branch: branch:
- develop - develop
- master - master
- 2.0
---
kind: pipeline
name: goodbye
platform:
os: linux
arch: amd64
steps:
- name: 64-bit
image: alpine
commands:
- echo 64-bit is good.
when:
branch:
- develop
- master
- 2.0
depends_on:
- test_arm64
- test_amd64
\ No newline at end of file
Subproject commit 4a4d79099b076b8ff12d5b4fdbcba54049a6866d Subproject commit a44ec1ca493ad01b2bf825b6418f69e11f548206
...@@ -5982,7 +5982,7 @@ static int32_t prepareStbStmtBind( ...@@ -5982,7 +5982,7 @@ static int32_t prepareStbStmtBind(
int64_t startTime, int32_t recSeq, int64_t startTime, int32_t recSeq,
bool isColumn) bool isColumn)
{ {
char *bindBuffer = calloc(1, g_args.len_of_binary); char *bindBuffer = calloc(1, DOUBLE_BUFF_LEN); // g_args.len_of_binary);
if (bindBuffer == NULL) { if (bindBuffer == NULL) {
errorPrint("%s() LN%d, Failed to allocate %d bind buffer\n", errorPrint("%s() LN%d, Failed to allocate %d bind buffer\n",
__func__, __LINE__, g_args.len_of_binary); __func__, __LINE__, g_args.len_of_binary);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册