Skip to content

Commit ede8169

Browse files
author
[email protected]
committed
Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler) Added a lot of 'version_xxx' strings to 'show variables' Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris) Fixed problem with printing sub selects to debug log
1 parent 7733969 commit ede8169

54 files changed

Lines changed: 537 additions & 374 deletions

Some content is hidden

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

‎Docs/mysqld_error.txt‎

Lines changed: 132 additions & 36 deletions
Large diffs are not rendered by default.

‎Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ EXTRA_DIST = INSTALL-SOURCE README COPYING zlib
2323
SUBDIRS = . include @docs_dirs@ \
2424
@readline_topdir@ sql-common \
2525
@thread_dirs@ pstack @sql_client_dirs@ \
26-
@sql_server_dirs@ scripts man tests \
26+
@sql_server_dirs@ scripts man tests SSL\
2727
BUILD @netware_dir@ os2 @libmysqld_dirs@ \
2828
@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
29-
3029

3130
# Relink after clean
3231
linked_sources = linked_client_sources linked_server_sources \

‎SSL/Makefile.am‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
2+
#
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; either version 2 of the License, or
6+
# (at your option) any later version.
7+
#
8+
# This program is distributed in the hope that it will be useful,
9+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
# GNU General Public License for more details.
12+
#
13+
# You should have received a copy of the GNU General Public License
14+
# along with this program; if not, write to the Free Software
15+
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16+
17+
## Process this file with automake to create Makefile.in
18+
19+
EXTRA_DIST= NOTES cacert.pem client-cert.pem client-key.pem \
20+
client-req.pem run-client run-server server-cert.pem \
21+
server-key.pem server-req.pem
22+
23+
# Don't update the files from bitkeeper
24+
%::SCCS/s.%

‎configure.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2818,7 +2818,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
28182818
libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile dnl
28192819
libmysql/Makefile client/Makefile dnl
28202820
pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
2821-
sql-common/Makefile dnl
2821+
sql-common/Makefile SSL/Makefile dnl
28222822
merge/Makefile dbug/Makefile scripts/Makefile dnl
28232823
include/Makefile sql-bench/Makefile tools/Makefile dnl
28242824
tests/Makefile Docs/Makefile support-files/Makefile dnl

‎include/sql_common.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ extern const char *not_error_sqlstate;
2222
extern "C" {
2323
#endif
2424

25-
ulong STDCALL net_field_length(uchar **packet);
26-
my_ulonglong net_field_length_ll(uchar **packet);
27-
2825
MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
2926
my_bool default_value, uint server_capabilities);
3027
void free_rows(MYSQL_DATA *cur);

‎innobase/os/os0file.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ os_file_handle_error_no_exit(
428428
return (FALSE);
429429
}
430430

431-
return(FALSE);
431+
return(FALSE); /* not reached */
432432
}
433433

434434
/********************************************************************

‎innobase/srv/srv0srv.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ srv_console(
995995
srv_dec_thread_count(SRV_CONSOLE);
996996
}
997997

998-
return(0);
998+
return(0); /* Not reached */
999999
}
10001000

10011001
/*************************************************************************
@@ -3286,7 +3286,7 @@ srv_master_thread(
32863286
os_thread_exit(NULL);
32873287

32883288
#ifndef __WIN__
3289-
return(NULL);
3289+
return(NULL); /* Not reached */
32903290
#else
32913291
return(0);
32923292
#endif

‎innobase/srv/srv0start.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ io_handler_thread(
441441
os_thread_exit(NULL);
442442

443443
#ifndef __WIN__
444-
return(NULL);
444+
return(NULL); /* Not reached */
445445
#else
446446
return(0);
447447
#endif

‎innobase/trx/trx0sys.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ trx_sys_update_mysql_binlog_offset(
589589

590590
mlog_write_string(sys_header + field
591591
+ TRX_SYS_MYSQL_LOG_NAME,
592-
file_name, 1 + ut_strlen(file_name), mtr);
592+
(byte*) file_name, 1 + ut_strlen(file_name), mtr);
593593
}
594594

595595
if (mach_read_from_4(sys_header + field

‎isam/isamchk.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ static struct my_option my_long_options[] =
286286
"Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",
287287
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
288288
{"block-search", 'b', "For debugging.", (gptr*) &search_after_block,
289-
(gptr*) &search_after_block, 0, GET_ULONG, REQUIRED_ARG, NI_POS_ERROR, 0,
290-
0, 0, 0, 0},
289+
(gptr*) &search_after_block, 0, GET_ULONG, REQUIRED_ARG,
290+
(longlong) NI_POS_ERROR, 0, 0, 0, 0, 0},
291291
{"silent", 's',
292292
"Only print errors. One can use two -s to make isamchk very silent.",
293293
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

0 commit comments

Comments
 (0)