mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merged with mysql-5.1 tree.

Browse source 
client/mysqltest.cc:
  Manually merged
configure.in:
  Manually merged
mysql-test/r/variables.result:
  Manually merged
mysql-test/t/variables.test:
  Manually merged
mysys/my_pread.c:
  Manually merged
mysys/my_read.c:
  Manually merged
sql/mysqld.cc:
  Manually merged
storage/csv/ha_tina.h:
  Manually merged
storage/myisam/ha_myisam.cc:
  Manually merged
storage/myisam/mi_check.c:
  Manually merged
storage/myisam/mi_search.c:
  Manually merged
This commit is contained in:
Michael Widenius 2009-04-25 13:05:32 +03:00
commit e726e587ec
264 changed files with 4589 additions and 1605 deletions
Download patch file Download diff file Expand all files Collapse all files

20
storage/federated/ha_federated.cc
View file

@ -505,7 +505,7 @@ int federated_done(void *p)
in sql_show.cc except that quoting always occurs.
*/
static bool append_ident(String *string, const char *name, uint length,
static bool append_ident(String *string, const char *name, size_t length,
const char quote_char)
{
bool result;
@ -515,7 +515,7 @@ static bool append_ident(String *string, const char *name, uint length,
if (quote_char)
{
string->reserve(length * 2 + 2);
string->reserve((uint) length * 2 + 2);
if ((result= string->append(&quote_char, 1, system_charset_info)))
goto err;
@ -533,7 +533,7 @@ static bool append_ident(String *string, const char *name, uint length,
result= string->append(&quote_char, 1, system_charset_info);
}
else
result= string->append(name, length, system_charset_info);
result= string->append(name, (uint) length, system_charset_info);
err:
DBUG_RETURN(result);
@ -543,7 +543,7 @@ err:
static int parse_url_error(FEDERATED_SHARE *share, TABLE *table, int error_num)
{
char buf[FEDERATED_QUERY_BUFFER_SIZE];
int buf_len;
size_t buf_len;
DBUG_ENTER("ha_federated parse_url_error");
buf_len= min(table->s->connect_string.length,
@ -721,7 +721,7 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table,
{
share->connection_string[share->table_name - share->connection_string]= '\0';
share->table_name++;
share->table_name_length= strlen(share->table_name);
share->table_name_length= (uint) strlen(share->table_name);
DBUG_PRINT("info",
("internal format, parsed table_name share->connection_string \
@ -1489,7 +1489,7 @@ static FEDERATED_SHARE *get_share(const char *table_name, TABLE *table)
pthread_mutex_lock(&federated_mutex);
tmp_share.share_key= table_name;
tmp_share.share_key_length= strlen(table_name);
tmp_share.share_key_length= (uint) strlen(table_name);
if (parse_url(&mem_root, &tmp_share, table, 0))
goto error;
@ -2161,7 +2161,7 @@ int ha_federated::update_row(const uchar *old_data, uchar *new_data)
{
if (bitmap_is_set(table->write_set, (*field)->field_index))
{
uint field_name_length= strlen((*field)->field_name);
size_t field_name_length= strlen((*field)->field_name);
append_ident(&update_string, (*field)->field_name, field_name_length,
ident_quote_char);
update_string.append(STRING_WITH_LEN(" = "));
@ -2187,7 +2187,7 @@ int ha_federated::update_row(const uchar *old_data, uchar *new_data)
if (bitmap_is_set(table->read_set, (*field)->field_index))
{
uint field_name_length= strlen((*field)->field_name);
size_t field_name_length= strlen((*field)->field_name);
append_ident(&where_string, (*field)->field_name, field_name_length,
ident_quote_char);
if (field_in_record_is_null(table, *field, (char*) old_data))
@ -3158,7 +3158,7 @@ int ha_federated::real_connect()
}
int ha_federated::real_query(const char *query, uint length)
int ha_federated::real_query(const char *query, size_t length)
{
int rc= 0;
DBUG_ENTER("ha_federated::real_query");
@ -3169,7 +3169,7 @@ int ha_federated::real_query(const char *query, uint length)
if (!query || !length)
goto end;
rc= mysql_real_query(mysql, query, length);
rc= mysql_real_query(mysql, query, (uint) length);
end:
DBUG_RETURN(rc);

4
storage/federated/ha_federated.h
View file

@ -70,7 +70,7 @@ typedef struct st_federated_share {
int share_key_length;
ushort port;
uint table_name_length, server_name_length, connect_string_length, use_count;
size_t table_name_length, server_name_length, connect_string_length, use_count;
pthread_mutex_t mutex;
THR_LOCK lock;
} FEDERATED_SHARE;
@ -113,7 +113,7 @@ private:
uint key_len,
ha_rkey_function find_flag,
MYSQL_RES **result);
int real_query(const char *query, uint length);
int real_query(const char *query, size_t length);
int real_connect();
public:
ha_federated(handlerton *hton, TABLE_SHARE *table_arg);