diff options
| author | unknown <monty@mysql.com> | 2003-12-21 02:07:45 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-21 02:07:45 +0200 |
| commit | 4f72061f4095e5c9b5823f998b58302eef19382a (patch) | |
| tree | b4b50b6b03398c2d68a97d79f6b2d07eb470327e /sql/log_event.h | |
| parent | e622f6fb0bdf48c7fff4d0819a276f0f6418e0ab (diff) | |
| download | mariadb-git-4f72061f4095e5c9b5823f998b58302eef19382a.tar.gz | |
Update for VC++
(Fixed project files, compiler warnings etc..)
BitKeeper/etc/ignore:
added mysql_priv.h
VC++Files/libmysqld/libmysqld.dsp:
Update for VC++to
VC++Files/sql/mysqld.dsp:
Update for VC++
client/mysqlbinlog.cc:
Remove not used variable
sql-common/client.c:
Fix for compilation with VC++
sql/filesort.cc:
Remove not used variable
sql/item_timefunc.cc:
Fixed compiler warnings
sql/log_event.cc:
Fixed compiler warnings
- One can't portable allocate an stack-array dynamicly
- Changed sql_mode to ulong to match THD.variables.sql_mode (If they are not the same we get a lot of compiler warnings)
sql/log_event.h:
Changed sql_mode to ulong to match THD.variables.sql_mode (If they are not the same we get a lot of compiler warnings)
sql/sp.cc:
sql_mode to ulong
Don't use strcpy
Replaced sprintf() with strmov
sql/sp_cache.cc:
Fixed compiler warning
sql/sp_head.cc:
Removed not used variable
sql/sp_rcontext.cc:
Removed not used variable
sql/sp_rcontext.h:
Fixed compiler warning
sql/sql_class.cc:
Portability fix
sql/sql_delete.cc:
Fixed compiler warning
sql/sql_insert.cc:
Fixed compiler warning
sql/sql_update.cc:
Fixed compiler warning
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 147a943144b..7f161267add 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -386,7 +386,7 @@ typedef struct st_last_event_info bool flags2_inited; uint32 flags2; bool sql_mode_inited; - ulonglong sql_mode; + ulong sql_mode; /* must be same as THD.variables.sql_mode */ st_last_event_info() : flags2_inited(0), flags2(0), sql_mode_inited(0), sql_mode(0) { @@ -604,7 +604,7 @@ public: concerned) from here. */ - uint32 catalog_len; + uint catalog_len; /* <= 255 char */ /* We want to be able to store a variable number of N-bit status vars: @@ -642,7 +642,7 @@ public: uint32 flags2; /* In connections sql_mode is 32 bits now but will be 64 bits soon */ - ulonglong sql_mode; + ulong sql_mode; #ifndef MYSQL_CLIENT |