diff options
| author | unknown <monty@mysql.com> | 2004-05-27 00:30:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-27 00:30:28 +0300 |
| commit | 7c5cd4125dfe7b6891aeffc567387573695714c3 (patch) | |
| tree | 5ed4e118d371f2a1d84eaaef85c5869d24977363 /sql | |
| parent | 5fe72df8fd23a5b5f6938a9e559e916594b78449 (diff) | |
| parent | cc24ac7079827af1290a87ca0d5ce817329a9f6b (diff) | |
| download | mariadb-git-7c5cd4125dfe7b6891aeffc567387573695714c3.tar.gz | |
merge with 4.0 to get windows fixes
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/include/mtr0mtr.h:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/que/que0que.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index abbccb32034..fd65ec64a76 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -515,6 +515,7 @@ end: #else #define UNLOCK_MUTEX #define LOCK_MUTEX +#define max_allowed_packet (*mysql_get_parameters()->p_max_allowed_packet) #endif /* |