mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Manual merge of 5.1.5 build changes into the general tree.

Browse source
This commit is contained in:
joerg@mysql.com 2006-01-17 13:32:28 +01:00
commit 728c67466d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/log_event.cc
View file

@ -6171,7 +6171,7 @@ char const *Write_rows_log_event::do_prepare_row(THD *thd, TABLE *table,
*/ */
DBUG_ASSERT(table->s->fields >= m_width); DBUG_ASSERT(table->s->fields >= m_width);
DBUG_ASSERT(ptr); DBUG_ASSERT(ptr);
ptr= unpack_row(table, table->record[0], ptr, &m_cols); ptr= unpack_row(table, (char*)table->record[0], ptr, &m_cols);
return ptr; return ptr;
} }

2
sql/log_event.h
View file

@ -1784,7 +1784,7 @@ public:
/* Special constants representing sets of flags */ /* Special constants representing sets of flags */
enum enum
{ {
NO_FLAGS = 0U RLE_NO_FLAGS = 0U
}; };
virtual ~Rows_log_event(); virtual ~Rows_log_event();