diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index 433bba95e91153f0cc535dff03e2ff44655254fd..751a11d1895822bac26e4081841446930ac7fcad 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -61,7 +61,12 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   --without-ndb-debug   Disable special ndb debug features],
               [ndb_debug="$withval"],
               [ndb_debug="default"])
-                                                                                
+  AC_ARG_WITH([ndb-ccflags],
+              [
+  --with-ndb-ccflags    Extra CC options for ndb compile],
+              [ndb_cxxflags_fix=$withval],
+              [ndb_cxxflags_fix=])
+
   AC_MSG_CHECKING([for NDB Cluster options])
   AC_MSG_RESULT([])
                                                                                 
diff --git a/configure.in b/configure.in
index ec1a4615fa8c20a3b0bd15149178330c920cba94..e20edf97a72f1cd27dd18a86f0283ac77f5809ba 100644
--- a/configure.in
+++ b/configure.in
@@ -361,7 +361,6 @@ AC_SUBST(INSTALL_SCRIPT)
 
 export CC CXX CFLAGS LD LDFLAGS AR
 
-ndb_cxxflags_fix=
 if test "$GXX" = "yes"
 then
   # mysqld requires -fno-implicit-templates.
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index c4391781e9c89a72e29af53b00c37d3d10870b38..239849ed8d1557fc01c8f77f9d85bed521cba69a 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -1724,3 +1724,9 @@ a	b
 301	0
 drop view v3;
 drop tables t1,t2;
+create table t1(f1 int);
+create view v1 as select f1 from t1;
+select * from v1 where F1 = 1;
+f1
+drop view v1;
+drop table t1;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 77f0f65323e30cbd20c142720aada4a50a6dc5cb..ed7401adaab37ccced64fc107f7c4e6dc4adc933 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -1654,3 +1654,10 @@ select * from v3;
 
 drop view v3;
 drop tables t1,t2;
+
+# View field names should be case insensitive 
+create table t1(f1 int);
+create view v1 as select f1 from t1;
+select * from v1 where F1 = 1;
+drop view v1;
+drop table t1;
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index d854956325e193321129fcf008f378b6f93e9e5b..fc41643e8d4eeba114356cbab48b9acbbe61ef4d 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2120,7 +2120,7 @@ find_field_in_table(THD *thd, TABLE_LIST *table_list,
     Field_translator *trans= table_list->field_translation;
     for (uint i= 0; i < num; i ++)
     {
-      if (strcmp(trans[i].name, name) == 0)
+      if (!my_strcasecmp(system_charset_info, trans[i].name, name))
       {
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
 	if (check_grants_view &&