~drizzle-trunk/drizzle/development

Viewing changes to plugin/innobase/row/row0merge.c

Committer: Stewart Smith
Author(s): stewart at flamingspork
Date: 2010-10-12 05:40:58 UTC
mto: (1843.1.3 build) (2021.1.2 build) (1953.1.1 build) (1819.7.43 update-innobase)
mto: This revision was merged to the branch mainline in revision 1844.
Revision ID: stewart@flamingspork.com-20101012054058-2aw48x58ys1ienw3

[patch 002/129] Merge patch for revision 1787 from InnoDB SVN:
revno: 1787
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5663
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5662
committer: marko
timestamp: Tue 2009-08-11 10:42:37 +0000
message:
  branches/zip: trx_general_rollback_for_mysql(): Remove the redundant
  parameter partial. If savept==NULL, partial==FALSE.
modified:
  handler/handler0alter.cc       1845@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fhandler%2Fhandler0alter.cc
  include/trx0roll.h             2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Ftrx0roll.h
  row/row0merge.c                1414@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Frow%2Frow0merge.c
  row/row0mysql.c                2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frow%2Frow0mysql.c
  trx/trx0roll.c                 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Ftrx%2Ftrx0roll.c
diff:
=== modified file 'handler/handler0alter.cc'