diff options
| author | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
| commit | 62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a (patch) | |
| tree | 4e2cfa6a6a8032773454e22aa802b2798b2935b8 /sql/repl_failsafe.cc | |
| parent | 96458f8f64641d5b974a17733af8c709b513bfe0 (diff) | |
| parent | 0944bed7fcb59fb38230a750bd820a22b3b6b476 (diff) | |
| download | mariadb-git-62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a.tar.gz | |
Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index d7b70fe122c..66c6e7c508d 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -14,8 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -// Sasha Pachev <sasha@mysql.com> is currently in charge of this file - #include "mysql_priv.h" #ifdef HAVE_REPLICATION |