diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-23 22:48:15 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-23 22:48:15 +0200 |
| commit | 338cb6a83644debcb4fae9a8bdd8880294b30383 (patch) | |
| tree | 9a321f9e0de20010f1b6404c37f8f704e33711a6 /sql/lex.h | |
| parent | 069362205ccf28a24bc1d9f45d05cccfc1c40cac (diff) | |
| download | mariadb-git-338cb6a83644debcb4fae9a8bdd8880294b30383.tar.gz | |
Fixed compilations problems and warnings on windows
extra/yassl/include/openssl/ssl.h:
Move things up to avoid problems with defines in winsock2
extra/yassl/include/socket_wrapper.hpp:
Don't include winsock2.h twice
include/config-win.h:
Use winsock2.h instead of winsock.h
(winsock2.h must be included before windows.h and will automaticly include windows.h)
include/mysql.h:
Use winsock2.h
libmysqld/examples/builder-sample/emb_samples.cpp:
Use winsock2.h
server-tools/instance-manager/IMService.cpp:
Use winsock2.h
sql/item_strfunc.cc:
Remove duplicate include
sql/lex.h:
Fixed conflict with external GROUP define
sql/net_serv.cc:
winsock.h is already included in my_global.h
sql/sql_class.cc:
Fixed compiler warning on windows
sql/sql_table.cc:
Fixed compiler warning
sql/sql_yacc.yy:
Fixed conflict with external GROUP define
sql/udf_example.c:
Use winsock2 instead of winsock.h
win/README:
Updated readme
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h index 2bf0e08c825..45155da7692 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -222,7 +222,7 @@ static SYMBOL symbols[] = { { "GLOBAL", SYM(GLOBAL_SYM)}, { "GRANT", SYM(GRANT)}, { "GRANTS", SYM(GRANTS)}, - { "GROUP", SYM(GROUP)}, + { "GROUP", SYM(GROUP_SYM)}, { "HANDLER", SYM(HANDLER_SYM)}, { "HASH", SYM(HASH_SYM)}, { "HAVING", SYM(HAVING)}, |