mariadb/cmd-line-utils
Vasil Dimov 63e381e98d Merge mysql-5.1 -> mysql-5.5
I manually checked that all the conflicting InnoDB changes are in 5.5 already.
Two things I am not sure about - I commented them with XXX in this patch.
I will further check with the authors of the changesets whether these things
should be present or not.
2011-11-18 13:57:10 +02:00
..
libedit Merge mysql-5.1 -> mysql-5.5 2011-11-18 13:57:10 +02:00
readline Updated/added copyright headers 2011-06-30 17:46:53 +02:00