maria-developers team mailing list archive

[Sergei Golubchik <serg@xxxxxxxxxxxx>]

Hi, Sanja!

On Dec 21, sanja@xxxxxxxxxxxx wrote:
> At file:///home/bell/maria/bzr/work-maria-10.0-cassandra/
> ------------------------------------------------------------
> revno: 3484
> revision-id: sanja@xxxxxxxxxxxx-20121221010609-cnr2z3fg99kpxzma
> committer: sanja@xxxxxxxxxxxx
> branch nick: work-maria-10.0-cassandra
> timestamp: Fri 2012-12-21 03:06:09 +0200
> message:
>   postreview fixes (part 5)

> === modified file 'include/ma_dyncol.h'
> --- a/include/ma_dyncol.h	2012-12-20 23:35:38 +0000
> +++ b/include/ma_dyncol.h	2012-12-21 01:06:09 +0000
> @@ -169,7 +169,8 @@ madyncol_exists_named(DYNAMIC_COLUMN *st
>  enum enum_dyncol_func_result
>  madyncol_list(DYNAMIC_COLUMN *org, DYNAMIC_ARRAY *array_of_uint);
>  enum enum_dyncol_func_result
> -madyncol_list_named(DYNAMIC_COLUMN *str, DYNAMIC_ARRAY *array_of_lexstr);
> +madyncol_list_named(DYNAMIC_COLUMN *str, DYNAMIC_ARRAY *array_of_lexstr,
> +                    void **memory_to_free);

Same here. You can put this memory in the dynarray and don't burden the
caller with these nuisanses. Or you can use a normal array, not a
dynarray.

>  /*
>     if the column do not exists it is NULL
> 
> === modified file 'mysql-test/r/dyncol.result'
> --- a/mysql-test/r/dyncol.result	2012-12-20 23:48:20 +0000
> +++ b/mysql-test/r/dyncol.result	2012-12-21 01:06:09 +0000
> @@ -1587,3 +1587,7 @@ COLUMN_CHECK('')
>  SELECT COLUMN_CHECK(NULL);
>  COLUMN_CHECK(NULL)
>  NULL
> +# quating check

"quoting"
But in fact, it's not quoting, it's escaping.

> +select column_json(column_create("string", "'\"/\\`.,whatever")),hex(column_create("string", "'\"/\\`.,whatever"));
> +column_json(column_create("string", "'\"/\\`.,whatever"))	hex(column_create("string", "'\"/\\`.,whatever"))
> +[{"string":"'\"/\\`.,whatever"}]	040100060000000300737472696E670827222F5C602E2C7768617465766572
> 
Regards,
Sergei