Commit graph

6699 commits

Author SHA1 Message Date
unknown
47a38b2fdb - fixed BUG#968 ("test: argument expected" error) - thanks to Alex Kiernan
for the patch
2003-08-01 10:09:23 +02:00
unknown
2d413d3c6f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merged_qc-4.0
2003-07-30 16:52:56 +03:00
unknown
98159be2b1 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bugfix
2003-07-30 16:55:31 +04:00
unknown
9b9a914c5d support of more then 255 tables dependence in query cache (fixed BUG#930)
mysql-test/r/query_cache.result:
  test of many merged tales
mysql-test/t/query_cache.test:
  test of many merged tales
sql/sql_cache.h:
  query with merged tables can depend of more then 255 tables
2003-07-30 14:59:56 +03:00
unknown
880088ba50 Fix security bug. mysqld server without ssl support was completly
ignorant about ssl_type attribute


sql/sql_acl.cc:
  Now acl_getroot() honors ssl_type attribute even if we compile without openssl
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-07-30 03:33:48 +04:00
unknown
30b751f8a6 dict0dict.c:
Fix bug introduced in 4.0.13 and reported by Emic: if a CREATE TABLE ended in a comment, a memory overrun could happen


innobase/dict/dict0dict.c:
  Fix bug introduced in 4.0.13 and reported by Emic: if a CREATE TABLE ended in a comment, a memory overrun could happen
2003-07-30 01:12:33 +03:00
unknown
17a6d749d4 mysqld.cc:
innodb_fast_shutdown CAN take an argument though it was not specified so in mysqld.cc


sql/mysqld.cc:
  innodb_fast_shutdown CAN take an argument though it was not specified so in mysqld.cc
2003-07-29 00:04:56 +03:00
unknown
46f96a30b0 Avoid segfault when LOAD DATA FROM MASTER is run on a master which does no
binary logging.


sql/repl_failsafe.cc:
  If the master is running without --log-bin, SHOW MASTER STATUS will return
  "empty set", i.e. row==0; we must test this before invoking row[0], or
  segfault.
2003-07-28 15:33:46 +02:00
unknown
6ccebbaf64 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-07-26 17:59:53 +02:00
unknown
f3a847eceb Make rpl_insert_id.test use InnoDB, and added foreign keys to the table,
so that it really tests replication of SET FOREIGN_KEY_CHECKS (previously
it used MyISAM).


mysql-test/r/rpl_insert_id.result:
  result update
mysql-test/t/rpl_insert_id.test:
  Make test use InnoDB, and added foreign keys to the table, so that it really tests 
  replication of FOREIGN_KEY_CHECKS.
  --disable_warnings because 4.1 prints a warning when the table type
  is not available.
2003-07-26 17:59:05 +02:00
unknown
df5b088919 srv0srv.c, os0file.c, log0recv.h, log0log.h, fil0fil.h, fsp0fsp.c, fil0fil.c:
Merge
trx0trx.c:
  Print more info about a trx in SHOW INNODB status; try to find the bug reported by Plaxo
buf0buf.c:
  Check that page log sequence numbers are not in the future
log0recv.c, log0log.c:
  Fixed a bug: if you used big BLOBs, and your log files were relatively small, InnoDB could in a big BLOB operation temporarily write over the log produced AFTER the latest checkpoint. If InnoDB would crash at that moment, then the crash recovery would fail, because InnoDB would not be able to scan the log even up to the latest checkpoint. Starting from this version, InnoDB tries to ensure the latest checkpoint is young enough. If that is not possible, InnoDB prints a warning to the .err log


innobase/log/log0log.c:
  Fixed a bug: if you used big BLOBs, and your log files were relatively small, InnoDB could in a big BLOB operation temporarily write over the log produced AFTER the latest checkpoint. If InnoDB would crash at that moment, then the crash recovery would fail, because InnoDB would not be able to scan the log even up to the latest checkpoint. Starting from this version, InnoDB tries to ensure the latest checkpoint is young enough. If that is not possible, InnoDB prints a warning to the .err log
innobase/log/log0recv.c:
  Fixed a bug: if you used big BLOBs, and your log files were relatively small, InnoDB could in a big BLOB operation temporarily write over the log produced AFTER the latest checkpoint. If InnoDB would crash at that moment, then the crash recovery would fail, because InnoDB would not be able to scan the log even up to the latest checkpoint. Starting from this version, InnoDB tries to ensure the latest checkpoint is young enough. If that is not possible, InnoDB prints a warning to the .err log
innobase/buf/buf0buf.c:
  Check that page log sequence numbers are not in the future
innobase/trx/trx0trx.c:
  Print more info about a trx in SHOW INNODB status; try to find the bug reported by Plaxo
innobase/fil/fil0fil.c:
  Merge
innobase/fsp/fsp0fsp.c:
  Merge
innobase/include/fil0fil.h:
  Merge
innobase/include/log0log.h:
  Merge
innobase/include/log0recv.h:
  Merge
innobase/os/os0file.c:
  Merge
innobase/srv/srv0srv.c:
  Merge
2003-07-25 22:26:39 +03:00
unknown
cff7465b84 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.fix
2003-07-25 09:26:23 +05:00
unknown
c786689a23 Fix: remove compile warnings on RH(with openssl) 2003-07-25 09:25:50 +05:00
unknown
6ccd8cfa69 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-07-24 22:30:20 +02:00
unknown
14d9a2e5e7 Fix for BUG#858 "CHANGE MASTER forgets to update relay-log.info";
just a flush_relay_log_info() at the end of CHANGE MASTER
(there was already flush_master_info()).


sql/sql_repl.cc:
  Comments.
  Flush relay-log.info after CHANGE MASTER, or the changes
  to the relay log parameters (relay log name and position, and
  the corresponding master's binlog name and position) will be
  lost if the slave mysqld is shutdown immediately after the 
  CHANGE MASTER (without the slave threads being started).
2003-07-24 22:29:09 +02:00
unknown
ab34adf66a WL#1036 (print the db in slave error messages).
I extended the task to cleaning error messages, making them look nicer,
and making the output of SHOW SLAVE STATUS (column Last_error) be as complete
as what's printed on the .err file;
previously we would have, for a failure of a replicated LOAD DATA INFILE:
- in the .err, 2 lines:
"duplicate entry 2708 for key 1"
"failed loading SQL_LOAD-5-2-2.info"
- and in SHOW SLAVE STATUS, only:
"failed loading SQL_LOAD-5-2-2.info".
Now SHOW SLAVE STATUS will contain the concatenation of the 2 messages.


sql/log_event.cc:
  Print the default database when replication stops because of an error. Previously, we had:
  "error "Duplicate entry 87987 for key 1", query 'insert into t values(87987)'", ie the db
  was not mentioned, making it hard for cases where the same table name is used in
  several databases.
  Lengthened some error messages (for failing replication of LOAD DATA: mention the table
  and the db).
  Changes so that SHOW SLAVE STATUS reports as complete errors as the .err file.
sql/slave.cc:
  Removed a useless declaration (the rewrite_db() function is already declared in slave.h).
  Added missing ')' in error messages.
  Tried to make error messages look nicer (previously we had
  "do START SLAVE;, error_code=1062"
  now we'll have
  "do START SLAVE; . Error_code=1062".
  This form has been discussed, I agree it's no panacea, but it's still more readable
  like this. To be improved in the future :)
sql/slave.h:
  declarations.
2003-07-24 22:25:36 +02:00
unknown
c67f50f37e Fix for service issue with paths having spaces (bug #687) 2003-07-23 21:57:44 -04:00
unknown
9dce7500d7 --with-openssl-includes/libraries 2003-07-23 16:13:07 +02:00
unknown
011e4cc5d6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.fix
2003-07-22 19:57:28 +05:00
unknown
89f4169880 Bug #554: Support for --with-openssl[=DIR] 2003-07-22 19:56:52 +05:00
unknown
d911df6fe5 Bug #554: Support for --with-openssl[=DIR]
Here is fix for bug 554.
Added configure options 
--with-openssl-includes[=DIR] and --with-openssl-libs[=DIR]


acinclude.m4:
  Bug #554: Support for --with-openssl[=DIR]
2003-07-22 15:04:37 +05:00
unknown
06cffa036c - tagged ChangeSet 1.1527.1.3 as "mysql-4.0.14"
- bumped up version number in configure.in to 4.0.15
2003-07-22 09:45:53 +02:00
unknown
ca3c960381 btr0cur.c:
Fix bug: if there was a 'record too long' error in an insert, InnoDB forgot to free reserved file space extents; they were only freed in mysqld restart


innobase/btr/btr0cur.c:
  Fix bug: if there was a 'record too long' error in an insert, InnoDB forgot to free reserved file space extents; they were only freed in mysqld restart
2003-07-22 10:14:43 +03:00
unknown
850dfdd9a3 btr0cur.c:
Fix an error in the previous push


innobase/btr/btr0cur.c:
  Fix an error in the previous push
2003-07-22 03:23:02 +03:00
unknown
ce10ce81cb btr0cur.c:
Fix bug reported by Dyego Souza do Carmo: if a row becomes too long, > 8000 bytes, in an update, then InnoDB simply removes the clustered index record and does not report of table handler error 139


innobase/btr/btr0cur.c:
  Fix bug reported by Dyego Souza do Carmo: if a row becomes too long, > 8000 bytes, in an update, then InnoDB simply removes the clustered index record and does not report of table handler error 139
2003-07-22 02:44:55 +03:00
unknown
a493762bb0 myisamchk --sort-records crash on compressed tables fixed. 2003-07-21 22:21:07 +02:00
unknown
30ee158d2f Bug #473 - GRANT ... TO ''@... was requiring FLUSH PRIVILEGES to work 2003-07-21 13:46:57 +02:00
unknown
5aef292a07 Fix for #712 with Serg's suggestions
myisam/mi_locking.c:
  Here we use F_EXTRA_LCK
myisam/myisamchk.c:
  lines of "locking - emulation" replaced with mi_lock_database call
myisam/myisamdef.h:
  no need for MI_TEMPORARY_TABLE
sql/ha_myisam.cc:
  We use F_WRLCK instead MI_TEMPORARY_TABLE
2003-07-19 18:17:29 +05:00
unknown
0fd6f4049d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2003-07-19 13:51:15 +05:00
unknown
906dc7df75 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.(none):/home/my/mysql-4.0
2003-07-18 12:38:18 +03:00
unknown
16bb14180b Portability fixes for Redhat 9
acinclude.m4:
  Fixed problem with openssl on RedHat 9
vio/viosocket.c:
  Removed compiler warning
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-07-18 12:35:29 +03:00
unknown
42346bf9d1 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-18 10:39:43 +02:00
unknown
a2813df5ed Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-07-18 10:13:41 +02:00
unknown
995fe9f13a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-07-18 04:38:05 +03:00
unknown
a25c63ce74 Removed wrong "Found lock of type # that is write and read locked" warnings. 2003-07-18 04:37:37 +03:00
unknown
06517dfed3 Fixed memory overrun when doing REPAIR on table with multi-part auto_increment key where one part was a packed CHAR
myisam/mi_check.c:
  Fixed memory overrun in _mi_put_key_in_record
myisam/mi_key.c:
  Fixed unnecessary memory allocation
mysql-test/r/insert_select.result:
  Added test case for memory corruption
mysql-test/t/insert_select.test:
  Added test case for memory corruption
mysys/safemalloc.c:
  Removed compiler warnings
sql/sql_acl.cc:
  Fixed core dump when running with --debug
2003-07-18 04:04:24 +03:00
unknown
9942e0c7c6 my_strnncoll_latin1_de rewritten from scratch. Bug with overlapping combos went away.
mysql-test/r/ctype_latin1_de.result:
  testing overlapping combos
mysql-test/t/ctype_latin1_de.test:
  testing overlapping combos
2003-07-17 20:17:46 +02:00
unknown
a9da5a8d8c Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-07-17 00:21:57 +02:00
unknown
88534d0063 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_683/mysql-4.0
2003-07-16 18:21:56 -04:00
unknown
1793513891 fixed bug Bug #683 (Prompt for password doesn't go to console for Windows) 2003-07-16 18:15:35 -04:00
unknown
3ea4fb3812 - heavily reworked the comments and layout of the new sample my.cnf file
as requested by PeterZ


support-files/my-innodb-heavy-4G.cnf.sh:
   - heavily reworked the comments and layout as requested by PeterZ
2003-07-16 17:13:45 +02:00
unknown
dc4e41dcae - fixed the automatic generation of support-files/MacOSX/ReadMe.txt -
a node name was changed in manual.texi which resulted in a very large
   ReadMe.txt file, as the generating script could not find the (renamed)
   ending node. Fixed the ending node name in Docs/Makefile.am and the 
   Docs/Support/generate-text-files.pl Perl script to make sure this does
   not happen again (I only discovered this because the Do-pkg script was
   not able to add the ReadMe.txt to the Apple Disk image because it ran out
   of disk space due to the size of the file)


Docs/Makefile.am:
   - Fixed a node name that was changed in manual.texi and resulted in
     the generation of a _very_ large ReadMe.txt file (down to the very end
     of the manual, since the ending node was not found)
Docs/Support/generate-text-files.pl:
   - added a safeguard: if the ending node was not found, abort with an error
     to indicate that the generated text file might be too large (as it would
     contain the whole manual, down from the starting node)
   - made some cosmetical changes
2003-07-16 12:06:55 +02:00
unknown
47d9c95f9c Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


sql/handler.cc:
  Auto merged
2003-07-15 20:44:29 +02:00
unknown
b40895f9d2 bug #702 - ALTER TABLE tm UNION=(t1,t2) doesn't work if t1.MYD is compressed
myisammrg/myrg_open.c:
  never mark merge table as readonly even if all underlying myisam tables are readonly,
  otherwise ALTER TABLE merge UNION=(t1,t2,t3,...) will not work
sql/handler.cc:
  map EACCES to ER_OPEN_AS_READONLY.
  can only happen on modifying merge table that has (some) read-only myisam tables
2003-07-15 20:43:57 +02:00
unknown
b1646502dd - removed options sort_buffer and key_buffer from calls to (my)isamchk
in mysqld_safe (commented out by default), to not override any options
   defined in my.cnf (thanks to Axel Schwenke from Jobpilot.de for the
   suggestion)
2003-07-15 12:50:17 +02:00
unknown
6159cd27bf Portability fixes
acinclude.m4:
  Made test for compress more reliable (for Solaris)
sql/item_strfunc.cc:
  Portability fix (for Linux Alpha)
2003-07-15 13:10:20 +03:00
unknown
c36c37c339 merge
mysql-test/r/rpl_max_relay_size.result:
  Auto merged
2003-07-14 23:52:17 +03:00
unknown
e97b2766e1 Fixed wrong test in LOG::close
Fixed test for binary build


mysql-test/r/rpl_max_relay_size.result:
  Fixed test for binary build
mysql-test/t/rpl_max_relay_size.test:
  Fixed test for binary build
sql/log.cc:
  Fixed wrong test in close
2003-07-14 23:49:19 +03:00
unknown
45db29dbc2 Added missing --replace_result for ports in SHOW SLAVE STATUS.
mysql-test/r/rpl_max_relay_size.result:
  result update
mysql-test/t/rpl_max_relay_size.test:
  port-independent test
2003-07-14 22:02:26 +02:00
unknown
aa70f48264 errmsg.txt:
Correct a misleading error message about max row length


sql/share/english/errmsg.txt:
  Correct a misleading error message about max row length
2003-07-14 16:04:20 +03:00