database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
This commit is contained in:
jani@a88-113-38-195.elisa-laajakaista.fi
2007-05-24 13:24:36 +03:00
parent 2ff938d21c 088e2395f1
commit fc3b3a0a86
478 changed files with 8584 additions and 8306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
sql/sql_load.cc
View File

@@ -25,7 +25,7 @@
class READ_INFO {
File file;
byte *buffer, /* Buffer for read text */
uchar *buffer, /* Buffer for read text */
*end_of_buff; /* Data in bufferts ends here */
uint buff_length, /* Length of buffert */
max_length; /* Max length of row */
@@ -40,7 +40,7 @@ class READ_INFO {
public:
bool error,line_cuted,found_null,enclosed;
byte *row_start, /* Found row starts here */
uchar *row_start, /* Found row starts here */
*row_end; /* Found row ends here */
CHARSET_INFO *read_charset;
@@ -576,7 +576,7 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
continue;
}
it.rewind();
byte *pos=read_info.row_start;
uchar *pos=read_info.row_start;
#ifdef HAVE_purify
read_info.row_end[0]=0;
#endif
@@ -611,7 +611,7 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
else
{
uint length;
byte save_chr;
uchar save_chr;
if ((length=(uint) (read_info.row_end-pos)) >
field->field_length)
length=field->field_length;
@@ -705,7 +705,7 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
while ((item= it++))
{
uint length;
byte *pos;
uchar *pos;
if (read_info.read_field())
break;
@@ -914,7 +914,7 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs,
set_if_bigger(length,line_start.length());
stack=stack_pos=(int*) sql_alloc(sizeof(int)*length);
if (!(buffer=(byte*) my_malloc(buff_length+1,MYF(0))))
if (!(buffer=(uchar*) my_malloc(buff_length+1,MYF(0))))
error=1; /* purecov: inspected */
else
{
@@ -924,7 +924,7 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs,
(is_fifo ? READ_FIFO : READ_CACHE),0L,1,
MYF(MY_WME)))
{
my_free((gptr) buffer,MYF(0)); /* purecov: inspected */
my_free((uchar*) buffer,MYF(0)); /* purecov: inspected */
error=1;
}
else
@@ -955,7 +955,7 @@ READ_INFO::~READ_INFO()
{
if (need_end_io_cache)
::end_io_cache(&cache);
my_free((gptr) buffer,MYF(0));
my_free((uchar*) buffer,MYF(0));
error=1;
}
}
@@ -988,7 +988,7 @@ inline int READ_INFO::terminator(char *ptr,uint length)
int READ_INFO::read_field()
{
int chr,found_enclosed_char;
byte *to,*new_buffer;
uchar *to,*new_buffer;
found_null=0;
if (found_end_of_line)
@@ -1011,7 +1011,7 @@ int READ_INFO::read_field()
if (chr == enclosed_char)
{
found_enclosed_char=enclosed_char;
*to++=(byte) chr; // If error
*to++=(uchar) chr; // If error
}
else
{
@@ -1053,7 +1053,7 @@ int READ_INFO::read_field()
{
if ((chr=GET) == my_b_EOF)
{
*to++= (byte) escape_char;
*to++= (uchar) escape_char;
goto found_eof;
}
/*
@@ -1065,7 +1065,7 @@ int READ_INFO::read_field()
*/
if (escape_char != enclosed_char || chr == escape_char)
{
*to++ = (byte) unescape((char) chr);
*to++ = (uchar) unescape((char) chr);
continue;
}
PUSH(chr);
@@ -1090,7 +1090,7 @@ int READ_INFO::read_field()
{
if ((chr=GET) == found_enclosed_char)
{ // Remove dupplicated
*to++ = (byte) chr;
*to++ = (uchar) chr;
continue;
}
// End of enclosed field if followed by field_term or line_term
@@ -1130,12 +1130,12 @@ int READ_INFO::read_field()
return 0;
}
}
*to++ = (byte) chr;
*to++ = (uchar) chr;
}
/*
** We come here if buffer is too small. Enlarge it and continue
*/
if (!(new_buffer=(byte*) my_realloc((char*) buffer,buff_length+1+IO_SIZE,
if (!(new_buffer=(uchar*) my_realloc((char*) buffer,buff_length+1+IO_SIZE,
MYF(MY_WME))))
return (error=1);
to=new_buffer + (to-buffer);
@@ -1170,7 +1170,7 @@ found_eof:
int READ_INFO::read_fixed_length()
{
int chr;
byte *to;
uchar *to;
if (found_end_of_line)
return 1; // One have to call next_line
@@ -1190,10 +1190,10 @@ int READ_INFO::read_fixed_length()
{
if ((chr=GET) == my_b_EOF)
{
*to++= (byte) escape_char;
*to++= (uchar) escape_char;
goto found_eof;
}
*to++ =(byte) unescape((char) chr);
*to++ =(uchar) unescape((char) chr);
continue;
}
if (chr == line_term_char)
@@ -1205,7 +1205,7 @@ int READ_INFO::read_fixed_length()
return 0;
}
}
*to++ = (byte) chr;
*to++ = (uchar) chr;
}
row_end=to; // Found full line
return 0;
@@ -1236,7 +1236,7 @@ int READ_INFO::next_line()
#ifdef USE_MB
if (my_mbcharlen(read_charset, chr) > 1)
{
for (int i=1;
for (uint i=1;
chr != my_b_EOF && i<my_mbcharlen(read_charset, chr);
i++)
chr = GET;