summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@magare.gmz>2007-09-26 19:06:54 +0300
committerunknown <gkodinov/kgeorge@magare.gmz>2007-09-26 19:06:54 +0300
commitbc25c6cafbb9e8c3b849f8077cd9bd487e000551 (patch)
tree72aa6cfe7d2fc332845cce73577dd273ccaa5f64 /sql/sql_lex.h
parentc89bc705a9e300d12a64dffe4df89ec3564d76a0 (diff)
downloadmariadb-git-bc25c6cafbb9e8c3b849f8077cd9bd487e000551.tar.gz
merge of the fix for bug 27802 & 27216 to 5.1-opt
mysql-test/r/view.result: merge of the fix for bug 27802 to 5.1 sql/item_cmpfunc.h: merge of the fix for bug 27216 to 5.1 sql/sql_insert.cc: merge of the fix for bug 27216 to 5.1 sql/sql_lex.h: merge of the fix for bug 27802 to 5.1 sql/sql_select.cc: merge of the fix for bug 27802 to 5.1 sql/table.h: merge of the fix for bug 27802 to 5.1
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 08104769704..d866dde50ef 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -259,6 +259,8 @@ public:
key_name.str= str;
key_name.length= length;
}
+
+ void print(THD *thd, String *str);
};
/*