Skip to content

M
mariadb
Commit b8eb83d4 authored by unknown's avatar unknown
Browse files
Options

Portability fixes 

Fixed bug with long log-filenames in Innobase.


mysql-test/r/select.result:
  Turn off SCCS flag
mysql-test/t/alias.test:
  Turn off SCCS flag
mysql-test/t/backup.test:
  Turn off SCCS flag
mysql-test/t/bdb-crash.test:
  Turn off SCCS flag
mysql-test/t/bench_count_distinct.test:
  Turn off SCCS flag
mysql-test/t/bulk_replace.test:
  Turn off SCCS flag
mysql-test/t/check.test:
  Turn off SCCS flag
mysql-test/t/count_distinct2-master.opt:
  Turn off SCCS flag
mysql-test/t/count_distinct2.test:
  Turn off SCCS flag
mysql-test/t/dirty-close.test:
  Turn off SCCS flag
mysql-test/t/drop.test:
  Turn off SCCS flag
mysql-test/t/flush.test:
  Turn off SCCS flag
mysql-test/t/fulltext_cache.test:
  Turn off SCCS flag
mysql-test/t/fulltext_distinct.test:
  Turn off SCCS flag
mysql-test/t/fulltext_left_join.test:
  Turn off SCCS flag
mysql-test/t/fulltext_update.test:
  Turn off SCCS flag
mysql-test/t/fulltext_var.test:
  Turn off SCCS flag
mysql-test/t/handler.test:
  Turn off SCCS flag
mysql-test/t/having.test:
  Turn off SCCS flag
mysql-test/t/innodb.test:
  Turn off SCCS flag
mysql-test/t/join_crash.test:
  Turn off SCCS flag
mysql-test/t/kill.test:
  Turn off SCCS flag
mysql-test/t/lock.test:
  Turn off SCCS flag
mysql-test/t/multi_update.test:
  Turn off SCCS flag
mysql-test/t/myisam.test:
  Turn off SCCS flag
mysql-test/t/openssl_1.test:
  Turn off SCCS flag
mysql-test/t/openssl_2.test:
  Turn off SCCS flag
mysql-test/t/order_fill_sortbuf-master.opt:
  Turn off SCCS flag
mysql-test/t/order_fill_sortbuf.test:
  Turn off SCCS flag
mysql-test/t/overflow.test:
  Turn off SCCS flag
mysql-test/t/rpl000007-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000008-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000009-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000010-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000013-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000015-slave-master-info.opt:
  Turn off SCCS flag
mysql-test/t/rpl000015-slave.sh:
  Turn off SCCS flag
mysql-test/t/rpl000016-master.opt:
  Turn off SCCS flag
mysql-test/t/rpl000016-slave-master-info.opt:
  Turn off SCCS flag
mysql-test/t/rpl000016-slave.sh:
  Turn off SCCS flag
mysql-test/t/rpl000017-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000017-slave.sh:
  Turn off SCCS flag
mysql-test/t/rpl000017.test:
  Turn off SCCS flag
mysql-test/t/rpl000018-master.opt:
  Turn off SCCS flag
mysql-test/t/rpl000018-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000018.test:
  Turn off SCCS flag
mysql-test/t/rpl_log.test:
  Turn off SCCS flag
mysql-test/t/rpl_magic.test:
  Turn off SCCS flag
mysql-test/t/rpl_mystery22.test:
  Turn off SCCS flag
mysql-test/t/rpl_sporadic_master-master.opt:
  Turn off SCCS flag
mysql-test/r/alias.result:
  Turn off SCCS flag
mysql-test/r/backup.result:
  Turn off SCCS flag
mysql-test/r/bdb-crash.result:
  Turn off SCCS flag
mysql-test/r/bench_count_distinct.result:
  Turn off SCCS flag
mysql-test/r/big_test.require:
  Turn off SCCS flag
mysql-test/r/bulk_replace.result:
  Turn off SCCS flag
mysql-test/r/check.result:
  Turn off SCCS flag
mysql-test/r/count_distinct2.result:
  Turn off SCCS flag
mysql-test/r/dirty-close.result:
  Turn off SCCS flag
mysql-test/r/drop.result:
  Turn off SCCS flag
mysql-test/r/flush.result:
  Turn off SCCS flag
mysql-test/r/fulltext_cache.result:
  Turn off SCCS flag
mysql-test/r/fulltext_distinct.result:
  Turn off SCCS flag
mysql-test/r/fulltext_left_join.result:
  Turn off SCCS flag
mysql-test/r/fulltext_multi.result:
  Turn off SCCS flag
mysql-test/r/fulltext_order_by.result:
  Turn off SCCS flag
mysql-test/r/fulltext_update.result:
  Turn off SCCS flag
mysql-test/r/fulltext_var.result:
  Turn off SCCS flag
mysql-test/r/func_timestamp.result:
  Turn off SCCS flag
mysql-test/t/rpl_sporadic_master.test:
  Turn off SCCS flag
mysql-test/t/select_found.test:
  Turn off SCCS flag
mysql-test/t/status.test:
  Turn off SCCS flag
mysql-test/t/symlink.test:
  Turn off SCCS flag
mysql-test/t/type_decimal.test:
  Turn off SCCS flag
mysql-test/t/union.test:
  Turn off SCCS flag
mysql-test/t/user_var.test:
  Turn off SCCS flag
mysql-test/r/handler.result:
  Turn off SCCS flag
mysql-test/r/have_bdb.require:
  Turn off SCCS flag
mysql-test/r/have_innodb.require:
  Turn off SCCS flag
mysql-test/r/have_isam.require:
  Turn off SCCS flag
mysql-test/r/have_openssl.require:
  Turn off SCCS flag
mysql-test/r/have_openssl_1.require:
  Turn off SCCS flag
mysql-test/r/have_openssl_2.require:
  Turn off SCCS flag
mysql-test/r/have_raid.require:
  Turn off SCCS flag
mysql-test/r/have_symlink.require:
  Turn off SCCS flag
mysql-test/r/having.result:
  Turn off SCCS flag
mysql-test/r/innodb.result:
  Turn off SCCS flag
mysql-test/r/join_crash.result:
  Turn off SCCS flag
mysql-test/r/kill.result:
  Turn off SCCS flag
mysql-test/r/lock.result:
  Turn off SCCS flag
mysql-test/r/multi_update.result:
  Turn off SCCS flag
mysql-test/r/myisam.result:
  Turn off SCCS flag
mysql-test/r/openssl_1.result:
  Turn off SCCS flag
mysql-test/r/openssl_2.result:
  Turn off SCCS flag
mysql-test/r/order_fill_sortbuf.result:
  Turn off SCCS flag
mysql-test/r/rpl000001.result:
  Turn off SCCS flag
mysql-test/r/rpl000004.result:
  Turn off SCCS flag
mysql-test/r/rpl000017.result:
  Turn off SCCS flag
mysql-test/r/rpl000018.result:
  Turn off SCCS flag
mysql-test/r/rpl_log.result:
  Turn off SCCS flag
mysql-test/r/rpl_magic.result:
  Turn off SCCS flag
mysql-test/r/rpl_mystery22.result:
  Turn off SCCS flag
mysql-test/r/rpl_sporadic_master.result:
  Turn off SCCS flag
mysql-test/r/select_found.result:
  Turn off SCCS flag
mysql-test/r/status.result:
  Turn off SCCS flag
mysql-test/r/symlink.result:
  Turn off SCCS flag
mysql-test/r/type_decimal.result:
  Turn off SCCS flag
mysql-test/r/union.result:
  Turn off SCCS flag
mysql-test/r/user_var.result:
  Turn off SCCS flag
Docs/manual.texi:
  Fixed typo.
innobase/log/log0log.c:
  Fixed too short filename buffer.
mysys/mf_sort.c:
  Ensure that radix isn't used for VERY big arrrays.
scripts/make_binary_distribution.sh:
  Add mysqlmanager-pwgen and mysqlmanagerc into binary distribution.
sql-bench/test-insert.sh:
  Time out update_with_key_prefix
sql/ha_innobase.cc:
  Use current directory as base dir, if we are not using the embedded version.
tools/mysqlmanager.c:
  Portability fix
parent 229e25f8
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 15 deletions
Docs/manual.texi
View file @ b8eb83d4
......@@ -4037,7 +4037,7 @@ If you set an @code{ENUM} column to an unsupported value, it will be set to
the error value 'empty string', with numeric value 0.
@item
If you set an @cod{SET} column to an unsupported value, the value will
If you set an @code{SET} column to an unsupported value, the value will
be ignored. @xref{Bugs}.
@end itemize
innobase/log/log0log.c
View file @ b8eb83d4
......@@ -1849,7 +1849,7 @@ log_group_archive(
os_file_t file_handle;
dulint start_lsn;
dulint end_lsn;
char name[100];
char name[1024];
byte* buf;
ulint len;
ibool ret;
......
mysys/mf_sort.c
View file @ b8eb83d4
......@@ -25,7 +25,7 @@ void my_string_ptr_sort(void *base, uint items, size_s size)
#if INT_MAX > 65536L
uchar **ptr=0;
if (size <= 20 && items >= 1000 &&
if (size <= 20 && items >= 1000 && items < 100000 &&
(ptr= (uchar**) my_malloc(items*sizeof(char*),MYF(0))))
{
radixsort_for_str_ptr((uchar**) base,items,size,ptr);
......
scripts/make_binary_distribution.sh
View file @ b8eb83d4
......@@ -66,10 +66,12 @@ for i in extra/comp_err extra/replace extra/perror extra/resolveip \
myisam/myisampack sql/mysqld sql/mysqlbinlog \
client/mysql sql/mysqld client/mysqlshow client/mysqlcheck \
client/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \
tools/mysqlmanager \
client/mysqlmanagerc client/mysqlmanager-pwgen tools/mysqlmanager \
client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest \
client/.libs/mysqlcheck tools/.libs/mysqlmanager
client/.libs/mysqlcheck \
client/.libs/mysqlmanagerc client/libs/mysqlmanager-pwgen \
tools/.libs/mysqlmanager
do
if [ -f $i ]
then
......
sql-bench/test-insert.sh
View file @ b8eb83d4
......@@ -917,13 +917,19 @@ print "Time for update_with_key (" . ($opt_loop_count*3) . "): " .
timestr(timediff($end_time, $loop_time),"all") . "\n";
$loop_time=new Benchmark;
for ($i=0 ; $i < $opt_loop_count*3 ; $i+=3)
$count=0;
for ($i=1 ; $i < $opt_loop_count*3 ; $i+=3)
{
$sth = $dbh->do("update bench1 set dummy1='updated' where id=$i") or die $DBI::errstr;
$end_time=new Benchmark;
last if ($estimated=predict_query_time($loop_time,$end_time,\$i,$tests,
$opt_loop_count));
}
$end_time=new Benchmark;
print "Time for update_with_key_prefix (" . ($opt_loop_count) . "): " .
if ($estimated)
{ print "Estimated time"; }
else
{ print "Time"; }
print " for update_with_key_prefix (" . ($opt_loop_count) . "): " .
timestr(timediff($end_time, $loop_time),"all") . "\n";
print "\nTesting update of all rows\n";
......
sql/ha_innobase.cc
View file @ b8eb83d4
......@@ -526,9 +526,23 @@ innobase_init(void)
{
int err;
bool ret;
char current_lib[2], *default_path;
DBUG_ENTER("innobase_init");
/*
When using the embedded server, the datadirectory is not
in the current directory.
*/
if (!mysql_embedded)
default_path=mysql_real_data_home;
else
{
/* It's better to use current lib, to keep path's short */
current_lib[0]=FN_CURLIB;
current_lib[1]=FN_LIBCHAR;
default_path=current_lib;
}
if (specialflag & SPECIAL_NO_PRIOR) {
srv_set_thread_priorities = FALSE;
} else {
......@@ -544,10 +558,10 @@ innobase_init(void)
MYF(MY_WME));
srv_data_home = (innobase_data_home_dir ? innobase_data_home_dir :
mysql_real_data_home);
default_path);
srv_logs_home = (char*) "";
srv_arch_dir = (innobase_log_arch_dir ? innobase_log_arch_dir :
mysql_real_data_home);
default_path);
ret = innobase_parse_data_file_paths_and_sizes();
......@@ -557,7 +571,7 @@ innobase_init(void)
}
if (!innobase_log_group_home_dir)
innobase_log_group_home_dir= mysql_real_data_home;
innobase_log_group_home_dir= default_path;
ret = innobase_parse_log_group_home_dirs();
if (ret == FALSE) {
......
tools/mysqlmanager.c
View file @ b8eb83d4
......@@ -1543,10 +1543,11 @@ static struct manager_exec* manager_exec_new(char* arg_start,char* arg_end)
tmp->error="Too few arguments";
return tmp;
}
tmp->data_buf=(char*)tmp+sizeof(*tmp);
/* We have to allocate 'args' first as this must be alligned */
tmp->args=(char**)(tmp +1);
tmp->data_buf= (char*) (tmp->args + num_args);
memcpy(tmp->data_buf,arg_start,arg_len);
tmp->data_buf_size=arg_len;
tmp->args=(char**)(tmp->data_buf+arg_len);
tmp->num_args=num_args;
tmp->ident=tmp->data_buf;
tmp->ident_len=strlen(tmp->ident);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7