# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100511170249-xw6qjgbenh688nhj # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: 17962fe0567b8166123eae6e6022b835a0fe908e # timestamp: 2010-05-11 20:02:58 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100511161828-\ # 9reevde6i3sjlwuc # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQYGf0AAA4NfgEAwWW///38j lgC////wYAZc+PdgAAd3dVKUAVwkoSnlPUbTU2IyE9qNTAIZDTQAA0OYTAJgBMJhNMAAAmTTQMNV P9RNGkGgDQGgAAABpkYQGnqiMqaGn6m1E02oyepoaAZAAaMIBzCYBMAJhMJpgAAEyaaBhJEEaATR onoEjT0TTVPU/U9NTKANBtRKVKqugAkhJYL27gwwgAACABM5fH7H1UbW/cxektUbIzTIElIUmGG2 S3TXCiloCnB72TKwY2lGhfAqhFpiHec4UnuFIRkVzjwX6lBgZgEzf4/qki7Zm41+GQbbMK9kINJi jDxlArYlOEB50qIkbJ/zpVMjR2Ypa6lRzKpyE3JNDXhUUi0oNNrFI1LC4n0MOerDJrXlBToQ+pLS 0ttmGa0HomUgkQkLT9cDWEcWqap+J+BkuIa+viyD42wbAG2sLklpD5PEwF5eDZN/Esxxl8A6PRJd C4paobunyLjlIIEC8CY47GDd+JcMhN8hLuS+O1Ycqj2RxLjEqEYskvFhQYO+UIP10eXpMScBmEmQ 3eBH1g8w/Ylxihe1kSZSQDKJEvUNT0fBCBoYuzvCuwgQKRkyFCsPv5uQ9KzBojROiEzgrGwiYlH4 3y4foLELBYlyIMtqiPFhbigz4Jv9DDsoOBt3I7boyNChWp3KJoMf7RhfVm2Vu6N9mLYb45ILGQmH GGKOvcPZI0AtIyuHLwJpEwIBjN6MVjFqueQTpBVI1JlZiXHidD5FwgoJp5s2d94WzMCsKpDmhpBo DsNz9YFGjR4dw5FugWkg+JopRi7tXDDdXPKLlQOFQ5xGdmjfwcwGksLjcXlhKuwDqqEzyLzU/5Uk EyhLu7sHuN5LvnUMbj3khRNLuJ4j3jmh4cE2W0pgs4GhcGpv/cjMnUOZY5OzLAZb2xYz7wK8QmdC BYcT8smA/ONqk9uFeM4RLtIgbFgcpZ11nQ+h5xwzLCCLNXiYq9i8GPgZlCB89Dv0wkxuvW1Azq/V yq0xGOZMrNDgBZHOyAVkRgMo7MZSsMcHozTAtiQKSYH3Xl5MkZcC9oMxIgZqrP0z7Vfb1y3XboEN uhiOnCOi0ROjAIXL0qYzZBXapRT3E3OnkQzOVfs3HjfQ5Qe59pWDIQJkAYcJIJKPj0ASIwqQZ+oa BEgRRdljDAWJQ0oET3Ez4Sah13bTCDuwgF0GYrO0S4WWJKTkTUexQmf3SX4tMliWFDD4teg5Fgl4 aYs8FsS8xj2lM850nUXDuOIs3fQHMVk7CaFkZnSS37cKTLRjHYzMgbypS6s33iffrEZJN9kBiY41 DmJ7mBqfgwC+Rg1xgJEEqnMS3E2QeYVd46cafEZRyAmMx3nVMMbyvSR2UCnLvVqijy0NpMwuOdRk Gp8/wgLdQJK5MJzbnsPOmocy/RTGLJ5q4gI8RiaLiKGErRAXYCgeVK2vUxmVUc7VRiG69XBLTF5g U5xEO4/Y7Gp4Rw7LmVgP1E2uX1JCJEC83gKys5rL5NQ47tAKzquOHNLeSUuJ2Rk2wtX79ZTtFRJg 4iLaVRJwshHXQIj2AgWgvh+Ewk+RDcABaIw18C0IiVaV5smXJJkQPI23fweR4msexpkW+KsMBB9R K7Q9uxD/JAGOCrUYdc10DmXEKixc6H/iU+I7lR9RxKa3pe0iaJMPUB9gIGtbq88186hRYTJ4eQA3 Jlp1Pg/xSbokFEB5wRokpotXgeEFu46lyNhA2hz58w2yVAy3F/KlBtPoBgHubbGOffmVQcwBG09T wPdedSCGXD0YzZQYtKqgC1a3Yy0CcyoZhk651kWGbTRevKTKxalOoiBorAglw2szXBYi8YtQzW5+ d8MSdOnkSJkyJ6A5qPkOWhUt+mJFWJVeViLQ+gxUwblUfMyYbCZZsWzfckYkzXoJ66KlKTK4OLz2 gqRhVfNDQJcOgvxP7PcuVyTZF6OjiKcZu/2MCMJHYwKihsy2BwH3rixqpijYK/8XckU4UJAGBn9A