Skip to content

Commit c8585f3

Browse files
author
[email protected]
committed
Merge 4.1 into 5.0.
2 parents 5344528 + 9de2005 commit c8585f3

253 files changed

Lines changed: 5945 additions & 2590 deletions

File tree

Some content is hidden

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

‎BUILD/compile-pentium-debug-max-no-embedded‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#! /bin/sh
2+
3+
path=`dirname $0`
4+
. "$path/SETUP.sh"
5+
6+
extra_flags="$pentium_cflags $debug_cflags"
7+
c_warnings="$c_warnings $debug_extra_warnings"
8+
cxx_warnings="$cxx_warnings $debug_extra_warnings"
9+
extra_configs="$pentium_configs $debug_configs"
10+
11+
extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --with-openssl --with-raid"
12+
13+
. "$path/FINISH.sh"

‎BitKeeper/etc/logging_ok‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ [email protected]
1616
[email protected]
1717
[email protected]
1818
[email protected]
19+
bar@deer.(none)
1920
[email protected]
2021
[email protected]
2122
[email protected]
@@ -54,6 +55,7 @@ [email protected]
5455
[email protected]
5556
[email protected]
5657
[email protected]
58+
[email protected]
5759
[email protected]
5860
[email protected]
5961
[email protected]

‎VC++Files/libmysqld/libmysqld.def‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,28 @@ EXPORTS
9292
mysql_thread_safe
9393
mysql_use_result
9494
mysql_warning_count
95+
mysql_prepare
96+
mysql_execute
97+
mysql_param_count
98+
mysql_bind_param
99+
mysql_bind_result
100+
mysql_fetch
101+
mysql_fetch_column
102+
mysql_send_long_data
103+
mysql_get_metadata
104+
mysql_param_result
105+
mysql_stmt_close
106+
mysql_stmt_reset
107+
mysql_stmt_free_result
108+
mysql_stmt_errno
109+
mysql_stmt_error
110+
mysql_stmt_sqlstate
111+
mysql_stmt_affected_rows
112+
mysql_stmt_store_result
113+
mysql_stmt_row_seek
114+
mysql_stmt_row_tell
115+
mysql_stmt_data_seek
116+
mysql_stmt_num_rows
95117
net_buffer_length
96118
set_dynamic
97119
strcend

‎client/client_priv.h‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,21 @@
2626

2727
/* We have to define 'enum options' identical in all files to keep OS2 happy */
2828

29-
enum options_client { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
30-
OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE,
31-
OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS,
32-
OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE,
33-
OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,
34-
OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_AUTO_REHASH,
35-
OPT_LINE_NUMBERS, OPT_COLUMN_NAMES, OPT_CONNECT_TIMEOUT,
36-
OPT_MAX_ALLOWED_PACKET, OPT_NET_BUFFER_LENGTH,
37-
OPT_SELECT_LIMIT, OPT_MAX_JOIN_SIZE, OPT_SSL_SSL,
38-
OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
39-
OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,
40-
OPT_DELETE_MASTER_LOGS,
41-
OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_MYSQL_PROTOCOL,
42-
OPT_SHARED_MEMORY_BASE_NAME, OPT_FRM, OPT_SKIP_OPTIMIZATION,
43-
OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH };
29+
enum options_client
30+
{
31+
OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
32+
OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE,
33+
OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS,
34+
OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE,
35+
OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,
36+
OPT_MASTER_DATA, OPT_AUTOCOMMIT, OPT_AUTO_REHASH,
37+
OPT_LINE_NUMBERS, OPT_COLUMN_NAMES, OPT_CONNECT_TIMEOUT,
38+
OPT_MAX_ALLOWED_PACKET, OPT_NET_BUFFER_LENGTH,
39+
OPT_SELECT_LIMIT, OPT_MAX_JOIN_SIZE, OPT_SSL_SSL,
40+
OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
41+
OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,
42+
OPT_DELETE_MASTER_LOGS, OPT_COMPACT,
43+
OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_MYSQL_PROTOCOL,
44+
OPT_SHARED_MEMORY_BASE_NAME, OPT_FRM, OPT_SKIP_OPTIMIZATION,
45+
OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH,
46+
};

0 commit comments

Comments
 (0)