unknown b1e00b6be8 Merge MySQL 5.1.46 into MariaDB. ...

Still two test failures to be solved: main.myisam and main.subselect.

2010-04-28 14:52:24 +02:00

..

btr

Applying InnoDB snapshot

2010-04-01 16:27:13 +04:00

buf

Applying InnoDB snapshot

2010-04-01 17:01:22 +04:00

data

Applying InnoDB Plugin 1.0.6 snapshot, part 9. Fixes BUG#48526, BUG#48317

2009-11-30 19:05:20 +05:30

dict

Applying InnoDB snapshot

2010-04-01 15:59:25 +04:00

dyn

Adding innodb_plugin-1.0.4 as storage/innodb_plugin.

2009-05-27 15:15:59 +05:30

eval

Adding innodb_plugin-1.0.4 as storage/innodb_plugin.

2009-05-27 15:15:59 +05:30

fil

Applying InnoDB snapshot

2010-04-01 17:01:22 +04:00

fsp

Applying InnoDB snapshot

2010-04-01 15:59:25 +04:00

fut

Adding innodb_plugin-1.0.4 as storage/innodb_plugin.

2009-05-27 15:15:59 +05:30

ha

Applying InnoDB snapshot

2010-04-01 17:02:01 +04:00

handler

Applying InnoDB snapshot

2010-04-01 17:01:43 +04:00

ibuf

Applying InnoDB snapshot

2010-04-01 15:17:10 +04:00

include

Applying InnoDB snapshot

2010-04-01 17:02:01 +04:00

lock

Applying InnoDB snapshot

2010-04-01 15:59:25 +04:00

log

Applying InnoDB snapshot

2010-04-01 16:56:22 +04:00

mach

Adding innodb_plugin-1.0.4 as storage/innodb_plugin.

2009-05-27 15:15:59 +05:30

mem

Applying InnoDB snapshot

2010-04-01 15:59:25 +04:00

mtr

Applying InnoDB Plugin 1.0.5 snapshot ,part 12

2009-10-09 19:43:15 +05:30

mysql-test

Applying Innodb Plugin 1.0.5 snapshot, part 14

2009-10-12 18:26:02 +05:30

os

Applying InnoDB snapshot

2010-04-01 16:27:53 +04:00

page

Applying InnoDB snapshot

2010-04-01 16:58:02 +04:00

pars

Applying InnoDB Plugin 1.0.6 snapshot,part 1. Fixes BUG#45992 and BUG#46656

2009-11-30 17:02:05 +05:30

que

Applying InnoDB Plugin 1.0.6 snapshot,part 1. Fixes BUG#45992 and BUG#46656

2009-11-30 17:02:05 +05:30

read

Adding innodb_plugin-1.0.4 as storage/innodb_plugin.

2009-05-27 15:15:59 +05:30

rem

Applying InnoDB snapshot

2010-04-01 15:59:25 +04:00

row

Applying InnoDB snapshot

2010-04-01 17:01:22 +04:00

scripts

Applying Innodb Plugin 1.0.5 snapshot, part 14

2009-10-12 18:26:02 +05:30

srv

Applying InnoDB snashot, fixes BUG#51587.

2010-04-01 16:01:33 +04:00

sync

Applying InnoDB snapshot

2010-04-01 15:59:25 +04:00

thr

Applying InnoDB Plugin 1.0.6 snapshot,part 1. Fixes BUG#45992 and BUG#46656

2009-11-30 17:02:05 +05:30

trx

Applying InnoDB snapshot

2010-04-01 17:01:22 +04:00

usr

Applying InnoDB Plugin 1.0.6 snapshot,part 1. Fixes BUG#45992 and BUG#46656

2009-11-30 17:02:05 +05:30

ut

Applying InnoDB snapshot

2010-04-01 16:56:22 +04:00

ChangeLog

Applying InnoDB snapshot

2010-04-01 17:00:43 +04:00

CMakeLists.txt

Merge MySQL 5.1.46 into MariaDB.

2010-04-28 14:52:24 +02:00

compile-innodb

Adding innodb_plugin-1.0.4 as storage/innodb_plugin.

2009-05-27 15:15:59 +05:30

compile-innodb-debug

Adding innodb_plugin-1.0.4 as storage/innodb_plugin.

2009-05-27 15:15:59 +05:30

COPYING

Adding innodb_plugin-1.0.4 as storage/innodb_plugin.

2009-05-27 15:15:59 +05:30

COPYING.Google

Adding innodb_plugin-1.0.4 as storage/innodb_plugin.

2009-05-27 15:15:59 +05:30

COPYING.Percona

Update to innoplug-1.0.4.

2009-07-30 17:42:56 +05:00

COPYING.Sun_Microsystems

Update to innoplug-1.0.4.

2009-07-30 17:42:56 +05:00

Doxyfile

Update to innoplug-1.0.4.

2009-07-30 17:42:56 +05:00

ha_innodb.def

Adding innodb_plugin-1.0.4 as storage/innodb_plugin.

2009-05-27 15:15:59 +05:30

Makefile.am

Applying InnoDB snapshot

2010-04-01 16:56:22 +04:00

plug.in.disabled

Merge MySQL 5.1.46 into MariaDB.

2010-04-28 14:52:24 +02:00

revert_gen.sh

Applying Innodb Plugin 1.0.5 snapshot, part 14

2009-10-12 18:26:02 +05:30

setup.sh

Adding innodb_plugin-1.0.4 as storage/innodb_plugin.

2009-05-27 15:15:59 +05:30