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

into  mysql.com:/home/pem/work/mysql-5.0

BUILD/autorun.sh

@@ -4,8 +4,14 @@
 aclocal    || (echo "Can't execute aclocal" && exit 1)
 autoheader || (echo "Can't execute autoheader" && exit 1)
 # --force means overwrite ltmain.sh script if it already exists 
-libtoolize --automake --force \
+# Added glibtoolize reference to make native OSX autotools work
+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
 # and --force to overwrite them if they already exist
 automake --add-missing --force \

sql/sql_insert.cc

@@ -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->belong_to_view :
                      table_list);
-        view= (table_list->view);
+        view= (bool)(table_list->view);
       }
       if (view)
       {