Merge build.mysql.com:/users/tulin/mysql-5.0

into build.mysql.com:/users/tulin/mysql-5.0-ndb

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([])
                                                                                 

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.

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;

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;

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 &&