diff options
| author | unknown <guilhem@mysql.com> | 2003-07-03 01:08:36 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-07-03 01:08:36 +0200 |
| commit | e22a31f173d52e494baa547657ef090d83abd263 (patch) | |
| tree | 3235a831c55973714e4525cd26513dd5b9fe4a72 /sql/sql_acl.cc | |
| parent | c0eb448582cce5b899ed58a0e1b03e8ee732a05c (diff) | |
| download | mariadb-git-e22a31f173d52e494baa547657ef090d83abd263.tar.gz | |
I committed the same changeset in my tree yesterday, but broke the tree since,
so I commit again in a fresh tree.
Fix for bug#763 (Relay_log_space too big by 4 bytes),
plus comments and DBUG_PRINT, and we don't start replication
if --bootstrap.
mysql-test/r/rpl_log.result:
Result update
mysql-test/r/rpl_log_pos.result:
Result update
sql/mysqld.cc:
Don't start replication if in bootstrap mode (bootstrap isn't supposed to have
several threads).
sql/slave.cc:
Fix for bug 763 (Relay_log_space too big by 4 bytes).
A DBUG_PRINT.
sql/sql_acl.cc:
Replaced a return by DBUG_RETURN (happened to find this reading a debug log).
sql/sql_repl.cc:
A comment.
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 225d84f4751..697b5d8ffd6 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2250,7 +2250,7 @@ int mysql_grant (THD *thd, const char *db, List <LEX_USER> &list, if (!initialized) { send_error(&(thd->net), ER_UNKNOWN_COM_ERROR); /* purecov: tested */ - return 1; /* purecov: tested */ + DBUG_RETURN(1); /* purecov: tested */ } if (lower_case_table_names && db) |