mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-kt

Browse source 
into  big_geek.:D:/work/mysql/mysql-5.1-vc71
This commit is contained in:
unknown 2006-05-24 12:46:45 -05:00
commit 4280cdc45c
4 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/config-win.h
View file

@ -25,6 +25,7 @@ functions */
#if defined(_MSC_VER) && _MSC_VER >= 1400
/* Avoid endless warnings about sprintf() etc. being unsafe. */
#define _CRT_SECURE_NO_DEPRECATE 1
#define _USE_32BIT_TIME_T 1 /* force time_t to be 32 bit */
#endif
#include <sys/locking.h>

9
mysql-test/lib/mtr_misc.pl
View file

@ -108,7 +108,14 @@ sub mtr_exe_exists (@) {
map {$_.= ".exe"} @path if $::glob_win32;
foreach my $path ( @path )
{
return $path if -x $path;
if($::glob_win32)
{
return $path if -f $path;
}
else
{
return $path if -x $path;
}
}
if ( @path == 1 )
{

7
sql/net_serv.cc
View file

@ -37,9 +37,6 @@
HFTODO this must be hidden if we don't want client capabilities in
embedded library
*/
#ifdef __WIN__
#include <winsock.h>
#endif
#include <my_global.h>
#include <mysql.h>
#include <mysql_embed.h>
@ -51,7 +48,9 @@
#include <violite.h>
#include <signal.h>
#include <errno.h>
#ifdef __WIN__
#include <winsock.h>
#endif
#ifdef __NETWARE__
#include <sys/select.h>
#endif

20
storage/csv/ha_tina.cc
View file

@ -472,13 +472,20 @@ int tina_end(ha_panic_function type)
/*
Finds the end of a line.
Currently only supports files written on a UNIX OS.
Supports DOS, Unix, or Mac OS line endings.
*/
byte * find_eoln(byte *data, off_t begin, off_t end)
byte * find_eoln(byte *data, off_t begin, off_t end, int *eoln_len)
{
off_t dataend= begin;
*eoln_len= 0;
for (off_t x= begin; x < end; x++)
if (data[x] == '\n')
return data + x;
if (data[x] == '\r' || data[x] == '\n')
(*eoln_len)++;
else if (!(*eoln_len))
dataend++;
else
return data+dataend;
return 0;
}
@ -627,6 +634,7 @@ int ha_tina::find_current_row(byte *buf)
{
byte *mapped_ptr;
byte *end_ptr;
int eoln_len;
DBUG_ENTER("ha_tina::find_current_row");
mapped_ptr= (byte *)share->mapped_file + current_position;
@ -636,7 +644,7 @@ int ha_tina::find_current_row(byte *buf)
not to conflict with undergoing concurrent insert.
*/
if ((end_ptr= find_eoln(share->mapped_file, current_position,
local_saved_data_file_length)) == 0)
local_saved_data_file_length, &eoln_len)) == 0)
DBUG_RETURN(HA_ERR_END_OF_FILE);
for (Field **field=table->field ; *field ; field++)
@ -684,7 +692,7 @@ int ha_tina::find_current_row(byte *buf)
}
(*field)->store(buffer.ptr(), buffer.length(), system_charset_info);
}
next_position= (end_ptr - share->mapped_file)+1;
next_position= (end_ptr - share->mapped_file)+eoln_len;
/* Maybe use \N for null? */
memset(buf, 0, table->s->null_bytes); /* We do not implement nulls! */