Commit graph

8032 commits

Author SHA1 Message Date
unknown
474c2578c5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-07-17 17:10:52 +02:00
unknown
cf8dbcc683 Fixes for
BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines",
BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table" with a test file.
It was not possible to add a test for BUG#4506 as in the test suite we must use --short-form
which does not display the "# at" lines.


client/mysqlbinlog.cc:
  Fix for BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines"
  when reading a remote binlog, the start position is not always BIN_LOG_HEADER_SIZE (4).
sql/sql_table.cc:
  Fix for BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table"
  we must my_error() _before_ we write to the binlog, so that a meaningful error code is available
  in thd->net.last_errno for storage of the DROP TABLE statement into the binlog.
2004-07-17 16:58:16 +02:00
unknown
139855210b InnoDB: limit the recursion depth for ON (UPDATE|DELETE) CASCADE
(Bug #4446)


innobase/row/row0ins.c:
  row_ins_foreign_check_on_constraint(): limit recursion for UPDATE too
mysql-test/r/innodb.result:
  Add test for recursion depth limit
mysql-test/t/innodb.test:
  Add test for recursion depth limit
2004-07-15 15:46:22 +03:00
unknown
9e6f619834 btr0cur.c:
Do not add + 1 to the InnoDB index cardinality estimate if the B-tree just contains one page; the fix made in March 2004 caused InnoDB systematically to overestimate the cardinality of empty or small tables by 1


innobase/btr/btr0cur.c:
  Do not add + 1 to the InnoDB index cardinality estimate if the B-tree just contains one page; the fix made in March 2004 caused InnoDB systematically to overestimate the cardinality of empty or small tables by 1
2004-07-15 09:08:51 +03:00
unknown
5eb3dc3223 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-07-13 21:50:09 +02:00
unknown
d2415e8188 - Move checking of the MD5 checksumming to the correct place
- fix calling of my_md5sum
2004-07-13 21:03:30 +02:00
unknown
9870801123 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
2004-07-13 15:28:29 +03:00
unknown
1e23a0efef A fix for a long standing bug in LOAD DATA .. LOCAL ..'
sql/sql_load.cc:
  A fix for a long standing bug in LOAD DATA .. LOCAL ..'
  
  When the error occurs, a link is broken instead of simply returning
  the error message and maintaining the same connection.
2004-07-13 13:54:20 +03:00
unknown
7ee050590f lock0lock.c:
Decrement n_lock_table_exp in lock_table_remove_low()
  instead of lock_table_dequeue().
  Do not empty lock_heap in lock_release_tables_off_kernel().


innobase/lock/lock0lock.c:
  Decrement n_lock_table_exp in lock_table_remove_low()
  instead of lock_table_dequeue().
  Do not empty lock_heap in lock_release_tables_off_kernel().
2004-07-13 12:30:34 +03:00
unknown
63c915c7b9 InnoDB: LOCK TABLES clean-up, part 2
innobase/lock/lock0lock.c:
  Decrement n_lock_table_exp in lock_table_dequeue(), not elsewhere
2004-07-12 17:14:13 +03:00
unknown
fbc420ba0e InnoDB: LOCK TABLE clean-up
innobase/include/lock0lock.h:
  Improve comments regarding LOCK_TABLE_EXP
innobase/include/row0mysql.h:
  Rename row_unlock_table_for_mysql() to row_unlock_tables_for_mysql()
  and improve its comment
innobase/include/trx0trx.h:
  Rename n_tables_locked to n_lock_table_exp
innobase/lock/lock0lock.c:
  Rename n_tables_locked to n_lock_table_exp
  Increment n_lock_table_exp already in lock_table_create()
  Replace some ut_ad() assertions with ut_a()
innobase/row/row0mysql.c:
  Rename n_tables_locked to n_lock_table_exp
  Rename row_unlock_table_for_mysql() to row_unlock_tables_for_mysql()
  and improve its comment
innobase/trx/trx0trx.c:
  Rename n_tables_locked to n_lock_table_exp
sql/ha_innodb.cc:
  Rename n_tables_locked to n_lock_table_exp
  Rename row_unlock_table_for_mysql() to row_unlock_tables_for_mysql()
2004-07-12 16:47:22 +03:00
unknown
7b6fc58fff InnoDB: Increment the lock wait watchdog timeout during CHECK TABLE
(Bug #2694)


innobase/include/srv0srv.h:
  Add srv_fatal_semaphore_wait_threshold
innobase/include/sync0arr.h:
  Improve comment of sync_array_print_long_waits()
innobase/row/row0mysql.c:
  Lengthen the srv_fatal_semaphore_wait_threshold by 2 hours during
  CHECK TABLE
innobase/srv/srv0srv.c:
  Add srv_fatal_semaphore_wait_threshold
innobase/sync/sync0arr.c:
  Improve comment of sync_array_print_long_waits().
  Replace the fixed timeout of 600 seconds with
  srv_fatal_semaphore_wait_threshold.
2004-07-12 15:13:18 +03:00
unknown
45485da702 srv0start.c:
innobase_start_or_create_for_mysql(): Rename innodb.status.<pid>
  to innodb_status.<pid> to avoid problems on VMS


innobase/srv/srv0start.c:
  innobase_start_or_create_for_mysql(): Rename innodb.status.<pid>
  to innodb_status.<pid> to avoid problems on VMS
2004-07-12 14:12:53 +03:00
unknown
f4b2b7aa2d mysql_find_files() made extern (from static to sql_show.cc) 2004-07-10 11:13:05 +02:00
unknown
d3b4458367 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-07-10 11:01:33 +02:00
unknown
2b1233c38d mysqlhotcopy:
fix MYI copying with scp
  safer tempfile creation


scripts/mysqlhotcopy.sh:
  fix MYI copying with scp
  safer tempfile creation
2004-07-09 14:30:51 +02:00
unknown
ee9890162e Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-07-09 02:03:50 +03:00
unknown
da4f3b371a Updated result sets (from 4.1) 2004-07-09 02:03:19 +03:00
unknown
39d6bdfb73 Do-compile:
Call my_md5sum with path


Build-tools/Do-compile:
  Call my_md5sum with path
2004-07-08 16:16:37 -05:00
unknown
4acc0869c4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-07-08 14:06:30 -05:00
unknown
9c7e5eddca Merge here.mwagner.org:/Volumes/BK/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-07-08 13:52:46 -05:00
unknown
8fe328f3a6 Do-compile:
Added support for MD5 verification of file transfers


Build-tools/Do-compile:
  Added support for MD5 verification of file transfers
2004-07-08 13:51:18 -05:00
unknown
85c57e7048 Fixed Bug#4451. According to C/C++ standards, enums should not be used
out of their range.
2004-07-08 17:12:42 +03:00
unknown
1a22b760b3 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-07-07 16:33:30 -05:00
unknown
9c8965933b Merge here.mwagner.org:/Volumes/BK/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-07-07 16:29:10 -05:00
unknown
fc3c71e9b6 my_md5sum:
Exit properly


Build-tools/my_md5sum:
  Exit properly
2004-07-07 16:28:07 -05:00
unknown
2a64371e64 my_lib.c:
more accurate comment


mysys/my_lib.c:
  more accurate comment
2004-07-05 19:12:23 +02:00
unknown
bdb3460fed Windows-specific:
Fix for BUG#4375 "Windows specific directories are copied during
replication": in the Windows version of my_dir(), do not show hidden
or system files which Windows sometimes creates in the root directory
of drive (like RECYCLER and SYSTEM VOLUME INFORMATION directories) (so
this problem showed up only when the datadir was the root dir of a
drive).
This will make SHOW DATABASES display better, and will do no harm to
MySQL. For example, DROP DATABASE will not miss some files, as MySQL
creates no hidden or system files.


mysys/my_lib.c:
  In my_dir(), do not show hidden or system files
  which Windows sometimes creates.
2004-07-05 19:07:26 +02:00
unknown
b30cd30a66 Fixing a bug in mysqltest.c:
if a command has a comment at the end of line, like:
error 2002 ; # this is error 2002
then the parsing of comment should not make mysqltest
forget about the value of expected error.
Reason it forgot it (so the next query caused the test to fail)
is that internally the above line is 2 queries.



client/mysqltest.c:
  if a command has a comment at the end of line, like:
  error 2002 ; # this is error 2002
  then the parsing of comment should not make mysqltest
  forget about the value of expected error.
2004-07-02 19:20:30 +02:00
unknown
6f45a5f18a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-07-01 14:55:23 -05:00
unknown
aae8874dd1 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-06-30 16:16:57 +02:00
unknown
62a6733e4e Fix for BUG#4326 "Replicated LOAD DATA INFILE show nothing in
processlist on slave":
we now report in SHOW PROCESSLIST that we are writing to the temp
files or loading the table. When we are writing to the tmp file:
| 3  | system user |                 |    | Connect | 6    | Making temp file /tmp/SQL_LOAD-2-1-2.data | 
and when we are actually loading the .data temp file into the table:
| 3  | system user |                 | test | Connect | 2    | | LOAD DATA INFILE '/tmp/SQL_LOAD-2-1-2.data' INTO TABLE `t` <...> |


sql/log_event.cc:
  Replication of LOAD DATA INFILE:
  we now report in SHOW PROCESSLIST that we are creating
  the temp files or loading the table.
  Plus removing a line which had a comment "should not be needed"
  and a guarding assertion which we have never heard fail (and logic
  says it should not fail).
2004-06-30 15:41:35 +02:00
unknown
7b6712a061 my_md5sum:
Added code to use locally installed perl modules first


Build-tools/my_md5sum:
  Added code to use locally installed perl modules first
2004-06-29 02:13:24 -05:00
unknown
cf8a6e52b7 s/\r\n/\n/ in mysql-test/*/system_mysql_db*
according to http://www.bitkeeper.com/Documentation.FAQS.Windows_NT.html


mysql-test/t/system_mysql_db.test:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_fix-master.opt:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_fix.test:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_refs.test:
  s/\r\n/\n/
mysql-test/r/system_mysql_db.result:
  s/\r\n/\n/
mysql-test/r/system_mysql_db_refs.result:
  s/\r\n/\n/
2004-06-28 15:53:49 +05:00
unknown
d72f90dbe0 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-06-27 18:21:14 +03:00
unknown
3eb5fd0f24 Fix to be able to cross-compile for modesto
scripts/make_win_src_distribution.sh:
  Change mode to -rw-rw-r--
2004-06-27 18:20:06 +03:00
unknown
07589a6da5 Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-06-25 18:55:03 +03:00
unknown
72093a6d14 Add missing .cnf files to windows installation (Bug #4216)
scripts/make_win_binary_distribution.sh:
  Add missing .cnf files (Bug #4216)
scripts/make_win_src_distribution.sh:
  Add missing .cnf files (Bug #4216)
  Align code with MySQL 4.1
2004-06-25 18:54:43 +03:00
unknown
3c7745ffcd Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-lock
2004-06-25 16:45:50 +02:00
unknown
f1257b3f91 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2686
2004-06-25 14:44:37 +02:00
unknown
fb987c8907 Merge
sql/ha_berkeley.cc:
  Auto merged
mysql-test/r/bdb.result:
  SCCS merged
mysql-test/t/bdb.test:
  SCCS merged
2004-06-25 12:59:47 +02:00
unknown
0f42f82d2d Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug3565


sql/sql_table.cc:
  Auto merged
2004-06-25 12:14:54 +02:00
unknown
83bee61eb8 Prevent potential problems on 32-Bit machines. 2004-06-25 11:35:37 +02:00
unknown
d75022fff7 parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204)
sql/sql_parse.cc:
  parameter of my_yyoverflow made independed from YYSIZE_T
sql/sql_yacc.yy:
  parameter of my_yyoverflow made independed from YYSIZE_T
2004-06-24 22:15:15 +03:00
unknown
bd71177369 Merge here.mwagner.org:/Volumes/BK/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-06-24 12:23:28 -05:00
unknown
df22d47135 logger.pm, Bootstrap:
Updates for output enhanced Bootstrap


Build-tools/Bootstrap:
  Updates for output enhanced Bootstrap
Build-tools/logger.pm:
  Updates for output enhanced Bootstrap
2004-06-24 12:22:48 -05:00
unknown
8f6664c59a bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
Redesigned the handler close functions so that they are usable
at different places where waiting for closing tables is done.


mysql-test/r/flush_table.result:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Added the test results.
mysql-test/t/flush_table.test:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Activated old test case.
  Added new test cases.
sql/mysql_priv.h:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Made mysql_ha_close() more flexible.
  Removed mysql_ha_closeall(), which closed only one table despite its name.
  Added mysql_ha_close_list(), which closes the complete list or all tables and does not lock.
  Removed a duplicate declaration.
sql/sql_base.cc:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Added proper close calls before some wait points to avoid deadlocks
  or infinite loops.
sql/sql_handler.cc:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Redesigned the internal function find_table_ptr_by_name().
  It can now suppress locking and tells if the requested table
  has been flushed by itself.
  Extended mysql_ha_close() so that it can now suppres locking
  and error reporting. That way it can be used at more places and the
  old function mysql_ha_closeall() is now obsolete.
  Added a new function mysql_ha_close_list() which closes a whole list
  of HANDLER tables or all HANDLER tables, if the list is NULL.
  Furthermore is can close all 'old' (marked for flush) HANDLER tables.
sql/sql_table.cc:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Replaced the obsolte mysql_ha_closeall() by the new mysql_ha_close().
2004-06-24 15:06:56 +02:00
unknown
afe29967e0 bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
Added put_length() to get_length() and unpack_key() to pack_key().
Keys were packed with the minimum size of the length field for the key part and 
unpacked with length size of the base column. 
For the purpose of optimal key packing we have the method pack_key(), while rows are 
packed with pack(). Now keys are unpacked with unpack_key() and no longer with 
unpack() which is used for rows.


mysql-test/r/bdb.result:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added the test case results.
mysql-test/t/bdb.test:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added the test case.
sql/field.cc:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added put_length() to get_length() and unpack_key() to pack_key().
  Keys were packed with the minimum size of the length field for the key part and 
  unpacked with length size of the base column. 
  For the purpose of optimal key packing we have the method pack_key(), while rows are packed 
  with pack(). Now keys are unpacked with unpack_key() and no longer with unpack() which is 
  used for rows.
sql/field.h:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added put_length() to get_length() and unpack_key() to pack_key().
  The default implementation simply calls unpack() for those field types that don't need 
  a special key unpacking.
sql/ha_berkeley.cc:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Now keys are unpacked with unpack_key() and no longer with unpack() which is used for rows.
  For most field types, however, this simply calls unpack().
2004-06-24 14:54:28 +02:00
unknown
098a1e3afa Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2688
2004-06-24 12:07:00 +02:00
unknown
b24c837ecd Development.fgl:
add typelib.h to filelist
Clients and Tools.fgl:
  add libmysql.dll to file list
4.0.XX-gpl.ipr:
  Various fixes to installshield project file (added files)


VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr:
  Various fixes to installshield project file (added files)
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl:
  add libmysql.dll to file list
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl:
  add typelib.h to filelist
2004-06-23 21:02:37 -07:00