diff options
| author | unknown <jimw@mysql.com> | 2005-10-19 13:47:05 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-10-19 13:47:05 -0700 |
| commit | 3d53c870d379e86cdfe3498cde843258fad52bb5 (patch) | |
| tree | 29e3c2a30ecd5f46627b4a7cc9b9b1d97a73be7a /sql/item_func.cc | |
| parent | f8bfae6b8765e1219403b6dba720d10b49f9a223 (diff) | |
| parent | c3ac502ab16db7118c4b1f2a70a300e6bd40af85 (diff) | |
| download | mariadb-git-3d53c870d379e86cdfe3498cde843258fad52bb5.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/my_manage.c:
Auto merged
mysql-test/mysql_test_run_new.c:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/r/variables.result:
Resolve conflicts
mysql-test/t/variables.test:
Resolve conflicts
sql/sql_acl.cc:
Resolve conflicts
strings/ctype-simple.c:
Resolve conflicts
strings/ctype-ucs2.c:
Resolve conflicts
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 491243e9de7..35ed9b615f2 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4503,7 +4503,6 @@ Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name, LEX_STRING component) { sys_var *var; - char buff[MAX_SYS_VAR_LENGTH*2+4+8], *pos; LEX_STRING *base_name, *component_name; if (component.str == 0 && |