diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-30 16:39:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-30 16:39:20 +0200 |
| commit | 36e59752e7fc70bc5179a3d730b5ce3ee58e4e30 (patch) | |
| tree | 0d3e30ce973b2e1f044931c0eb1846d7192becda /client/mysqlslap.c | |
| parent | 7c0779da7c37f6ef6eff2f79dda6f1b0c57e3869 (diff) | |
| parent | 1dd3c8f8ba49ec06e550d7376d27ff05ce024bec (diff) | |
| download | mariadb-git-36e59752e7fc70bc5179a3d730b5ce3ee58e4e30.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'client/mysqlslap.c')
| -rw-r--r-- | client/mysqlslap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 420dc2b94af..4cb6cbcc15b 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -850,7 +850,7 @@ build_table_string(void) if (auto_generate_sql_guid_primary) { - dynstr_append(&table_string, "id varchar(32) primary key"); + dynstr_append(&table_string, "id varchar(36) primary key"); if (num_int_cols || num_char_cols || auto_generate_sql_guid_primary) dynstr_append(&table_string, ","); @@ -865,7 +865,7 @@ build_table_string(void) if (count) /* Except for the first pass we add a comma */ dynstr_append(&table_string, ","); - if (snprintf(buf, HUGE_STRING_LENGTH, "id%d varchar(32) unique key", count) + if (snprintf(buf, HUGE_STRING_LENGTH, "id%d varchar(36) unique key", count) > HUGE_STRING_LENGTH) { fprintf(stderr, "Memory Allocation error in create table\n"); |