diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-13 12:22:34 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-13 12:22:34 +0000 |
| commit | 40949a3110a97e41d48c24e51004851521dd807b (patch) | |
| tree | dddf2d3ec6941e3f9c47deefb52bcfa19ef6a23e /sql/log_event.h | |
| parent | 26b12adb5d19fea7308edd0c2b49e1c972ea79c3 (diff) | |
| parent | 51caeae915d3a5add57a785e69b7ce52cac084ad (diff) | |
| download | mariadb-git-40949a3110a97e41d48c24e51004851521dd807b.tar.gz | |
merge mysql-next-mr --> mysql-5.1-rpl-merge
Conflicts:
Text conflict in sql/log.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_base.cc
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index c3689a2317f..9f14b30d2e2 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -975,11 +975,11 @@ public: constructor and pass description_event as an argument. */ static Log_event* read_log_event(IO_CACHE* file, - pthread_mutex_t* log_lock, + mysql_mutex_t* log_lock, const Format_description_log_event *description_event); static int read_log_event(IO_CACHE* file, String* packet, - pthread_mutex_t* log_lock); + mysql_mutex_t* log_lock); /* init_show_field_list() prepares the column names and types for the output of SHOW BINLOG EVENTS; it is used only by SHOW BINLOG |