Commit graph

9153 commits

Author SHA1 Message Date
unknown
79fea68bd7 cp1251.xml:
Upper/lower case translation bug for letter 't' fix.


sql/share/charsets/cp1251.xml:
  Upper/lower case translation bug for letter 't' fix.
2003-07-31 08:33:59 +05:00
unknown
20e39672fb Bug#937
myisamchk.c:
  help text clarified
mi_check.c:
  allow one to "analyze" empty table :)


myisam/mi_check.c:
  allow one to "analyze" empty table :)
myisam/myisamchk.c:
  help text clarified
2003-07-30 16:15:10 +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
4ee94d21f3 Database name and national characters fixes. 2003-07-30 17:51:42 +05: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
180b101f56 Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/item.cc:
  Auto merged
2003-07-30 02:15:26 -07:00
unknown
53e4153de1 Derivation attribute was not processed correctly
by MAX/MIN in some cases:
SELECT coercibility(max(s1)) from t1;

Subselect collation and derivation was not processed
correctly:

create table a select (select s1 from t1);
select * from t1 where s1 = (select s2 from t1);
2003-07-30 14:15:25 +05:00
unknown
0e3524dd88 Fix for timestamp issue (BR #819)
tests/client_test.c:
  Updated test_ts() test (For BR# 819)
2003-07-30 02:01:53 -07: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
9149ca11e6 README.1st:
Revise 4.1 Windows-install instructions.


Docs/README.1st:
  Revise 4.1 Windows-install instructions.
2003-07-29 12:51:24 -05:00
unknown
f94d0178ca Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-07-29 20:27:36 +03:00
unknown
29b230355d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1


sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
2003-07-29 20:26:14 +03:00
unknown
668cd9729f prevented finding references in item_list for non-SELECT st_select_lex
(fixed BUG#943)


mysql-test/r/subselect.result:
  test for bug 943
mysql-test/t/subselect.test:
  test for bug 943
sql/item.cc:
  bool field changed with enum
  prevented finding references in item_list for non-SELECT st_select_lex
sql/sql_lex.cc:
  bool field changed with enum
sql/sql_lex.h:
  bool field changed with enum
sql/sql_parse.cc:
  all subqueries and UNION parts marked as SELECT
sql/sql_yacc.yy:
  bool field changed with enum
  PRIMARY SELECT command st_select_lex marked as SELECT
2003-07-29 16:59:46 +03:00
unknown
ec1a433f08 Fixed that this sequence didn't produce an error as it should have:
CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
                 s2 CHAR(5) COLLATE latin1_swedish_ci);
SELECT * FROM t1 WHERE s1 = s2;
2003-07-29 17:39:39 +05:00
unknown
8d7b54b7c2 A new separate error message: Unknown collation 'blablabla' 2003-07-29 17:12:14 +05:00
unknown
0792c1c824 count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922)
removerd unused loop_id


mysql-test/r/subselect.result:
  test of BUG#922
mysql-test/t/subselect.test:
  test of BUG#922
sql/item.cc:
  removerd unused loop_id
  we need count HAVING clause elements, because agregate function can be present in it
sql/item.h:
  removerd unused loop_id
sql/item_subselect.cc:
  new name of field
sql/sql_derived.cc:
  new name of field
sql/sql_lex.cc:
  new name of field
sql/sql_lex.h:
  new name of field
sql/sql_select.cc:
  new name of field
sql/sql_union.cc:
  new name of field
2003-07-29 13:00:32 +03:00
unknown
8713e9791c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-07-29 13:11:44 +05:00
unknown
0db8648a1a logging_ok:
Logging to logging@openlogging.org accepted
README.1st:
  new file - Readme for Windows distribution


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-07-29 00:40:50 +02: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
0f85fb676c Followup to Jim's changes in mysqldoc tree. Unfortunately, it's too late for 4.0.14 :( 2003-07-28 17:50:06 +02:00
unknown
37ddcebad2 tabe & query hashes made case insensitive (BUG#933)
mysql-test/r/query_cache.result:
  fixed charecter sets
  new case sensetive test
mysql-test/t/query_cache.test:
  fixed charecter sets
  new case sensetive test
sql/sql_cache.cc:
  query & table comparision should be case insensitive
2003-07-28 18:28:44 +03:00
unknown
2ee5454d1d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-07-28 20:16:42 +05:00
unknown
4ef2a4306d Fix for #886
sql-common/client.c:
  SOCKET_EINTR is handled differently working in replication
2003-07-28 20:16:11 +05:00
unknown
329e063774 bugs #701 and #783 - old .frm files were read in incorrectly in 4.1 (each field was assigned a charset, BLOBs were converted to TEXT) 2003-07-28 16:58:52 +02:00
unknown
683e3ef018 test results fixed 2003-07-28 16:58:51 +02:00
unknown
dfc8a17724 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1


sql/sql_base.cc:
  Auto merged
2003-07-28 10:58:50 -04:00
unknown
a56959a5b6 changed for AUTO_VALUE_ON_ZERO
mysql-test/r/auto_increment.result:
  added test for AUTO_VALUE_ON_ZERO
mysql-test/t/auto_increment.test:
  added test for AUTO_VALUE_ON_ZERO
2003-07-28 10:57:46 -04: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
673a1d8044 'mysqld --verbose' should not print help screen 2003-07-27 10:26:29 +02:00
unknown
c474744000 ulong is not portable 2003-07-27 10:17:04 +02:00
unknown
ab0641ccfe Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
2003-07-27 09:59:24 +02:00
unknown
fc9e7e105e Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-07-26 23:15:11 +02:00
unknown
65a12f457d My changes to test rpl_insert_id in 4.0 about replication of foreign_key_checks
have in fact no effect, because in 4.0 the slave always runs with --skip-innodb.
In 4.1, mysqld accepts option --innodb which can override --skip-innodb.
So I add this option to the test.
When the updated test (using InnoDB tables) from 4.0 will be merged
into 4.1, with this good .opt file, we'll have a meaningful test in 4.1.
Until then, the test in 4.1 will pass but be useless.
And in 4.0, it will stay useless forever.
("it" = the part of the test which tests replication of foreign_key_checks)


BitKeeper/deleted/.del-rpl_insert_id-slave.opt~ba10e66ea50b556:
  Delete: mysql-test/rpl_insert_id-slave.opt
2003-07-26 23:14:09 +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
ae5d38569d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-07-25 10:50:54 -05:00
unknown
2763b52d0a outer join, impossible on condition, where, and usable key for range
bug#926
2003-07-25 14:32:03 +02:00
unknown
13325ee789 Bug#909: mysqld --verbose --help != mysqld --help --verbose
Proposed fix for bug#909
2003-07-25 11:03:57 +05: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
3a8d1c3cd0 Print accounts in error messages as 'user'@'host' rather than 'user@host'.
The latter is misleading because differs from the syntax used for GRANT/REVOKE.

Fix up test result affected by error message edits.


mysql-test/r/grant_cache.result:
  Fix up test result to match error message edit.
sql/share/czech/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/danish/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/dutch/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/english/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/estonian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/french/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/german/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/greek/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/hungarian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/italian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/japanese/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/korean/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/norwegian-ny/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/norwegian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/polish/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/portuguese/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/romanian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/russian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/serbian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/slovak/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/spanish/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/swedish/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/ukrainian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
2003-07-24 12:43:57 -05:00
unknown
c67f50f37e Fix for service issue with paths having spaces (bug #687) 2003-07-23 21:57:44 -04:00
unknown
fb98d363e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-local


BitKeeper/etc/logging_ok:
  auto-union
2003-07-23 19:49:42 +04:00
unknown
af8d09ff47 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-23 18:50:18 +04:00