mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
093d62922b
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
connection on the fly, because they first should be written to the binary
log.
To support efficient conversion we need to rewrite prepared statements
binlogging code first.
include/my_global.h:
Macro swap(a, b, c) was renamed to resolve name conflict with
String::swap() method.
include/my_sys.h:
Added declaration of escape_string_for_mysql()
include/mysql_com.h:
Removed and moved back: a macro which is visible to libmysql user but
has sence only in prepared statement protocol implementation.
isam/_search.c:
swap -> swap_variables
isam/test2.c:
swap -> swap_variables
libmysql/libmysql.c:
- sub_escape_string moved to mysys/charset.c to be visible in sql/
- few cleanups
myisam/mi_test2.c:
swap -> swap_variables
mysys/charset.c:
sub_escape_string was moved from libmysql.c to be able to use it in sql/
code.
mysys/my_chsize.c:
rename: swap -> swap_variables
mysys/my_compress.c:
swap -> swap_variables
mysys/my_handler.c:
swap -> swap_variables
sql/field.cc:
Field::store_time refactored to use TIME_to_string function from time.cc
sql/item.cc:
New implementation of Item_param class:
added support for character sets conversion.
sql/item.h:
Item_param:
- 'state' member introduced instead of many boolean variables.
- put ltime, int_value and real_value into union to save space.
- remove unimplemented members
- set_value renamed to set_str
sql/item_timefunc.cc:
Refactored to use functions from time.cc
sql/lock.cc:
rename: swap -> swap_variables
sql/mysql_priv.h:
- added declarations for TIME_to_ulonglong_*, TIME_to_string functions
- const specifiers for make_date, make_time, make_datetime arguments
sql/opt_range.cc:
rename: swap -> swap_variables
sql/protocol.cc:
- added character set conversion support to binary protocol.
- Protocol::convert changed to point at shared buffer in THD.
This lets us use one convert buffer for binary and simple protocol.
The same buffer is used for client->server conversions in prepared
statements code.
- string conversion code refactored to Protocol::store_string_aux function.
- few more comments
sql/protocol.h:
- Protocol::convert now points at THD::convert_buffer: we want to share one
buffer between all protocol implementations.
sql/sql_class.cc:
- implementation of THD::convert_string using THD::convert_buffer
(conversion of strings allocated in the system heap).
sql/sql_class.h:
- THD::convert_buffer is shared between THD and network Protocols and
used for character set conversion of strings.
- new function to convert String object from one charset to another using
THD::convert_buffer
sql/sql_insert.cc:
A little fix in a comment.
sql/sql_parse.cc:
Shrink convert buffer in the end of each statement.
sql/sql_prepare.cc:
Many changes:
- static specifier for set_param_* family of functions.
- FIELD_TYPE -> MYSQL_TYPE
- added set_param_binary as handler for BLOB types.
- added character set support
- added support for param typecode in mysql_stmt_get_longdata
(mysql_stmt_send_long_data handler)
- changes in Item_param deployed
- few cleanups
sql/sql_select.cc:
rename: swap -> swap_variables
sql/sql_string.cc:
- String::append rewritten to support character set conversion for
single-byte encodings.
- added String::swap method to efficiently exchange two string objects.
sql/sql_string.h:
Declraration for String::swap().
sql/time.cc:
- function TIME_to_string to convert TIME to String in default MySQL format
- family of functions TIME_to_ulonglong_*
tests/client_test.c:
Test for support for character set conversions in prepared statements
(binary and text data).
113 lines
3.1 KiB
C
113 lines
3.1 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 */
|
|
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
#include "m_string.h"
|
|
|
|
/*
|
|
Change size of file.
|
|
|
|
SYNOPSIS
|
|
my_chsize()
|
|
fd File descriptor
|
|
new_length New file size
|
|
filler If we don't have truncate, fill up all bytes after
|
|
new_length with this character
|
|
MyFlags Flags
|
|
|
|
DESCRIPTION
|
|
my_chsize() truncates file if shorter else fill with the filler character
|
|
|
|
RETURN VALUE
|
|
0 Ok
|
|
1 Error
|
|
*/
|
|
int my_chsize(File fd, my_off_t newlength, int filler, myf MyFlags)
|
|
{
|
|
my_off_t oldsize;
|
|
char buff[IO_SIZE];
|
|
DBUG_ENTER("my_chsize");
|
|
DBUG_PRINT("my",("fd: %d length: %lu MyFlags: %d",fd,(ulong) newlength,
|
|
MyFlags));
|
|
|
|
oldsize = my_seek(fd, 0L, MY_SEEK_END, MYF(MY_WME+MY_FAE));
|
|
DBUG_PRINT("info",("old_size: %ld", (ulong) oldsize));
|
|
|
|
if (oldsize > newlength)
|
|
#if defined(HAVE_SETFILEPOINTER)
|
|
/* This is for the moment only true on windows */
|
|
{
|
|
long is_success;
|
|
HANDLE win_file= (HANDLE) _get_osfhandle(fd);
|
|
long length_low, length_high;
|
|
length_low= (long) (ulong) newlength;
|
|
length_high= (long) ((ulonglong) newlength >> 32);
|
|
is_success= SetFilePointer(win_file, length_low, &length_high, FILE_BEGIN);
|
|
if (is_success == -1 && (my_errno= GetLastError()) != NO_ERROR)
|
|
goto err;
|
|
if (SetEndOfFile(win_file))
|
|
DBUG_RETURN(0);
|
|
my_errno= GetLastError();
|
|
goto err;
|
|
}
|
|
#elif defined(HAVE_FTRUNCATE)
|
|
{
|
|
if (ftruncate(fd, (off_t) newlength))
|
|
{
|
|
my_errno= errno;
|
|
goto err;
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
#elif defined(HAVE_CHSIZE)
|
|
{
|
|
if (chsize(fd, (off_t) newlength))
|
|
{
|
|
my_errno=errno;
|
|
goto err;
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
#else
|
|
{
|
|
/*
|
|
Fill space between requested length and true length with 'filler'
|
|
We should never come here on any modern machine
|
|
*/
|
|
VOID(my_seek(fd, newlength, MY_SEEK_SET, MYF(MY_WME+MY_FAE)));
|
|
swap_variables(my_off_t, newlength, oldsize);
|
|
}
|
|
#endif
|
|
|
|
/* Full file with 'filler' until it's as big as requested */
|
|
bfill(buff, IO_SIZE, filler);
|
|
while (newlength-oldsize > IO_SIZE)
|
|
{
|
|
if (my_write(fd,(byte*) buff,IO_SIZE,MYF(MY_NABP)))
|
|
goto err;
|
|
oldsize+= IO_SIZE;
|
|
}
|
|
if (my_write(fd,(byte*) buff,(uint) (newlength-oldsize),MYF(MY_NABP)))
|
|
goto err;
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
DBUG_PRINT("error", ("errno: %d", errno));
|
|
if (MyFlags & MY_WME)
|
|
my_error(EE_CANT_CHSIZE, MYF(ME_BELL+ME_WAITTANG), my_errno);
|
|
DBUG_RETURN(1);
|
|
} /* my_chsize */
|