diff options
| author | unknown <serg@serg.mylan> | 2004-03-20 15:56:20 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-03-20 15:56:20 +0100 |
| commit | 1f08d0b4bdfd85f8bea89cf1a2c729558ab69aad (patch) | |
| tree | d4c56f8d494eeaa3fef7e4b774b1c3c51de85981 | |
| parent | b399754780edce812991b36d108af48bf581f4c4 (diff) | |
| download | mariadb-git-1f08d0b4bdfd85f8bea89cf1a2c729558ab69aad.tar.gz | |
sys_var_str.value is never NULL
| -rw-r--r-- | sql/slave.cc | 2 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 37afe456ce3..5493d422d37 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3188,7 +3188,7 @@ log '%s' at position %s, relay log '%s' position: %s", RPL_LOG_NAME, llstr(rli->group_relay_log_pos,llbuff1)); /* execute init_slave variable */ - if (sys_init_slave.value) + if (sys_init_slave.value_length) { execute_init_command(thd, &sys_init_slave, &LOCK_sys_init_slave); if (thd->query_error) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7e6d0ca2434..761c55bb44d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1000,7 +1000,7 @@ pthread_handler_decl(handle_one_connection,arg) net->compress=1; // Use compression thd->version= refresh_version; - if (sys_init_connect.value && !(thd->master_access & SUPER_ACL)) + if (sys_init_connect.value_length && !(thd->master_access & SUPER_ACL)) { execute_init_command(thd, &sys_init_connect, &LOCK_sys_init_connect); if (thd->query_error) |