From 994c1fd4d8a80abdf4b666712e7e85392221aeb6 Mon Sep 17 00:00:00 2001
From: "gluh@gluh.mysql.r18.ru" <>
Date: Wed, 19 Jan 2005 16:19:10 +0300
Subject: [PATCH 1/2] View field names should be case insensitive

---
 mysql-test/r/view.result | 6 ++++++
 mysql-test/t/view.test   | 7 +++++++
 sql/sql_base.cc          | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index c4391781e9c..239849ed8d1 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 77f0f65323e..ed7401adaab 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 d854956325e..fc41643e8d4 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 &&

From 26d8fc4939d0d77d0e4095e7672c1895c76dccb1 Mon Sep 17 00:00:00 2001
From: "tulin@build.mysql.com" <>
Date: Wed, 19 Jan 2005 14:20:26 +0100
Subject: [PATCH 2/2] added configure option to set extra ndb cc-flags

---
 config/ac-macros/ha_ndbcluster.m4 | 7 ++++++-
 configure.in                      | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index 433bba95e91..751a11d1895 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 ec1a4615fa8..e20edf97a72 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.