Merge lp://staging/~clint-fewbar/gearmand/fix-sql-regression into lp://staging/gearmand/1.0

Thanks, I'll pull it into the build tree in a moment.

I also have an update on that tree to disable epoch if the schema is not updated.

On Apr 26, 2011, at 7:18 AM, Clint Byrum wrote:

> Clint Byrum has proposed merging lp:~clint-fewbar/gearmand/fix-sql-regression into lp:gearmand.
>
> Requested reviews:
> Gearman-developers (gearman-developers)
> Related bugs:
> Bug #770654 in Gearman: "Two SQL typos in libgearman-server/plugins/queue/drizzle/queue.cc "
> https://bugs.launchpad.net/gearmand/+bug/770654
>
> For more details, see:
> https://code.launchpad.net/~clint-fewbar/gearmand/fix-sql-regression/+merge/59064
>
> Fix for borken SQL
> --
> https://code.launchpad.net/~clint-fewbar/gearmand/fix-sql-regression/+merge/59064
> Your team Gearman-developers is requested to review the proposed merge of lp:~clint-fewbar/gearmand/fix-sql-regression into lp:gearmand.
> === modified file 'libgearman-server/plugins/queue/drizzle/queue.cc'
> --- libgearman-server/plugins/queue/drizzle/queue.cc 2011-04-05 23:59:40 +0000
> +++ libgearman-server/plugins/queue/drizzle/queue.cc 2011-04-26 14:18:28 +0000
> @@ -263,9 +263,8 @@
> "function_name VARCHAR(255),"
> "priority INT,"
> "data LONGBLOB,"
> + "when_to_run INT,"
> "unique key (unique_key, function_name)"
> - "data LONGBLOB,"
> - "when_to_run INT"
> ")",
> queue->table.c_str(), GEARMAN_UNIQUE_SIZE);
>
> @@ -352,7 +351,7 @@
> query.resize(((unique_size + function_name_size + data_size) * 2) + GEARMAN_QUEUE_QUERY_BUFFER);
>
> size_t query_size= (size_t)snprintf(query.c_str(), query.size(),
> - "INSERT INTO %s SET priority=%u,when_to_run=%lldunique_key='",
> + "INSERT INTO %s SET priority=%u,when_to_run=%lld,unique_key='",
> queue->table.c_str(), (uint32_t)priority,
> (long long unsigned int)when);
>
>