maria-developers team mailing list archive

[Kristian Nielsen <knielsen@xxxxxxxxxxxxxxx>]

Sergey Petrunya <psergey@xxxxxxxxxxxx> writes:

> At file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/
>
> ------------------------------------------------------------
> revno: 2723
> revision-id: psergey@xxxxxxxxxxxx-20090909210657-i1of5o03ymoozwvs
> parent: psergey@xxxxxxxxxxxx-20090908162138-wtd6r54dkcp4hg5a
> committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
> branch nick: mysql-5.1-maria-contd2
> timestamp: Thu 2009-09-10 01:06:57 +0400
> message:
>   MySQL 5.1 -> MariaDB 5.1 merge 
>   - Post-merge fixes
> === modified file 'README'
> --- a/README	2009-09-08 16:04:58 +0000
> +++ b/README	2009-09-09 21:06:57 +0000
> @@ -1,47 +1,50 @@
> -This is a release of MariaDB, a branch of MySQL.
> -
> -MariaDB is a drop-in replacement of MySQL, with more features, less
> -bugs and better performance.
> -
> -MariaDB is brought to you by many of the original developers of MySQL,
> -that now work for Monty Program Ab, and by many people in the
> -community.
> -
> -MySQL, which is the base of MariaDB, is brought to you by Sun.
> +This is a release of MySQL, a dual-license SQL database server.
> +MySQL is brought to you by the MySQL team at Sun Microsystems, Inc.

I think these changes to README is a revert of changes accidentally done in
the previous merge of XtraDB. Right?

 - Kristian.