[MDEV-4993] Impossible to free a dynamic column - Jira

Details

Type: Bug
Status: Closed (View Workflow)
Priority: Minor
Resolution: Fixed
Affects Version/s: 10.0.5
Fix Version/s: None
Component/s: None
Labels:
None
Environment:
Windows

Description

It's not possible to free a dynamic column, since dynstr_free() is not exported. Additionally the initialization macro should have a mariadb_ prefix.

Suggested fix:

=== modified file 'include/ma_dyncol.h'

--- include/ma_dyncol.h 2013-01-29 14:10:47 +0000

+++ include/ma_dyncol.h 2013-09-04 06:59:14 +0000

@@ -181,7 +181,7 @@

 enum enum_dyncol_func_result

 mariadb_dyncol_json(DYNAMIC_COLUMN *str, DYNAMIC_STRING *json);

-#define dynamic_column_initialize(A) memset((A), 0, sizeof(*(A)))

+#define mariadb_dyncol_init(A) memset((A), 0, sizeof(*(A)))

 #define dynamic_column_column_free(V) dynstr_free(V)

 /* conversion of values to 3 base types */

=== modified file 'libmysql/CMakeLists.txt'

--- libmysql/CMakeLists.txt     2013-07-21 14:39:19 +0000

+++ libmysql/CMakeLists.txt     2013-09-04 06:52:40 +0000

@@ -229,6 +229,7 @@

 mariadb_dyncol_update_many_named

 mariadb_dyncol_exists

 mariadb_dyncol_exists_named

+mariadb_dyncol_free

 mariadb_dyncol_list

 mariadb_dyncol_list_named

 mariadb_dyncol_get

=== modified file 'mysys/ma_dyncol.c'

--- mysys/ma_dyncol.c   2013-08-07 15:40:25 +0000

+++ mysys/ma_dyncol.c   2013-09-04 06:49:57 +0000

@@ -4324,3 +4324,13 @@

   *column_count= header.column_count;

   return rc;

+/**

+  Free dynamic column

+  @param str             The packed string

+*/

+void mariadb_dyncol_free(DYNAMIC_COLUMN *str)

+{

+  dynstr_free(str);

+}

Attachments

Activity

Ascending order - Click to sort in descending order

Georg Richter created issue - 2013-09-04 10:06

Oleksandr Byelkin made changes - 2013-09-12 08:31

Field	Original Value	New Value
Status	Open [ 1 ]	In Progress [ 3 ]

Oleksandr Byelkin made changes - 2013-09-12 09:47

Status

In Progress [ 3 ]

Stalled [ 10000 ]

Sergei Golubchik made changes - 2013-09-13 11:13

Description

It's not possible to free a dynamic column, since dynstr_free() is not exported. Additionally the initialization macro should have a mariadb prefix.

Suggested fix:
=== modified file 'include/ma_dyncol.h'
--- include/ma_dyncol.h 2013-01-29 14:10:47 +0000
+++ include/ma_dyncol.h 2013-09-04 06:59:14 +0000
@@ -181,7 +181,7 @@
enum enum_dyncol_func_result
mariadb_dyncol_json(DYNAMIC_COLUMN *str, DYNAMIC_STRING *json);

-#define dynamic_column_initialize(A) memset((A), 0, sizeof(*(A)))
+#define mariadb_dyncol_init(A) memset((A), 0, sizeof(*(A)))
#define dynamic_column_column_free(V) dynstr_free(V)

/* conversion of values to 3 base types */

=== modified file 'libmysql/CMakeLists.txt'
--- libmysql/CMakeLists.txt 2013-07-21 14:39:19 +0000
+++ libmysql/CMakeLists.txt 2013-09-04 06:52:40 +0000
@@ -229,6 +229,7 @@
mariadb_dyncol_update_many_named
mariadb_dyncol_exists
mariadb_dyncol_exists_named
+mariadb_dyncol_free
mariadb_dyncol_list
mariadb_dyncol_list_named
mariadb_dyncol_get

=== modified file 'mysys/ma_dyncol.c'
--- mysys/ma_dyncol.c 2013-08-07 15:40:25 +0000
+++ mysys/ma_dyncol.c 2013-09-04 06:49:57 +0000
@@ -4324,3 +4324,13 @@
*column_count= header.column_count;
return rc;
}
+
+/**
+ Free dynamic column
+
+ @param str The packed string
+*/
+void mariadb_dyncol_free(DYNAMIC_COLUMN *str)
+{
+ dynstr_free(str);
+}

It's not possible to free a dynamic column, since {{dynstr_free()}} is not exported. Additionally the initialization macro should have a {{mariadb_}} prefix.

Suggested fix:
{noformat}
=== modified file 'include/ma_dyncol.h'
--- include/ma_dyncol.h 2013-01-29 14:10:47 +0000
+++ include/ma_dyncol.h 2013-09-04 06:59:14 +0000
@@ -181,7 +181,7 @@
enum enum_dyncol_func_result
mariadb_dyncol_json(DYNAMIC_COLUMN *str, DYNAMIC_STRING *json);

-#define dynamic_column_initialize(A) memset((A), 0, sizeof(*(A)))
+#define mariadb_dyncol_init(A) memset((A), 0, sizeof(*(A)))
#define dynamic_column_column_free(V) dynstr_free(V)

/* conversion of values to 3 base types */

=== modified file 'libmysql/CMakeLists.txt'
--- libmysql/CMakeLists.txt 2013-07-21 14:39:19 +0000
+++ libmysql/CMakeLists.txt 2013-09-04 06:52:40 +0000
@@ -229,6 +229,7 @@
mariadb_dyncol_update_many_named
mariadb_dyncol_exists
mariadb_dyncol_exists_named
+mariadb_dyncol_free
mariadb_dyncol_list
mariadb_dyncol_list_named
mariadb_dyncol_get

=== modified file 'mysys/ma_dyncol.c'
--- mysys/ma_dyncol.c 2013-08-07 15:40:25 +0000
+++ mysys/ma_dyncol.c 2013-09-04 06:49:57 +0000
@@ -4324,3 +4324,13 @@
*column_count= header.column_count;
return rc;
}
+
+/**
+ Free dynamic column
+
+ @param str The packed string
+*/
+void mariadb_dyncol_free(DYNAMIC_COLUMN *str)
+{
+ dynstr_free(str);
+}
{noformat}

Sergei Golubchik made changes - 2013-09-13 11:14

Priority

Trivial [ 5 ]

Minor [ 4 ]

Oleksandr Byelkin made changes - 2013-09-17 19:22

Status

Stalled [ 10000 ]

In Progress [ 3 ]

Oleksandr Byelkin made changes - 2013-09-17 20:00

Status

In Progress [ 3 ]

Stalled [ 10000 ]

Oleksandr Byelkin made changes - 2013-09-17 20:41

Status

Stalled [ 10000 ]

In Progress [ 3 ]

Oleksandr Byelkin made changes - 2013-09-17 20:48

Status

In Progress [ 3 ]

Stalled [ 10000 ]

Oleksandr Byelkin made changes - 2013-09-18 11:35

Resolution		Fixed [ 1 ]
Status	Stalled [ 10000 ]	Closed [ 6 ]

Sergei Golubchik made changes - 2014-06-13 15:06

Workflow

defaullt [ 28818 ]

MariaDB v2 [ 43303 ]

Rasmus Johansson (Inactive) made changes - 2015-05-18 17:50

Workflow

MariaDB v2 [ 43303 ]

MariaDB v3 [ 62390 ]

Sergei Golubchik made changes - 2021-12-06 21:39

Workflow

MariaDB v3 [ 62390 ]

MariaDB v4 [ 147015 ]

People

Assignee:: Oleksandr Byelkin

Reporter:: Georg Richter

Votes:: 0 Vote for this issue

Watchers:: 3 Start watching this issue

Dates

Created:: 2013-09-04 10:06

Updated:: 2013-09-18 11:35

Resolved:: 2013-09-18 11:35

Git Integration

Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.

MariaDB Server

Details

Description

Attachments

Activity

People

Dates

Git Integration