diff options
| author | unknown <iggy@amd64.(none)> | 2007-08-03 14:43:12 -0400 |
|---|---|---|
| committer | unknown <iggy@amd64.(none)> | 2007-08-03 14:43:12 -0400 |
| commit | c6c57ed783eabf5d9c99a3c1fd4f5ea5518c069c (patch) | |
| tree | 743ce671890386580cfb5fe72e9393a21c9f567f /client/client_priv.h | |
| parent | 6f88aa45dbc129751890421b13e8c4e13b8bd888 (diff) | |
| download | mariadb-git-c6c57ed783eabf5d9c99a3c1fd4f5ea5518c069c.tar.gz | |
Bug#29903 The CMake build method does not produce the embedded library.
- Changes to correct and test Windows embedded build.
BitKeeper/etc/ignore:
Bug#29903 The CMake build method does not produce the embedded library.
- Ignore auto-generated Windows embedded resources.
CMakeLists.txt:
Bug#29903 The CMake build method does not produce the embedded library.
- Hardcode CSV for all configurations.
- Add client directory for gen_lex_hash dependency.
client/CMakeLists.txt:
Bug#29903 The CMake build method does not produce the embedded library.
- Build the mysqlclient library and echo for the embedded solution.
client/client_priv.h:
Bug#29903 The CMake build method does not produce the embedded library.
- Defined new option.
client/mysql.cc:
Bug#29903 The CMake build method does not produce the embedded library.
- Add server-arg command line parameter
libmysqld/CMakeLists.txt:
Bug#29903 The CMake build method does not produce the embedded library.
- Added auto generated resources; sql_yacc.cc, sql_yacc.h, message.rc
message.h and lex_hash.h.
- Link csv library to libmsyqld.
libmysqld/Makefile.am:
Bug#29903 The CMake build method does not produce the embedded library.
- Include CMakeLists.txt in dist.
libmysqld/examples/CMakeLists.txt:
Bug#29903 The CMake build method does not produce the embedded library.
- Follow existing naming convention.
libmysqld/examples/Makefile.am:
Bug#29903 The CMake build method does not produce the embedded library.
- Include CMakeLists.txt in dist.
mysql-test/mysql-test-run.pl:
Bug#29903 The CMake build method does not produce the embedded library.
- Move embedded option block earlier in the script.
- Added the path to the libmysqld.dll to Windows path.
win/README:
Bug#29903 The CMake build method does not produce the embedded library.
- Add instructions for building/testing the embedded library.
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index 8bc8ef692de..f992f19938b 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -48,7 +48,7 @@ enum options_client OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_MYSQL_PROTOCOL, OPT_SHARED_MEMORY_BASE_NAME, OPT_FRM, OPT_SKIP_OPTIMIZATION, OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH, - OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_CREATE_OPTIONS, + OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_CREATE_OPTIONS, OPT_SERVER_ARG, OPT_START_POSITION, OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME, OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT, #ifdef HAVE_NDBCLUSTER_DB |