Subject: bk commit into 3.23 tree - msg#00116

Previous Message by Date: click to view message preview

bk commit into 4.0 tree

Below is the list of changes that have just been committed into a 4.0 repository of monty. When monty does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://www.mysql.com/doc/I/n/Installing_source_tree.html ChangeSet 1.1076 02/06/30 23:04:11 monty@xxxxxxxxxxxxxxx +2 -0 Fix problem with gcc 3.1 sql/mysqld.cc 1.320 02/06/30 23:04:09 monty@xxxxxxxxxxxxxxx +2 -0 Fix problem with gcc 3.1 include/my_global.h 1.24 02/06/30 23:04:09 monty@xxxxxxxxxxxxxxx +1 -1 Fix problem with gcc 3.1 # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: monty # Host: hundin.mysql.fi # Root: /my/bk/mysql-4.0 --- 1.319/sql/mysqld.cc Sun Jun 30 18:57:18 2002 +++ 1.320/sql/mysqld.cc Sun Jun 30 23:04:09 2002 @@ -4651,4 +4651,6 @@ template class I_List_iterator<THD>; template class I_List<i_string>; template class I_List<i_string_pair>; + +FIX_GCC_LINKING_PROBLEM #endif --- 1.23/include/my_global.h Sun Jun 30 18:57:17 2002 +++ 1.24/include/my_global.h Sun Jun 30 23:04:09 2002 @@ -152,7 +152,7 @@ /* Fix problem when linking c++ programs with gcc 3.x */ #ifdef DEFINE_CXA_PURE_VIRTUAL -#define FIX_GCC_LINKING_PROBLEM extern "C" { int __cxa_pure_virtual() {} } +#define FIX_GCC_LINKING_PROBLEM extern "C" { int __cxa_pure_virtual() {return 0;} } #else #define FIX_GCC_LINKING_PROBLEM #endif --------------------------------------------------------------------- Before posting, please check: http://www.mysql.com/manual.php (the manual) http://lists.mysql.com/ (the list archive) To request this thread, e-mail internals-thread3997@xxxxxxxxxxxxxxx To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>

Next Message by Date: click to view message preview

bk commit into 4.0 tree

Below is the list of changes that have just been committed into a 4.0 repository of serg. When serg does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://www.mysql.com/doc/I/n/Installing_source_tree.html ChangeSet 1.1070 02/06/30 23:29:25 serg@xxxxxxxxxxxxxx +3 -0 post-merge fix mysys/mf_iocache.c 1.27 02/06/30 23:29:23 serg@xxxxxxxxxxxxxx +0 -1 post-merge fix myisam/myisamchk.c 1.89 02/06/30 23:29:23 serg@xxxxxxxxxxxxxx +1 -1 typo fixed myisam/mi_check.c 1.93 02/06/30 23:29:23 serg@xxxxxxxxxxxxxx +2 -2 post-merge fix # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: serg # Host: serg.mysql.com # Root: /usr/home/serg/Abk/mysql-4.0 --- 1.92/myisam/mi_check.c Sun Jun 30 16:14:46 2002 +++ 1.93/myisam/mi_check.c Sun Jun 30 23:29:23 2002 @@ -2109,7 +2109,7 @@ DESCRIPTION Same as mi_repair_by_sort but do it multithreaded Each key is handled by a separate thread. - TODO: make a number of thread a parameter + TODO: make a number of threads a parameter RESULT 0 ok @@ -2358,7 +2358,7 @@ } got_error=1; /* Assume the following may go wrong */ - if (sort_param->fix_datafile) + if (sort_param[0].fix_datafile) { if (write_data_suffix(&sort_info,1) || end_io_cache(&info->rec_cache)) goto err; --- 1.88/myisam/myisamchk.c Sun Jun 30 15:06:44 2002 +++ 1.89/myisam/myisamchk.c Sun Jun 30 23:29:23 2002 @@ -219,7 +219,7 @@ {"recover", 'r', "Can fix almost anything except unique keys that aren't unique.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"paraller-recover", 'p', + {"parallel-recover", 'p', "Same as '-r' but creates all the keys in parallel", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"safe-recover", 'o', --- 1.26/mysys/mf_iocache.c Sun Jun 30 16:14:46 2002 +++ 1.27/mysys/mf_iocache.c Sun Jun 30 23:29:23 2002 @@ -508,7 +508,6 @@ pos_in_file= info->pos_in_file + (uint)(info->read_end - info->buffer); diff_length= (uint) (pos_in_file & (IO_SIZE-1)); length=IO_ROUND_UP(Count+diff_length)-diff_length; - length=IO_ROUND_UP(Count+diff_length)-diff_length; length=(length <= info->read_length) ? length + IO_ROUND_DN(info->read_length - length) : length - IO_ROUND_UP(length - info->read_length) ; --------------------------------------------------------------------- Before posting, please check: http://www.mysql.com/manual.php (the manual) http://lists.mysql.com/ (the list archive) To request this thread, e-mail internals-thread3999@xxxxxxxxxxxxxxx To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>

Previous Message by Thread: click to view message preview

bk commit into 3.23 tree

Below is the list of changes that have just been commited into a local 3.23. repository of monty. When monty does a push, they will be propogaged to the main repository and within 24 hours after the push into the public repository. For information on how to access the public repository see http://www.mysql.com/doc/I/n/Installing_source_tree.html ChangeSet 1.1053 02/06/29 01:06:14 monty@xxxxxxxxxxxxxxx +4 -0 Fixed copyright in pack_isam.c myisam/mi_cache.c 1.7 02/06/29 01:06:13 monty@xxxxxxxxxxxxxxx +2 -2 Indentation fixup isam/pack_isam.c 1.8 02/06/29 01:06:13 monty@xxxxxxxxxxxxxxx +4 -3 Fixed copyright configure.in 1.180 02/06/29 01:06:13 monty@xxxxxxxxxxxxxxx +1 -1 Version update Docs/manual.texi 1.795 02/06/29 01:06:12 monty@xxxxxxxxxxxxxxx +2 -0 Changelog # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: monty # Host: hundin.mysql.fi # Root: /my/bk/mysql --- 1.794/Docs/manual.texi Mon Jun 17 15:00:04 2002 +++ 1.795/Docs/manual.texi Sat Jun 29 01:06:12 2002 @@ -46927,6 +46927,8 @@ @node News-3.23.52, News-3.23.51, News-3.23.x, News-3.23.x @appendixsubsec Changes in release 3.23.52 @itemize @bullet +@code +Fixed a bug in range optimiser (causing crashes). @item Fixed possible problem in replication when doing @code{DROP DATABASE} on a database with InnoDB tables. --- 1.179/configure.in Fri May 31 15:22:34 2002 +++ 1.180/configure.in Sat Jun 29 01:06:13 2002 @@ -4,7 +4,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 3.23.51) +AM_INIT_AUTOMAKE(mysql, 3.23.52) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 --- 1.7/isam/pack_isam.c Thu May 2 18:04:18 2002 +++ 1.8/isam/pack_isam.c Sat Jun 29 01:06:13 2002 @@ -265,9 +265,10 @@ static void usage(void) { print_version(); - puts("Copyright (C) 1994-2000 TcX AB & Monty Program KB & Detron HB."); - puts("This is not free software. You must have a licence to use this program"); - puts("This software comes with ABSOLUTELY NO WARRANTY\n"); + puts("Copyright (C) 2002 MySQL AB"); + puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,"); + puts("and you are welcome to modify and redistribute it under the GPL license\n"); + puts("Pack a ISAM-table to take much smaller space"); puts("Keys are not updated, so you must run isamchk -rq on any table"); puts("that has keys after you have compressed it"); --- 1.6/myisam/mi_cache.c Sat Aug 18 10:49:00 2001 +++ 1.7/myisam/mi_cache.c Sat Jun 29 01:06:13 2002 @@ -59,8 +59,8 @@ in_buff_length=0; if (flag & READING_NEXT) { - if (pos != ((info)->pos_in_file + - (uint) ((info)->rc_end - (info)->rc_request_pos))) + if (pos != (info->pos_in_file + + (uint) (info->rc_end - info->rc_request_pos))) { info->pos_in_file=pos; /* Force start here */ info->rc_pos=info->rc_end=info->rc_request_pos; /* Everything used */ --------------------------------------------------------------------- Before posting, please check: http://www.mysql.com/manual.php (the manual) http://lists.mysql.com/ (the list archive) To request this thread, e-mail internals-thread3984@xxxxxxxxxxxxxxx To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>

Next Message by Thread: click to view message preview

bk commit into 3.23 tree

Below is the list of changes that have just been commited into a local 3.23. repository of heikki. When heikki does a push, they will be propogaged to the main repository and within 24 hours after the push into the public repository. For information on how to access the public repository see http://www.mysql.com/doc/I/n/Installing_source_tree.html ChangeSet 1.1071 02/07/01 02:19:58 heikki@xxxxxxxxxxxxxxx +2 -0 row0ins.c: The UNIV_DEBUG version asserted if a foreign key check failed because of a lock wait timeout btr0cur.c: Fix a bug: if the primary key was updated (or delete + insert) so that only the case of characters changed, we were left with a dangling adaptive hash index pointer, often causing an assertion failure in page0page.ic line 515 innobase/row/row0ins.c 1.13 02/07/01 02:19:20 heikki@xxxxxxxxxxxxxxx +8 -2 The UNIV_DEBUG version asserted if a foreign key check failed because of a lock wait timeout innobase/btr/btr0cur.c 1.14 02/07/01 02:17:59 heikki@xxxxxxxxxxxxxxx +6 -0 Fix a bug: if the primary key was updated (or delete + insert) so that only the case of characters changed, we were left with a dangling adaptive hash index pointer, often causing an assertion failure in page0page.ic line 515 # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: heikki # Host: hundin.mysql.fi # Root: /home/heikki/mysql3 --- 1.13/innobase/btr/btr0cur.c Sat Jun 22 20:36:51 2002 +++ 1.14/innobase/btr/btr0cur.c Mon Jul 1 02:17:59 2002 @@ -1355,6 +1355,12 @@ block = buf_block_align(rec); if (block->is_hashed) { + if (row_upd_changes_ord_field_binary(NULL, index, update)) { + + /* Remove possible hash index pointer to this record */ + btr_search_update_hash_on_delete(cursor); + } + rw_lock_x_lock(&btr_search_latch); } --- 1.12/innobase/row/row0ins.c Sat Jun 22 20:39:15 2002 +++ 1.13/innobase/row/row0ins.c Mon Jul 1 02:19:20 2002 @@ -627,6 +627,7 @@ dict_table_t* check_table; dict_index_t* check_index; ulint n_fields_cmp; + ibool timeout_expired; rec_t* rec; btr_pcur_t pcur; ibool moved; @@ -790,10 +791,15 @@ thr_get_trx(thr)->error_state = err; que_thr_stop_for_mysql(thr); + + timeout_expired = srv_suspend_mysql_thread(thr); - row_mysql_handle_errors(&err, thr_get_trx(thr), thr, NULL); + if (!timeout_expired) { + + goto run_again; + } - goto run_again; + err = DB_LOCK_WAIT_TIMEOUT; } return(err); --------------------------------------------------------------------- Before posting, please check: http://www.mysql.com/manual.php (the manual) http://lists.mysql.com/ (the list archive) To request this thread, e-mail internals-thread4000@xxxxxxxxxxxxxxx To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>