summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorguilhem@mysql.com <>2003-07-28 15:33:46 +0200
committerguilhem@mysql.com <>2003-07-28 15:33:46 +0200
commit4eccbd87cdaec8afaa83a26a34b858b32069d3ce (patch)
treed5fd34fca5c07b445a658df5934ecb5441401599 /sql
parent8af74e5b1fc44ebb746909469f79eb8220016557 (diff)
downloadmariadb-git-4eccbd87cdaec8afaa83a26a34b858b32069d3ce.tar.gz
Avoid segfault when LOAD DATA FROM MASTER is run on a master which does no
binary logging.
Diffstat (limited to 'sql')
-rw-r--r--sql/repl_failsafe.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index 1552b3994e9..0a5f90617d1 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -860,7 +860,7 @@ int load_master_data(THD* thd)
of LOAD DATA FROM MASTER - no reason to forbid it, really,
although it does not make much sense for the user to do it
*/
- if (row[0] && row[1])
+ if (row && row[0] && row[1])
{
strmake(active_mi->master_log_name, row[0],
sizeof(active_mi->master_log_name));