diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-16 21:49:51 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-16 21:49:51 +0100 |
| commit | 69b8b9d63edbdb0c4bd669817a88ec1a8afbef44 (patch) | |
| tree | f1b33a7aed53016189b17cd3f50243b3c8a022de /mysql-test/r/heap.result | |
| parent | 6cf6c18f9da44597821eb1a20a9d35cd21ff018e (diff) | |
| parent | 8864a933c99010c0f95cd18c3d113caf31074469 (diff) | |
| download | mariadb-git-69b8b9d63edbdb0c4bd669817a88ec1a8afbef44.tar.gz | |
Merge with MySQL 5.1, with following additions:
- Moved some code from innodb_plugin to xtradb, to ensure that all tests runs
- Did changes in pbxt and maria storage engines becasue of changes in thd->query
- Reverted wrong code in sql_table.cc for how ROW_FORMAT is used.
This is a re-commit of Monty's merge to eliminate an extra commit from
MySQL-5.1.42 that was accidentally included in the merge.
This is a merge of the MySQL 5.1.41 clone-off (clone-5.1.41-build). In
case there are any extra changes done before final MySQL 5.1.41
release, these will need to be merged later before MariaDB 5.1.41
release.
Diffstat (limited to 'mysql-test/r/heap.result')
0 files changed, 0 insertions, 0 deletions