hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-06-05 13:25:27 +03:00
parent 47b7f1c69c 09a445f1b7
commit 457fc80647
39 changed files with 300 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/modules/routing/avrorouter/avro_index.c
View File

@ -140,6 +140,7 @@ void avro_index_file(AVRO_INSTANCE *router, const char* filename)
errmsg = NULL;
prev_gtid = gtid;
}
json_decref(row);
}
else
{
@ -205,7 +206,7 @@ void avro_update_index(AVRO_INSTANCE* router)
/** The SQL for the in-memory used_tables table */
static const char *insert_sql = "INSERT OR IGNORE INTO "MEMORY_TABLE_NAME
"(domain, server_id, sequence, binlog_timestamp, table_name)"
" VALUES (%lu, %lu, %lu, %lu, \"%s\")";
" VALUES (%lu, %lu, %lu, %u, \"%s\")";
/**
* @brief Add a used table to the current transaction