From 42309289abe262922bd5b66c255b3572e8f17ba3 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 23 Jul 2019 15:21:15 +0300 Subject: [PATCH 1/2] fix typo: mysqlx => mysqlx_x --- mysqlx_x_session.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysqlx_x_session.cc b/mysqlx_x_session.cc index 1028d706..d99c0d80 100644 --- a/mysqlx_x_session.cc +++ b/mysqlx_x_session.cc @@ -76,7 +76,7 @@ mysqlx_register_x_session_class(UNUSED_INIT_FUNC_ARGS, zend_object_handlers * /* zend_class_entry tmp_ce; INIT_NS_CLASS_ENTRY(tmp_ce, "mysql_xdevapi", "XSession", mysqlx_x_session_methods); mysqlx_x_session_class_entry = zend_register_internal_class_ex( - &tmp_ce, mysqlx_session_class_entry); + &tmp_ce, mysqlx_x_session_class_entry); } zend_hash_init(&mysqlx_x_session_properties, 0, nullptr, mysqlx_free_property_cb, 1); From a6a092fb014447e3ebc12141df506a21a57f8af9 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Wed, 24 Jul 2019 12:49:40 +0300 Subject: [PATCH 2/2] use correct functions to register these classes --- mysqlx_session.cc | 3 +-- mysqlx_x_session.cc | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mysqlx_session.cc b/mysqlx_session.cc index e810e5d1..944c1438 100644 --- a/mysqlx_session.cc +++ b/mysqlx_session.cc @@ -838,8 +838,7 @@ mysqlx_register_session_class(UNUSED_INIT_FUNC_ARGS, zend_object_handlers * mysq zend_class_entry tmp_ce; INIT_NS_CLASS_ENTRY(tmp_ce, "mysql_xdevapi", "Session", mysqlx_session_methods); tmp_ce.create_object = php_mysqlx_session_object_allocator; - mysqlx_session_class_entry = zend_register_internal_class_ex( - &tmp_ce, mysqlx_session_class_entry); + mysqlx_session_class_entry = zend_register_internal_class(&tmp_ce); } zend_hash_init(&mysqlx_session_properties, 0, nullptr, mysqlx_free_property_cb, 1); diff --git a/mysqlx_x_session.cc b/mysqlx_x_session.cc index d99c0d80..d617e001 100644 --- a/mysqlx_x_session.cc +++ b/mysqlx_x_session.cc @@ -75,8 +75,7 @@ mysqlx_register_x_session_class(UNUSED_INIT_FUNC_ARGS, zend_object_handlers * /* { zend_class_entry tmp_ce; INIT_NS_CLASS_ENTRY(tmp_ce, "mysql_xdevapi", "XSession", mysqlx_x_session_methods); - mysqlx_x_session_class_entry = zend_register_internal_class_ex( - &tmp_ce, mysqlx_x_session_class_entry); + mysqlx_x_session_class_entry = zend_register_internal_class(&tmp_ce); } zend_hash_init(&mysqlx_x_session_properties, 0, nullptr, mysqlx_free_property_cb, 1);