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

Fixed bug when having many binary log files

Browse source 
Fixed bug when deleting keys with possible NULL values
many changes to mysqltest


Docs/Makefile.am:
  Don't print warnings when making ..dvi
Docs/manual.texi:
  Documented changes
acinclude.m4:
  Fixed bug in detecting BDB version 3.2.3g
client/mysqltest.c:
  Added TODO
  Cleanups
  Free all memory and close all files on exit
configure.in:
  New release
include/my_sys.h:
  Added new function needed for mysqltest.c
myisam/mi_create.c:
  Cleanup
myisam/mi_delete.c:
  Fixed bug when deleting keys with NULL
myisam/mi_search.c:
  cleanup
myisam/myisamchk.c:
  Added info about fulltext to -D
mysql-test/mysql-test-run.sh:
  Use less memory for mysqld
  Don't remove timefile if only testing one test
  Send option --debug to mysqltest
mysql-test/r/fulltext.result:
  New tests
mysql-test/r/func_math.result:
  Make test portable
mysql-test/t/fulltext.test:
  New tests
mysql-test/t/func_math.test:
  Make test portable
mysys/mf_iocache2.c:
  Fixed bug when reading over buffers
mysys/string.c:
  Added new function needed for mysqltest.c
mysys/typelib.c:
  cleanup
scripts/make_binary_distribution.sh:
  Added option suffix
  Removed some warnings for missing files
scripts/mysql_install_db.sh:
  Fixed type
scripts/safe_mysqld.sh:
  Also read options from 'server' group
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/bench-init.pl.sh:
  Added missing option '--silent'
sql/mysqld.cc:
  Added warnings
  Print backtraces even if 'current_thd' is not active
support-files/mysql.spec.sh:
  Removed duplicate entry
This commit is contained in:
unknown 2001-01-08 00:04:30 +02:00
commit fc4a3ef7c1
33 changed files with 761 additions and 574 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sql/mysqld.cc
View file

@ -258,7 +258,7 @@ ulong refresh_version=1L,flush_version=1L; /* Increments on each reload */
ulong query_id=1L,long_query_count,long_query_time,aborted_threads,
aborted_connects,delayed_insert_timeout,delayed_insert_limit,
delayed_queue_size,delayed_insert_threads,delayed_insert_writes,
delayed_rows_in_use,delayed_insert_errors,flush_time;
delayed_rows_in_use,delayed_insert_errors,flush_time, thread_created;
ulong filesort_rows, filesort_range_count, filesort_scan_count;
ulong filesort_merge_passes;
ulong select_range_check_count, select_range_count, select_scan_count;
@ -801,7 +801,9 @@ static void server_init(void)
sql_print_error("Do you already have another mysqld server running on port: %d ?",mysql_port);
unireg_abort(1);
}
(void) listen(ip_sock,(int) back_log);
if (listen(ip_sock,(int) back_log) < 0)
sql_print_error("Warning: listen() on TCP/IP failed with error %d",
errno);
}
if (mysqld_chroot)
@ -886,7 +888,9 @@ static void server_init(void)
#if defined(S_IFSOCK) && defined(SECURE_SOCKETS)
(void) chmod(mysql_unix_port,S_IFSOCK); /* Fix solaris 2.6 bug */
#endif
(void) listen(unix_sock,(int) back_log);
if (listen(unix_sock,(int) back_log) < 0)
sql_print_error("Warning: listen() on Unix socket failed with error %d",
errno);
}
#endif
DBUG_PRINT("info",("server started"));
@ -1082,6 +1086,8 @@ inline static __volatile__ void trace_stack()
uchar **stack_bottom;
uchar** ebp;
LINT_INIT(ebp);
LINT_INIT(stack_bottom);
fprintf(stderr,
"Attemping backtrace. You can use the following information to find out\n\
where mysqld died. If you see no messages after this, something went\n\
@ -1099,12 +1105,15 @@ terribly wrong\n");
}
if (!thd)
{
fprintf(stderr, "Cannot determine thread, ebp=%p, aborting backtrace\n",
ebp);
return;
fprintf(stderr, "Cannot determine thread, ebp=%p, backtrace may not be correct\n", ebp);
/* Assume that the stack starts at the previous even 65K */
ulong tmp= min(0x10000,thread_stack);
stack_bottom= (uchar**) (((ulong) &stack_bottom + tmp) &
~(ulong) 0xFFFF);
}
stack_bottom = (uchar**)thd->thread_stack;
if(ebp > stack_bottom || ebp < stack_bottom - thread_stack)
else
stack_bottom = (uchar**) thd->thread_stack;
if (ebp > stack_bottom || ebp < stack_bottom - thread_stack)
{
fprintf(stderr,
"Bogus stack limit or frame pointer, aborting backtrace\n");
@ -2010,6 +2019,7 @@ static void create_new_thread(THD *thd)
{
int error;
thread_count++;
thread_created++;
threads.append(thd);
DBUG_PRINT("info",(("creating thread %d"), thd->thread_id));
thd->connect_time = time(NULL);
@ -2595,7 +2605,7 @@ CHANGEABLE_VAR changeable_vars[] = {
{ "thread_concurrency", (long*) &concurrency,
DEFAULT_CONCURRENCY, 1, 512, 0, 1 },
{ "thread_cache_size", (long*) &thread_cache_size,
0, 1, 16384, 0, 1 },
0, 0, 16384, 0, 1 },
{ "tmp_table_size", (long*) &tmp_table_size,
1024*1024L, 1024, ~0L, MALLOC_OVERHEAD, 1 },
{ "thread_stack", (long*) &thread_stack,
@ -2748,6 +2758,7 @@ struct show_var_st status_vars[]= {
{"Sort_rows", (char*) &filesort_rows, SHOW_LONG},
{"Sort_scan", (char*) &filesort_scan_count, SHOW_LONG},
{"Threads_cached", (char*) &cached_thread_count, SHOW_LONG_CONST},
{"Threads_created", (char*) &thread_created, SHOW_LONG_CONST},
{"Threads_connected", (char*) &thread_count, SHOW_INT_CONST},
{"Threads_running", (char*) &thread_running, SHOW_INT_CONST},
{"Uptime", (char*) 0, SHOW_STARTTIME},