mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge 4.1->5.0

Browse source 
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/metadata.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
This commit is contained in:
unknown 2005-03-31 10:39:48 +03:00
commit 8a898a0b72
24 changed files with 2021 additions and 547 deletions
Download patch file Download diff file Expand all files Collapse all files

4
support-files/mysql.server.sh
View file

@ -99,10 +99,12 @@ parse_manager_arguments() {
}
wait_for_pid () {
for((i=0; i<35; i++)); do
i=0
while test $i -lt 35 ; do
sleep 1
test -s $pid_file && i='' && break
echo $echo_n ".$echo_c"
i=`expr $i + 1`
done
if test -z "$i" ; then