Commit b268a178 authored by pem@mysql.com's avatar pem@mysql.com

Merge mysql.com:/usr/local/bk/mysql-5.0

into  mysql.com:/home/pem/work/mysql-5.0
parents 65fa6604 f8607434
...@@ -4,8 +4,14 @@ ...@@ -4,8 +4,14 @@
aclocal || (echo "Can't execute aclocal" && exit 1) aclocal || (echo "Can't execute aclocal" && exit 1)
autoheader || (echo "Can't execute autoheader" && exit 1) autoheader || (echo "Can't execute autoheader" && exit 1)
# --force means overwrite ltmain.sh script if it already exists # --force means overwrite ltmain.sh script if it already exists
libtoolize --automake --force \ # Added glibtoolize reference to make native OSX autotools work
|| (echo "Can't execute libtoolize" && exit 1) if [ -f /usr/bin/glibtoolize ] ; then
glibtoolize --automake --force \
|| (echo "Can't execute glibtoolize" && exit 1)
else
libtoolize --automake --force \
|| (echo "Can't execute libtoolize" && exit 1)
fi
# --add-missing instructs automake to install missing auxiliary files # --add-missing instructs automake to install missing auxiliary files
# and --force to overwrite them if they already exist # and --force to overwrite them if they already exist
automake --add-missing --force \ automake --add-missing --force \
......
...@@ -1118,7 +1118,7 @@ int check_that_all_fields_are_given_values(THD *thd, TABLE *entry, ...@@ -1118,7 +1118,7 @@ int check_that_all_fields_are_given_values(THD *thd, TABLE *entry,
table_list= (table_list->belong_to_view ? table_list= (table_list->belong_to_view ?
table_list->belong_to_view : table_list->belong_to_view :
table_list); table_list);
view= (table_list->view); view= (bool)(table_list->view);
} }
if (view) if (view)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment