Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cta
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

959ef66c

Commit 959ef66c authored 5 years ago by Eric Cano

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into 252-533-merge

Conflicts:
	catalogue/CMakeLists.txt

parents 2140d351 df6d8f2c

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 2 additions, 3 deletions

.gitlab-ci.yml
catalogue/CMakeLists.txt 5 additions, 1 deletion

catalogue/CMakeLists.txt
catalogue/common_catalogue_schema.sql 55 additions, 55 deletions

catalogue/common_catalogue_schema.sql
catalogue/mysql_catalogue_schema_header.sql 2 additions, 2 deletions

catalogue/mysql_catalogue_schema_header.sql
catalogue/oracle_catalogue_schema_header.sql 6 additions, 6 deletions

catalogue/oracle_catalogue_schema_header.sql
rdbms/StmtTest.cpp 6 additions, 48 deletions

rdbms/StmtTest.cpp
rdbms/wrapper/MysqlStmt.cpp 1 addition, 0 deletions

rdbms/wrapper/MysqlStmt.cpp

with 77 additions and 115 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

imprint | privacy | Conditions of Use