Skip to content

Commit 8754add

Browse files
author
Nirbhay Choubey
committed
WL#5603 : Revise how we handle passwords on
 the command line
1 parent 2d7154b commit 8754add

48 files changed

Lines changed: 2217 additions & 1846 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2006, 2011, 2012 Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -360,6 +360,7 @@ ADD_SUBDIRECTORY(strings)
360360
ADD_SUBDIRECTORY(vio)
361361
ADD_SUBDIRECTORY(regex)
362362
ADD_SUBDIRECTORY(mysys)
363+
ADD_SUBDIRECTORY(mysys_ssl)
363364
ADD_SUBDIRECTORY(libmysql)
364365

365366
IF(WITH_UNIT_TESTS)

‎client/CMakeLists.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
1515

1616
INCLUDE_DIRECTORIES(
1717
${CMAKE_SOURCE_DIR}/include
18+
${CMAKE_SOURCE_DIR}/mysys_ssl
1819
${ZLIB_INCLUDE_DIR}
1920
${SSL_INCLUDE_DIRS}
2021
${CMAKE_SOURCE_DIR}/libmysql
@@ -67,6 +68,9 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
6768
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
6869
TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
6970

71+
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
72+
TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
73+
7074
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
7175
IF(WIN32)
7276
MYSQL_ADD_EXECUTABLE(echo echo.c)

‎client/client_priv.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -95,7 +95,8 @@ enum options_client
9595
OPT_MYSQLBINLOG_SKIP_GTIDS,
9696
OPT_MYSQLBINLOG_INCLUDE_GTIDS,
9797
OPT_MYSQLBINLOG_EXCLUDE_GTIDS,
98-
OPT_REMOTE_PROTO
98+
OPT_REMOTE_PROTO,
99+
OPT_CONFIG_ALL
99100
};
100101

101102
/**

‎client/mysql.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -31,6 +31,7 @@
3131
**/
3232

3333
#include "client_priv.h"
34+
#include "my_default.h"
3435
#include <m_ctype.h>
3536
#include <stdarg.h>
3637
#include <my_dir.h>

0 commit comments

Comments
 (0)