database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Fix merge errors

Browse Source
This commit is contained in:
Andrew Hutchings
2018-05-31 15:04:04 +01:00
parent 1d8964ec0d
commit 4764094e4a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dbcon/ddlpackage/ddl.y
View File

@ -198,6 +198,7 @@ VARYING WITH ZONE DOUBLE IDB_FLOAT REAL CHARSET IDB_IF EXISTS CHANGE TRUNCATE
%type <str> opt_if_not_exists %type <str> opt_if_not_exists
%type <sqlStmt> trunc_table_statement %type <sqlStmt> trunc_table_statement
%type <sqlStmt> rename_table_statement %type <sqlStmt> rename_table_statement
%type <str> ident
%% %%
stmtblock: stmtmulti { x->fParseTree = $1; } stmtblock: stmtmulti { x->fParseTree = $1; }
@ -615,7 +616,7 @@ table_name:
; ;
qualified_name: qualified_name:
| ident { ident {
if (x->fDBSchema.size()) if (x->fDBSchema.size())
$$ = new QualifiedName((char*)x->fDBSchema.c_str(), $1); $$ = new QualifiedName((char*)x->fDBSchema.c_str(), $1);
else else

1
writeengine/splitter/we_cmdargs.h
View File

@ -81,6 +81,7 @@ public:
{ {
return fReadBufSize; return fReadBufSize;
} }
int getMode()
{ {
return fMode; return fMode;
} }