Commit graph

20251 commits

Author SHA1 Message Date
unknown
8cb66fe618 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/bkroot/mysql-5.0
2005-02-24 00:48:07 +01:00
unknown
52bba384fc Changes to allow 5.0.3 to compile on Windows after XA was pushed
logging_ok:
  Logging to logging@openlogging.org accepted
mi_packrec.c:
  Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
mi_extra.c:
  Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
my_mmap.c:
  Changed how no mmap message is printed for Windows
sql_map.cc:
  Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap


sql/sql_map.cc:
  Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap
mysys/my_mmap.c:
  Changed how no mmap message is printed for Windows
myisam/mi_extra.c:
  Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
myisam/mi_packrec.c:
  Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-23 16:29:03 -06:00
unknown
91251238b4 Bug#8412: merged from 4.1
sql/log.cc:
  Merge from 4.1
2005-02-23 23:01:51 +01:00
unknown
7f13845432 Bug#8412: Setting error code to 0 on statements that cannot fail.
sql/log.cc:
  Setting error code to 0 on SQL statements that cannot fail.
2005-02-23 20:59:00 +01:00
unknown
47ed1db746 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-23 20:52:20 +01:00
unknown
bef32dfacd innodb-dependent test moved from rpl_rotate_logs.test to binlog.test
mysql-test/r/binlog.result:
  binlog rotation after a big transation
mysql-test/r/rpl_rotate_logs.result:
  innodb-dependent test removed
mysql-test/t/binlog.test:
  binlog rotation after a big transation
mysql-test/t/rpl_rotate_logs.test:
  innodb-dependent test removed
2005-02-23 20:35:59 +01:00
unknown
2ffc8022b1 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2005-02-23 13:15:54 -06:00
unknown
196ee96ed2 Fix badly spelled symbol. 2005-02-23 13:15:03 -06:00
unknown
58df85e06a Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/log_event.cc:
  Auto merged
2005-02-23 20:10:58 +01:00
unknown
29d2b6f6bc Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-02-23 20:01:52 +01:00
unknown
4b2ee4854f result fixes after my change to mysqlbinlog (which was accidentally
pushed some minutes ago)



mysql-test/r/ctype_ucs.result:
  result fix
mysql-test/r/mysqlbinlog.result:
  result fix
mysql-test/r/mysqlbinlog2.result:
  result fix
mysql-test/r/rpl_charset.result:
  result fix
mysql-test/r/user_var.result:
  result fix
2005-02-23 19:59:25 +01:00
unknown
1f2b46fa0f Bug#8412: Merge from 4.0
mysql-test/r/rpl_insert_id.result:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
sql/log.cc:
  Merge from 4.0
2005-02-23 19:58:54 +01:00
unknown
a6abd60ca1 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-bug-8576
2005-02-23 20:54:07 +02:00
unknown
7a8a76075a Fix for BUG#8576
This fix addresses a bug of the HPUX C++ compiler, in the way it uses registers.
As result, the last comparison of the variable 'result' failed, and next_prefix()
looped forever.


sql/opt_range.cc:
  - fix for BUG#8576
  - updated function name in DBUG_ENTER
2005-02-23 20:49:47 +02:00
unknown
6a0e1def63 Merge mysql.com:/home/bkroot/mysql-4.0
into mysql.com:/home/bk/b8412-mysql-4.0
2005-02-23 19:40:31 +01:00
unknown
39cab5abec Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-02-23 19:20:17 +01:00
unknown
0d8ec8d5cb mysqlbinlog: safety measures (safe setting for completion_type,
auto-end-rollback in case crashed binlog) which cannot hurt.


client/mysqlbinlog.cc:
  safety measures (completion_type, crashed binlog)
2005-02-23 19:18:14 +01:00
unknown
0624fde21c log_event.cc:
cast sql_mode to ulonglong before int8store, otherwise the implementation of int8store
  based on >> complains that we do 32-bit var >> 32 which is undefined according to C standard.
  (compiler warning appeared on SGI Irix)


sql/log_event.cc:
  cast sql_mode to ulonglong before int8store, otherwise the implementation of int8store
  based on >> complains that we do 32-bit var >> 32 which is undefined according to C standard.
  (compiler warning appeared on SGI Irix)
2005-02-23 18:58:49 +01:00
unknown
c976069e9f Merge mysql.com:/home/mysql_src/mysql-4.1-clean
into mysql.com:/home/mysql_src/mysql-5.0-xa


sql/lock.cc:
  Auto merged
2005-02-23 18:52:15 +01:00
unknown
be9f1863b7 don't log BEGIN in auto-commit mode
correct end_log_pos for Xid_log_event


mysql-test/r/binlog.result:
  don't depend on the previous tests
mysql-test/r/rpl_rotate_logs.result:
  correct end_log_pos for Xid_log_event
mysql-test/t/binlog.test:
  don't depend on the previous tests
sql/handler.h:
  comment
sql/log_event.cc:
  advance position for Xid
sql/log_event.h:
  comment
sql/sql_class.h:
  correct end_log_pos for Xid_log_event
sql/sql_parse.cc:
  make sure commit handler knows whether it's autocommit or not
2005-02-23 18:26:49 +01:00
unknown
a2a1449c36 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-02-23 19:22:52 +02:00
unknown
e09a6c1a20 Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0


mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
sql/protocol.cc:
  Auto merged
2005-02-23 20:22:51 +03:00
unknown
cc97be60ba Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-23 18:18:22 +01:00
unknown
262dadccf1 Fix for bug #6572: SHOW ERRORS doesn't 2005-02-23 20:18:21 +03:00
unknown
c25d35bdb3 Fixed a compatibility problem.
1) If my.cnf is found in datadir and basedir, give a warning and use the
   one in basedir.
2) If my.cnf is found in datadir, use it, but give a warning.
3) No warning if my.cnf is in basedir.
2005-02-23 18:59:54 +02:00
unknown
5941f19bbd FIx for BUG#8682 "flush_block_commit test hangs on HPUX":
start_waiting_global_read_lock() should wake up all those who are waiting
for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
AND those registered in global_read_lock_blocks_commit.


sql/lock.cc:
  start_waiting_global_read_lock() should wake up all those who are waiting
  for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
  AND those registered in global_read_lock_blocks_commit.
2005-02-23 17:38:51 +01:00
unknown
272f78b533 Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2005-02-23 18:47:00 +03:00
unknown
f443992e66 Fix for bug#6317: string function CHAR, parameter is NULL, wrong result 2005-02-23 18:15:45 +03:00
unknown
0de9a3dd14 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.fresh
2005-02-23 18:17:00 +04:00
unknown
a86dd5b707 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-bug-8576
2005-02-23 16:03:58 +02:00
unknown
0cd185ea6a write "COMMIT" into binlog if there's no Xid at the end of transaction
new tests


mysql-test/r/innodb.result:
  savepoint test
mysql-test/t/innodb.test:
  savepoint test
sql/log.cc:
  write "COMMIT" into binlog if there's no Xid at the end of transaction
2005-02-23 14:55:16 +01:00
unknown
3fe941e4d3 Merge
include/config-win.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysys/errors.c:
  Auto merged
include/mysys_err.h:
  Merge from 4.1, attempt#2.
2005-02-23 17:03:34 +04:00
unknown
e6944e4d32 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


sql/sql_class.h:
  Auto merged
2005-02-23 14:47:48 +02:00
unknown
9c7879c281 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-bug-8576


sql/opt_range.cc:
  Auto merged
2005-02-23 14:47:48 +02:00
unknown
72cc9fbd5b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-23 15:47:47 +03:00
unknown
2e199a1e8d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2005-02-23 16:29:01 +04:00
unknown
990d937de2 config-win.h:
Activate Unicode collations in Windows version.


include/config-win.h:
  Activate Unicode collations in Windows version.
2005-02-23 16:28:10 +04:00
unknown
56ed8091dd Fixed Bug#Server crash due to 'flush status' in various tests. 2005-02-23 14:19:48 +02:00
unknown
9e1ead5a4a Fix for bug #7217: information_schema: columns are varbinary() instead of timestamp &
bug #7215: information_schema: columns are longtext instead of varchar
2005-02-23 15:15:36 +03:00
unknown
51408489b1 Fix for BUG#8576
The problem was in different representations of double variables depending on
platform/compiler/compile options. In some cases double variables are represented by
64 bits (while in memory), or by 80 bits (while in FPU register). As a result equal
values are not considered "==". As many sources point out,  doubles should not be
compared by '==' for this reason. This fix subtracts the scaled minimal double
value X such that 1 + X != 1, to ensure that the inequality holds in any case.


sql/opt_range.cc:
  Do not compare double values with == because they may have different representations.
2005-02-23 13:39:29 +02:00
unknown
4e30b1568d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-23 11:34:28 +01:00
unknown
c03c9b2424 Merge
ndb/src/kernel/main.cpp:
  merge
2005-02-23 10:16:56 +01:00
unknown
e1d76d1663 removed printout "- Repeated 1 times"
make sure transporter connections are close early in shutdown


ndb/src/common/logger/LogHandler.cpp:
  removed printout "- Repeated 1 times"
ndb/src/kernel/main.cpp:
  make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.cpp:
  make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.hpp:
  make sure transporter connections are close early in shutdown
2005-02-23 10:12:26 +01:00
unknown
8f62bf2794 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-23 12:08:35 +03:00
unknown
7d4ea5cfc2 Merge
extra/perror.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Merge change in warning message
sql/sql_parse.cc:
  Hand-merge
2005-02-22 16:39:21 -08:00
unknown
c0cb1faa7c Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 2005-02-23 00:53:00 +01:00
unknown
6f1a4fe451 After merge fixes
mysql-test/t/rpl_charset.test:
  I have no idea why the automatic merge changed these, but now I have changed it back
2005-02-23 00:50:30 +01:00
unknown
4983a398a2 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-23 00:13:02 +01:00
unknown
76f9049eaf Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 2005-02-22 23:05:53 +01:00
unknown
a26e966d41 Manual merge 4.1->5.0 2005-02-22 22:42:49 +01:00