Merge alf.:D:/src/mysql-5.1-maint

into  alf.:D:/src/mysql-5.1-maint_pt

scripts/CMakeLists.txt

@@ -13,20 +13,30 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+# Build mysql_fix_privilege_tables.sql
+ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables.sql
+                   COMMAND copy /b
+                   mysql_system_tables.sql + mysql_system_tables_fix.sql
+                   mysql_fix_privilege_tables.sql
+                   DEPENDS
+                   ${PROJECT_SOURCE_DIR}/scripts/mysql_system_tables.sql
+                   ${PROJECT_SOURCE_DIR}/scripts/mysql_system_tables_fix.sql)
 
+# Build comp_sql - used for embedding SQL in C or C++ programs
 ADD_EXECUTABLE(comp_sql comp_sql.c)
 TARGET_LINK_LIBRARIES(comp_sql dbug mysys strings)
 
-# Build comp_sql - used for embedding SQL in C or C++ programs
+# Use comp_sql to build mysql_fix_privilege_tables_sql.c
 GET_TARGET_PROPERTY(COMP_SQL_EXE comp_sql LOCATION)
 
 ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables_sql.c
                    COMMAND ${COMP_SQL_EXE}
                    mysql_fix_privilege_tables
                    mysql_fix_privilege_tables.sql
-		           mysql_fix_privilege_tables_sql.c
+                   mysql_fix_privilege_tables_sql.c
                    DEPENDS comp_sql ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables.sql)
 
+# Add dummy target for the above to be built
 ADD_CUSTOM_TARGET(GenFixPrivs
                   ALL
                   DEPENDS ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables_sql.c)

sql/log_event_old.cc

@@ -84,8 +84,8 @@ int Update_rows_log_event_old::do_prepare_row(THD *thd,
                         row_start, &m_cols, row_end, &m_master_reclength,
                         table->write_set, PRE_GA_UPDATE_ROWS_EVENT);
 
-  DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
-  DBUG_DUMP("m_after_image", m_after_image, table->s->reclength);
+  DBUG_DUMP("record[0]", (const char*) table->record[0], table->s->reclength);
+  DBUG_DUMP("m_after_image", (const char *) m_after_image, table->s->reclength);
 
 
   /*