Commit 5a9ce774 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Update for OS2 (patch from Yuri Dario). 

Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts
Fixed error messages.
Fixed problem with const propagation when comparing columns of different types
parent 7f38949c

Docs/manual.texi

+11 −1
Original line number Diff line number Diff line
@@ -46840,6 +46840,12 @@ not yet 100% confident in this code. 
@appendixsubsec Changes in release 3.23.44

@itemize @bullet

@item

Fixed bug in const-propagation when comparing columns of different

types. (@code{SELECT * FROM date_col="2001-01-01" and date_col=time_col})

@item

Fixed bug that caused error message @code{Can't write, because of unique

constraint} with some @code{GROUP BY} queries.

@item

Fixed problem with sjis character strings used within quoted table names.

@item

Fixed coredump when using @code{CREATE ... FULLTEXT} keys with other table
@@ -46847,6 +46853,8 @@ handlers than MyISAM. 
@item

Add missing @code{InnoDB} variables to @code{SHOW VARIABLES}.

@item

Foreign keys checking is now done for @code{InnoDB} tables.

@item

Don't use @code{signal()} on windows because this appears to not be

100 % reliable.

@item
@@ -46858,7 +46866,9 @@ Fixed bug when doing @code{LEFT JOIN ... ON (column_name = constant) WHERE colu 
When using replications, aborted queries that contained @code{%} could cause

a core dump.

@item

TCP_NODELAY was not used on some systems. (Speed problem).

@code{TCP_NODELAY} was not used on some systems. (Speed problem).

@item

Applied portability fixes for OS/2 (Patch by Yuri Dario).

@end itemize















@node News-3.23.43, News-3.23.42, News-3.23.44, News-3.23.x

























client/client_priv.h



+1
−0






























Original line number
Diff line number
Diff line








@@ -28,4 +28,5 @@













enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,















	       OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE,















	       OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS,













	       OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE,















	       OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES};
























client/mysqldump.c



+5
−8






























Original line number
Diff line number
Diff line








@@ -44,6 +44,7 @@













#include <m_string.h>















#include <m_ctype.h>





























#include "client_priv.h"















#include "mysql.h"















#include "mysql_version.h"















#include "mysqld_error.h"










@@ -87,10 +88,6 @@ static DYNAMIC_STRING extended_row;













#include "sslopt-vars.h"















FILE  *md_result_file;





























enum md_options {OPT_FTB=256, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC,













		 OPT_KEYWORDS, OPT_LOCKS, OPT_DROP, OPT_OPTIMIZE, OPT_DELAYED,













		 OPT_TABLES, MD_OPT_CHARSETS_DIR, MD_OPT_DEFAULT_CHARSET};





























static struct option long_options[] =















{















  {"all-databases",     no_argument,    0,      'A'},









@@ -98,12 +95,12 @@ static struct option long_options[] =













  {"add-drop-table",	no_argument,    0, 	OPT_DROP},















  {"add-locks",    	no_argument,    0,	OPT_LOCKS},















  {"allow-keywords",	no_argument,    0, 	OPT_KEYWORDS},













  {"character-sets-dir",required_argument,0,    MD_OPT_CHARSETS_DIR},













  {"character-sets-dir",required_argument,0,    OPT_CHARSETS_DIR},















  {"complete-insert",	no_argument,    0, 	'c'},















  {"compress",          no_argument,    0, 	'C'},















  {"databases",         no_argument,    0,      'B'},















  {"debug",		optional_argument, 	0, '#'},













  {"default-character-set", required_argument,  0, MD_OPT_DEFAULT_CHARSET},













  {"default-character-set", required_argument,  0, OPT_DEFAULT_CHARSET},















  {"delayed-insert",	no_argument,    0, 	OPT_DELAYED},















  {"extended-insert",   no_argument,    0, 	'e'},















  {"fields-terminated-by", required_argument,   0, (int) OPT_FTB},










@@ -307,10 +304,10 @@ static int get_options(int *argc,char ***argv)













    case 'A':















      opt_alldbs=1;















      break;













    case MD_OPT_DEFAULT_CHARSET:













    case OPT_DEFAULT_CHARSET:















      default_charset= optarg;















      break;













    case MD_OPT_CHARSETS_DIR:













    case OPT_CHARSETS_DIR:















      charsets_dir= optarg;















      break;















    case 'f':

































include/mysqld_error.h



+5
−13






























Original line number
Diff line number
Diff line








@@ -214,16 +214,8 @@













#define ER_NO_PERMISSON_TO_CREATE_USER 1211















#define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212















#define ER_LOCK_DEADLOCK 1213













#define ER_DUMMY1 1214













#define ER_DUMMY2 1215













#define ER_DUMMY3 1216













#define ER_DUMMY4 1217













#define ER_DUMMY5 1218













#define ER_DUMMY6 1219













#define ER_DUMMY7 1220













#define ER_DUMMY8 1221













#define ER_TABLE_CANT_HANDLE_FULLTEXT 1222













#define ER_CANNOT_ADD_FOREIGN 1223













#define ER_NO_REFERENCED_ROW 1224













#define ER_ROW_IS_REFERENCED 1225













#define ER_ERROR_MESSAGES 226












#define ER_TABLE_CANT_HANDLE_FULLTEXT 1214













#define ER_CANNOT_ADD_FOREIGN 1215













#define ER_NO_REFERENCED_ROW 1216













#define ER_ROW_IS_REFERENCED 1217













#define ER_ERROR_MESSAGES 218
























isam/create.c



+3
−3






























Original line number
Diff line number
Diff line








@@ -253,10 +253,10 @@ int nisam_create(const char *name,uint keys,N_KEYDEF *keyinfo,













  share.base.fields=fields;















  share.base.pack_fields=packed;















  share.base.sortkey= (ushort) ~0;













  share.base.max_data_file_length= (pointer == 4) ? ~0L :













  share.base.max_data_file_length= (pointer == 4) ? (ulong) ~0L :















    (options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)) ?













    (1L << (pointer*8)) :













    (pointer == 3 && reclength >= 256L) ? NI_POS_ERROR :













    (ulong) (1L << (pointer*8)) :













    (pointer == 3 && reclength >= 256L) ? (ulong) NI_POS_ERROR :















    ((ulong) reclength * (1L << (pointer*8)));















  share.base.max_key_file_length= (share.base.key_reflength == 3 ?















				  NI_POS_ERROR :