'Twas brillig, and JA Magallon at 18/11/11 14:29 did gyre and gimble: > > On 2011.11.18, at 13:15, Maarten Vanraes wrote: > >> Op vrijdag 18 november 2011 12:55:36 schreef Sam Bailey: >> [...] >>> I was testing on mga1 with basic rebuild only. I'll be setting up a >>> cauldron test environment this weekend though to compare. >> >> awesome >> >> meanwhile, i hear from mariadb, that next week they'll be merging the latest >> changes from 5.3 branch into it, and that should be the last big push for >> 5.5 >> branch. > > > I got the problem in /etc/rc.d/init.d/mysqld, line 329: > > # Check if the system database should be updated and alert the user. > NEW_VER="`$libexecdir/mysqld --version | awk '{ print $3}'`" > OLD_VER="`cat $datadir/mysql_upgrade_info`" > > get_mysql_id() { > MAJOR="`echo $1|cut -d. -f1`"; MINOR="`echo $1|cut -d. -f2`"; > PATCH="`echo $1|cut -d. -f3`" > expr 10000 \* ${MAJOR} + 100 \* ${MINOR} + ${PATCH} > } > > Original MySQL gives (tested on CentOS): > > nada:~> /usr/libexec/mysqld --version > /usr/libexec/mysqld Ver 5.1.52 for unknown-linux-gnu on x86_64 (Source > distribution) > nada:~> /usr/libexec/mysqld --version | awk '{ print $3}' > 5.1.52 > > MariaDB: > > werewolf:~# /usr/sbin/mysqld --version > /usr/sbin/mysqld Ver 5.5.15-MariaDB for Linux on x86_64 (Mageia - MariaDB > Community Edition (GPL)) > werewolf:~# /usr/sbin/mysqld --version | awk '{ print $3}' > 5.5.15-MariaDB > werewolf:~# /usr/sbin/mysqld --version | awk '{ print $3}' | cut -d. -f3 > 15-MariaDB > > See the -MariaDB tail in version ? This makes expr fail because PATCH is > not a number. > > Quick Hack: change awk to: > > /usr/sbin/mysqld --version | cut -d' ' -f4 | cut -d- -f 1 > > Works both in MySQL and MariaDB.
Nice. I had it in my head that it was a thing to do with version numbers as I mentioned earlier... this seems like a valid enough fix :) Col -- Colin Guthrie colin(at)mageia.org http://colin.guthr.ie/ Day Job: Tribalogic Limited http://www.tribalogic.net/ Open Source: Mageia Contributor http://www.mageia.org/ PulseAudio Hacker http://www.pulseaudio.org/ Trac Hacker http://trac.edgewall.org/