[Commits] ec0084c: postreview changes

sanja at mariadb.com sanja at mariadb.com
Thu Mar 12 10:47:21 EET 2015


revision-id: ec0084c72d63ab998cbe4416464197335f4cd51f
parent(s): ef567841b7cf7f2dab41ecdf56b157294af7292b
committer: Oleksandr Byelkin
branch nick: server
timestamp: 2015-03-12 09:47:19 +0100
message:

postreview changes

---
 sql/sql_parse.cc | 2 +-
 sql/sql_yacc.yy  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index d3406b0..723e348 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2730,7 +2730,7 @@ static bool do_execute_sp(THD *thd, sp_head *sp)
     }
   }
 
-  if (thd->lex->mi.connection_name.str == NullS)
+  if (thd->lex->mi.connection_name.str == NULL)
       thd->lex->mi.connection_name= thd->variables.default_master_connection;
 
   /*
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 640cbea..fe44fd2 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -2443,8 +2443,7 @@ optional_connection_name:
           /* empty */
           {
             LEX *lex= thd->lex;
-            lex->mi.connection_name.str= NullS;
-            lex->mi.connection_name.length= 0;
+            lex->mi.connection_name= null_lex_str;
           }
         | connection_name;
         ;
@@ -12675,8 +12674,7 @@ show_param:
         | SLAVE STATUS_SYM
           {
             LEX *lex= thd->lex;
-            lex->mi.connection_name.str= NullS;
-            lex->mi.connection_name.length= 0;
+            lex->mi.connection_name= null_lex_str;
             lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
             lex->verbose= 0;
           }


More information about the commits mailing list