mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
76bf7d2224
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 Docs/mysqld_error.txt: Updated error messages Makefile.am: Added missing SSL library (Should be in source distribution) configure.in: Added missing SSL library include/sql_common.h: Move duplicated prototypes innobase/os/os0file.c: Added comment for line that could be removed innobase/srv/srv0srv.c: Added comment for line that could be removed innobase/srv/srv0start.c: Added comment for line that could be removed innobase/trx/trx0sys.c: Added cast to remove compiler warning isam/isamchk.c: Fixed compiler warning libmysql/conf_to_src.c: Include files in proper order myisam/mi_check.c: Removed else part that caused compiler warning myisam/mi_delete.c: Added cast myisam/mi_page.c: Added cast myisam/mi_preload.c: Added cast myisam/mi_write.c: Added cast myisam/myisampack.c: changed 'byte' to 'current_byte' to avoid compiler warnings mysql-test/mysql-test-run.sh: Removed start-from as test '<' is not portable and this can easily be done from command line mysys/hash.c: Added cast mysys/mf_wcomp.c: Removed not reached line mysys/my_append.c: Fixed include file order to get this more portable mysys/my_copy.c: Fixed include file order to get this more portable mysys/my_redel.c: Fixed include file order to get this more portable sql-common/client.c: More DBUG_PRINT sql-common/pack.c: Added casts becasue Fortre compiler apparently compares (ulonglong) < (longlong) as signed sql/ha_heap.cc: Changed variable names to not cause hidden variables sql/ha_innodb.cc: Changed variable names to not cause hidden variables sql/item.cc: Changed variable names to not cause hidden variables sql/item.h: Changed variable names to not cause hidden variables sql/item_cmpfunc.h: Changed variable names to not cause hidden variables sql/item_func.cc: Changed variable names to not cause hidden variables sql/item_subselect.cc: Changed variable names to not cause hidden variables sql/item_subselect.h: Changed variable names to not cause hidden variables sql/item_sum.cc: Changed variable names to not cause hidden variables sql/item_timefunc.cc: Changed variable names to not cause hidden variables sql/log.cc: Changed variable names to not cause hidden variables sql/protocol.cc: Changed variable names to not cause hidden variables sql/protocol.h: Changed variable names to not cause hidden variables Remove function not declared in protocol.cc sql/protocol_cursor.cc: Changed variable names to not cause hidden variables sql/set_var.cc: Added a lot of 'version_xxx' strings Changed 'bdb_version' to 'version_bdb' sql/sql_class.cc: Changed variable names to not cause hidden variables Add TMP_TABLE_PARAM::init() to allow one to initialize structure several times sql/sql_class.h: Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris) sql/sql_derived.cc: Avoid copying TMP_TABLE_PARAM (Use class version instead) sql/sql_error.cc: More DBUG sql/sql_help.cc: Fixed compiler warning sql/sql_lex.cc: Changed variable names to not cause hidden variables sql/sql_list.h: Changed variable names to not cause hidden variables sql/sql_parse.cc: Changed variable names to not cause hidden variables sql/sql_select.cc: Changed variable names to not cause hidden variables Ensure that you don't send NULL to printf() for %s Fixed problem with printing sub selects to debug log sql/sql_select.h: Changed variable names to not cause hidden variables sql/sql_union.cc: Changed variable names to not cause hidden variables Don't use local copy of TMP_TABLE_PARAM (Caused core dump on Solaris) sql/sql_update.cc: Indentation cleanup sql/sql_yacc.yy: Remove warning strings/conf_to_src.c: Fixed include file order
142 lines
3.3 KiB
C
142 lines
3.3 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* can't use -lmysys because this prog is used to create -lstrings */
|
|
|
|
|
|
#include <my_global.h>
|
|
#include <ctype.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#define CHARSETS_SUBDIR "sql/share/charsets"
|
|
#define CTYPE_TABLE_SIZE 257
|
|
#define TO_LOWER_TABLE_SIZE 256
|
|
#define TO_UPPER_TABLE_SIZE 256
|
|
#define SORT_ORDER_TABLE_SIZE 256
|
|
#define ROW_LEN 16
|
|
|
|
void print_arrays_for(char *set);
|
|
|
|
char *prog;
|
|
char buf[1024], *p, *endptr;
|
|
|
|
int
|
|
main(int argc, char **argv)
|
|
{
|
|
prog = *argv;
|
|
|
|
if (argc < 2) {
|
|
fprintf(stderr, "usage: %s source-dir [charset [, charset]]\n", prog);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
--argc; ++argv; /* skip program name */
|
|
|
|
if (chdir(*argv) != 0) {
|
|
fprintf(stderr, "%s: can't cd to %s\n", prog, *argv);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
--argc; ++argv;
|
|
|
|
if (chdir(CHARSETS_SUBDIR) != 0) {
|
|
fprintf(stderr, "%s: can't cd to %s\n", prog, CHARSETS_SUBDIR);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
while (argc--)
|
|
print_arrays_for(*argv++);
|
|
|
|
exit(EXIT_SUCCESS);
|
|
}
|
|
|
|
void
|
|
print_array(FILE *f, const char *set, const char *name, int n)
|
|
{
|
|
int i;
|
|
char val[100];
|
|
|
|
printf("uchar %s_%s[] = {\n", name, set);
|
|
|
|
p = buf;
|
|
*buf = '\0';
|
|
for (i = 0; i < n; ++i)
|
|
{
|
|
/* get a word from f */
|
|
endptr = p;
|
|
for (;;)
|
|
{
|
|
while (isspace(*endptr))
|
|
++endptr;
|
|
if (*endptr && *endptr != '#') /* not comment */
|
|
break;
|
|
if ((fgets(buf, sizeof(buf), f)) == NULL)
|
|
return; /* XXX: break silently */
|
|
endptr = buf;
|
|
}
|
|
|
|
p = val;
|
|
while (!isspace(*endptr))
|
|
*p++ = *endptr++;
|
|
*p = '\0';
|
|
p = endptr;
|
|
|
|
/* write the value out */
|
|
|
|
if (i == 0 || i % ROW_LEN == n % ROW_LEN)
|
|
printf(" ");
|
|
|
|
printf("%3d", (unsigned char) strtol(val, (char **) NULL, 16));
|
|
|
|
if (i < n - 1)
|
|
printf(",");
|
|
|
|
if ((i+1) % ROW_LEN == n % ROW_LEN)
|
|
printf("\n");
|
|
}
|
|
|
|
printf("};\n\n");
|
|
}
|
|
|
|
void
|
|
print_arrays_for(char *set)
|
|
{
|
|
FILE *f;
|
|
|
|
sprintf(buf, "%s.conf", set);
|
|
|
|
if ((f = fopen(buf, "r")) == NULL) {
|
|
fprintf(stderr, "%s: can't read conf file for charset %s\n", prog, set);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
printf("\
|
|
/* The %s character set. Generated automatically by configure and\n\
|
|
* the %s program\n\
|
|
*/\n\n",
|
|
set, prog);
|
|
|
|
/* it would be nice if this used the code in mysys/charset.c, but... */
|
|
print_array(f, set, "ctype", CTYPE_TABLE_SIZE);
|
|
print_array(f, set, "to_lower", TO_LOWER_TABLE_SIZE);
|
|
print_array(f, set, "to_upper", TO_UPPER_TABLE_SIZE);
|
|
print_array(f, set, "sort_order", SORT_ORDER_TABLE_SIZE);
|
|
printf("\n");
|
|
|
|
fclose(f);
|
|
|
|
return;
|
|
}
|