Merge lp://staging/~capttofu/maria/bug_571200 into lp://staging/maria/5.3

Proposed by CaptTofu
Status: Needs review
Proposed branch: lp://staging/~capttofu/maria/bug_571200
Merge into: lp://staging/maria/5.3
Diff against target: 784 lines (+308/-104)
7 files modified
mysql-test/suite/federated/federated_bug_32426.result (+30/-0)
mysql-test/suite/federated/federated_bug_32426.test (+24/-0)
storage/federated/ha_federated.cc (+1/-1)
storage/federatedx/federatedx_io_mysql.cc (+60/-8)
storage/federatedx/federatedx_io_null.cc (+22/-0)
storage/federatedx/ha_federatedx.cc (+140/-75)
storage/federatedx/ha_federatedx.h (+31/-20)
To merge this branch: bzr merge lp://staging/~capttofu/maria/bug_571200
Reviewer Review Type Date Requested Status
Maria-captains Pending
Review via email: mp+31606@code.staging.launchpad.net

Description of the change

revno: 2804
committer: Patrick Galbraith <patg@patg-desktop>
branch nick: maria-stock
timestamp: Fri 2010-07-23 15:37:32 -0400
message:
  Maria BUG# 571200, MySQL BUG# 32426: Fixed BLOG column order by for FederatedX

  Applied Antony's fixes to what I had started. These fixes were from his
  multi-bug fix at
  http://bazaar.launchpad.net/~atcurtis/maria/federatedx/revision/2833
  and are only the fixes for the ORDER BY BUG. I will also add separately the
  other fixes per-bug

  * Merged in fix for MySQL Bug#32426, http://lists.mysql.com/commits/102419
    However the io back-end is seperated from the front-end.
  * Added 3 new methods for the i/o class to abstract result set cursor
    positioning. Note to future self pertaining to IO subclasses for other
    drivers such as ODBC
  * Added test 'federated_bug_32426' to suite.

  https://bugs.launchpad.net/maria/+bug/571200

To post a comment you must log in.
Revision history for this message
Michael Widenius (monty) wrote :

Hi!

>>>>> "CaptTofu" == CaptTofu <email address hidden> writes:

CaptTofu> CaptTofu has proposed merging lp:~capttofu/maria/bug_571200 into lp:maria.
CaptTofu> Requested reviews:
CaptTofu> Maria-captains (maria-captains)
CaptTofu> Related bugs:
CaptTofu> #571200 MySQL Bug#32426: FederatedX corrupt ORDER BY with TEXT
CaptTofu> https://bugs.launchpad.net/bugs/571200

Great!

I will review this tomorrow and if ok pull it into 5.1

Regards,
Monty

Revision history for this message
Michael Widenius (monty) wrote :

I was looking at merging this to 5.1 to fix the open federated bugs in 5.1, but the tree is depending on 5.2

i will look at this next week (after linuxconf) and see if I can easily extract the patch and apply it safely to 5.1

Unmerged revisions

2804. By Patrick Galbraith <patg@patg-desktop>

Maria BUG# 571200, MySQL BUG# 32426: Fixed BLOG column order by for FederatedX

Applied Antony's fixes to what I had started. These fixes were from his
multi-bug fix at
http://bazaar.launchpad.net/~atcurtis/maria/federatedx/revision/2833
and are only the fixes for the ORDER BY BUG. I will also add separately the
other fixes per-bug

* Merged in fix for MySQL Bug#32426, http://lists.mysql.com/commits/102419
  However the io back-end is seperated from the front-end.
* Added 3 new methods for the i/o class to abstract result set cursor
  positioning. Note to future self pertaining to IO subclasses for other
  drivers such as ODBC
* Added test 'federated_bug_32426' to suite.

https://bugs.launchpad.net/maria/+bug/571200

2803. By Patrick Galbraith <patg@patg-desktop>

Work in progress with federated_io methods

2802. By Patrick Galbraith <patg@patg-desktop>

Work in progress on adding federatedx_io methods

Methods for result set and result set positions

2801. By Patrick Galbraith <patg@patg-desktop>

Work in progress fixing bug 571200.

Most of patch from http://lists.mysql.com/commits/102419 has been
integrated into FederatedX. Need to figure out how to set/get the
results->data_cursor to work with FEDERATEDX_IO_RESULT struct.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches