diff options
| author | unknown <monty@mysql.com> | 2005-10-08 03:37:23 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-10-08 03:37:23 +0300 |
| commit | c2621f3dcb785e5f78734e20dabbd98bff4fd844 (patch) | |
| tree | ac2ca2aacd05cc4eb1bec0b1f8c909b9d64fa2e6 /sql/structs.h | |
| parent | 63e7824fc2cb5fec43cafbc59d17e5cfcc2195b3 (diff) | |
| parent | d67485c86c94c689919fd4fdb1990331d07d94c6 (diff) | |
| download | mariadb-git-c2621f3dcb785e5f78734e20dabbd98bff4fd844.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
BUILD/SETUP.sh:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/information_schema_inno.result:
Auto merged
mysql-test/r/multi_statement.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/temp_table.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/information_schema_inno.test:
Auto merged
mysql-test/t/multi_statement.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/temp_table.test:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/structs.h:
Auto merged
sql/table.h:
Auto merged
strings/decimal.c:
Auto merged
sql/sql_parse.cc:
manual merge
sql/sql_prepare.cc:
manual merge
sql/table.cc:
manual merge
Diffstat (limited to 'sql/structs.h')
| -rw-r--r-- | sql/structs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/structs.h b/sql/structs.h index e490a2de60c..21aaf584925 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -20,7 +20,7 @@ struct st_table; class Field; -#define STRING_WITH_LEN(X) X, (sizeof(X)-1) +#define STRING_WITH_LEN(X) ((char*) X), (sizeof(X)-1) typedef struct st_lex_string { |