database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Code Activity

row0sel.c Removes now trailing spaces from varchars

Browse Source 
srv0start.c	Removes now trailing spaces from varchars
row0mysql.ic	Removes now trailing spaces from varchars
ha_innobase.cc	Removes now trailing spaces from varchars


sql/ha_innobase.cc:
  Removes now trailing spaces from varchars
innobase/include/row0mysql.ic:
  Removes now trailing spaces from varchars
innobase/row/row0sel.c:
  Removes now trailing spaces from varchars
innobase/srv/srv0start.c:
  Removes now trailing spaces from varchars
This commit is contained in:
unknown
2001-03-02 19:07:29 +02:00
parent e6a57adc93
commit 3be063eab8
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
innobase/include/row0mysql.ic
View File

@ -89,7 +89,12 @@ row_mysql_store_col_in_innobase_format(
} }
} else if (type == DATA_VARCHAR || type == DATA_VARMYSQL } else if (type == DATA_VARCHAR || type == DATA_VARMYSQL
|| type == DATA_BINARY) { || type == DATA_BINARY) {
ptr = row_mysql_read_var_ref(&col_len, mysql_data); ptr = row_mysql_read_var_ref(&col_len, mysql_data);
/* Remove trailing spaces */
while (col_len > 0 && ptr[col_len - 1] == ' ') {
col_len--;
}
} else if (type == DATA_BLOB) { } else if (type == DATA_BLOB) {
ptr = row_mysql_read_blob_ref(&col_len, mysql_data, col_len); ptr = row_mysql_read_blob_ref(&col_len, mysql_data, col_len);

3
innobase/row/row0sel.c
View File

@ -1934,6 +1934,9 @@ row_sel_field_store_in_mysql_format(
dest = row_mysql_store_var_len(dest, len); dest = row_mysql_store_var_len(dest, len);
ut_memcpy(dest, data, len); ut_memcpy(dest, data, len);
/* Pad with trailing spaces */
memset(dest + len, ' ', col_len - len);
/* ut_ad(col_len >= len + 2); No real var implemented in /* ut_ad(col_len >= len + 2); No real var implemented in
MySQL yet! */ MySQL yet! */

6
innobase/srv/srv0start.c
View File

@ -175,6 +175,9 @@ open_or_create_log_file(
fprintf(stderr, fprintf(stderr,
"Innobase: Log file %s did not exist: new to be created\n", "Innobase: Log file %s did not exist: new to be created\n",
name); name);
printf("Innobase: Setting log file %s size to %lu\n",
name, UNIV_PAGE_SIZE * srv_log_file_size);
ret = os_file_set_size(name, files[i], ret = os_file_set_size(name, files[i],
UNIV_PAGE_SIZE * srv_log_file_size, 0); UNIV_PAGE_SIZE * srv_log_file_size, 0);
if (!ret) { if (!ret) {
@ -323,6 +326,9 @@ open_or_create_data_files(
printf("Innobase: Setting file %s size to %lu\n", printf("Innobase: Setting file %s size to %lu\n",
name, UNIV_PAGE_SIZE * srv_data_file_sizes[i]); name, UNIV_PAGE_SIZE * srv_data_file_sizes[i]);
printf(
"Innobase: Database physically writes the file full: wait...\n");
ret = os_file_set_size(name, files[i], ret = os_file_set_size(name, files[i],
UNIV_PAGE_SIZE * srv_data_file_sizes[i], 0); UNIV_PAGE_SIZE * srv_data_file_sizes[i], 0);

16
sql/ha_innobase.cc
View File

@ -431,7 +431,8 @@ innobase_init(void)
if (!innobase_data_file_path) if (!innobase_data_file_path)
{ {
fprintf(stderr,"Can't initialize Innobase as 'innobase_data_file_path' is not set\n"); fprintf(stderr,
"Can't initialize Innobase as 'innobase_data_file_path' is not set\n");
innobase_skip=1; innobase_skip=1;
DBUG_RETURN(FALSE); // Continue without innobase DBUG_RETURN(FALSE); // Continue without innobase
} }
@ -1278,6 +1279,12 @@ innobase_convert_and_store_changed_col(
if (len == UNIV_SQL_NULL) { if (len == UNIV_SQL_NULL) {
data = NULL; data = NULL;
} else if (col_type == DATA_VARCHAR) {
/* Remove trailing spaces */
while (len > 0 && data[len - 1] == ' ') {
len--;
}
} else if (col_type == DATA_INT) { } else if (col_type == DATA_INT) {
/* Store integer data in Innobase in a big-endian /* Store integer data in Innobase in a big-endian
format, sign bit negated, if signed */ format, sign bit negated, if signed */
@ -2581,13 +2588,14 @@ ha_innobase::update_table_comment(
{ {
uint length=strlen(comment); uint length=strlen(comment);
char *str=my_malloc(length + 50,MYF(0)); char *str=my_malloc(length + 100,MYF(0));
if (!str) if (!str)
return (char*)comment; return (char*)comment;
sprintf(str,"%s Innobase free: %lu kB", comment, sprintf(str,
(ulong) innobase_get_free_space()); "%s; (See manual about Innobase stats); Innobase free: %lu kB",
comment, (ulong) innobase_get_free_space());
return((char*) str); return((char*) str);
} }