diff options
| author | unknown <serg@serg.mysql.com> | 2003-03-15 11:56:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-03-15 11:56:03 +0100 |
| commit | aad26453e66074dbbbcc66628a975dd135c41a53 (patch) | |
| tree | 85f19615b035a30b82ceeb288c57b0a8425fcbe0 /sql/protocol.cc | |
| parent | f42419e4b3ee12aad381a7e9e4e219b74252921c (diff) | |
| download | mariadb-git-aad26453e66074dbbbcc66628a975dd135c41a53.tar.gz | |
fixed typo (double ++ in assert)
removed all side effects from asserts for not to confuse casual reader
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index ce2ce49dcd8..454b8bae625 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -719,7 +719,8 @@ bool Protocol_simple::store(const char *from, uint length) bool Protocol_simple::store_tiny(longlong from) { #ifndef DEBUG_OFF - DBUG_ASSERT(field_types == 0 || field_types[field_pos++] == MYSQL_TYPE_TINY); + DBUG_ASSERT(field_types == 0 || field_types[field_pos] == MYSQL_TYPE_TINY); + field_pos++; #endif char buff[20]; return net_store_data((char*) buff, @@ -731,7 +732,8 @@ bool Protocol_simple::store_short(longlong from) { #ifndef DEBUG_OFF DBUG_ASSERT(field_types == 0 || - field_types[field_pos++] == MYSQL_TYPE_SHORT); + field_types[field_pos] == MYSQL_TYPE_SHORT); + field_pos++; #endif char buff[20]; return net_store_data((char*) buff, @@ -742,9 +744,10 @@ bool Protocol_simple::store_short(longlong from) bool Protocol_simple::store_long(longlong from) { #ifndef DEBUG_OFF - DBUG_ASSERT(field_types == 0 || - field_types[field_pos++] == MYSQL_TYPE_INT24 || - field_types[field_pos++] == MYSQL_TYPE_LONG); + DBUG_ASSERT(field_types == 0 || + field_types[field_pos] == MYSQL_TYPE_INT24 || + field_types[field_pos] == MYSQL_TYPE_LONG); + field_pos++; #endif char buff[20]; return net_store_data((char*) buff, @@ -756,7 +759,8 @@ bool Protocol_simple::store_longlong(longlong from, bool unsigned_flag) { #ifndef DEBUG_OFF DBUG_ASSERT(field_types == 0 || - field_types[field_pos++] == MYSQL_TYPE_LONGLONG); + field_types[field_pos] == MYSQL_TYPE_LONGLONG); + field_pos++; #endif char buff[22]; return net_store_data((char*) buff, @@ -770,7 +774,8 @@ bool Protocol_simple::store(float from, uint32 decimals, String *buffer) { #ifndef DEBUG_OFF DBUG_ASSERT(field_types == 0 || - field_types[field_pos++] == MYSQL_TYPE_FLOAT); + field_types[field_pos] == MYSQL_TYPE_FLOAT); + field_pos++; #endif buffer->set((double) from, decimals, thd->variables.thd_charset); return net_store_data((char*) buffer->ptr(), buffer->length()); @@ -781,7 +786,8 @@ bool Protocol_simple::store(double from, uint32 decimals, String *buffer) { #ifndef DEBUG_OFF DBUG_ASSERT(field_types == 0 || - field_types[field_pos++] == MYSQL_TYPE_DOUBLE); + field_types[field_pos] == MYSQL_TYPE_DOUBLE); + field_pos++; #endif buffer->set(from, decimals, thd->variables.thd_charset); return net_store_data((char*) buffer->ptr(), buffer->length()); @@ -829,7 +835,8 @@ bool Protocol_simple::store_date(TIME *tm) { #ifndef DEBUG_OFF DBUG_ASSERT(field_types == 0 || - field_types[field_pos++] == MYSQL_TYPE_DATE); + field_types[field_pos] == MYSQL_TYPE_DATE); + field_pos++; #endif char buff[40]; uint length; @@ -845,7 +852,8 @@ bool Protocol_simple::store_time(TIME *tm) { #ifndef DEBUG_OFF DBUG_ASSERT(field_types == 0 || - field_types[field_pos++] == MYSQL_TYPE_TIME); + field_types[field_pos] == MYSQL_TYPE_TIME); + field_pos++; #endif char buff[40]; uint length; @@ -1035,7 +1043,7 @@ bool Protocol_prep::store(TIME *tm) uint length; field_pos++; pos= buff+1; - + int2store(pos, tm->year); pos[2]= (uchar) tm->month; pos[3]= (uchar) tm->day; @@ -1074,7 +1082,7 @@ bool Protocol_prep::store_time(TIME *tm) field_pos++; pos= buff+1; pos[0]= tm->neg ? 1 : 0; - int4store(pos+1, tm->day); + int4store(pos+1, tm->day); pos[5]= (uchar) tm->hour; pos[6]= (uchar) tm->minute; pos[7]= (uchar) tm->second; |