Commit graph

20583 commits

Author SHA1 Message Date
mskold@mysql.com
4e6a4dfa13 Merge 2005-02-24 14:48:12 +01:00
mskold@mysql.com
d3573d7e21 Added tests for BINARY|VARBINARY LIKE|NOT LIKE 2005-02-24 14:20:12 +01:00
pem@mysql.comhem.se
2b1f0bf1f5 Fixed BUG#8638: Test 'sp' fails: Stored Procedure often sends warning 1329
The warning sent is by itself ok, the problem was rather why it wasn't
  sent on some other platforms...
  The real problem was that a total_warn_count which was inconsistent with warn_list
  was sent back with send_eof() during SP execution, which in turn cause a protocol
  error in mysqltest.
2005-02-24 13:56:09 +01:00
pekka@mysql.com
8b8dc46513 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-02-24 13:07:34 +01:00
pekka@mysql.com
b67f82d901 ndb - wl-1203 fix binary LIKE binary in ndb api 2005-02-24 13:07:33 +01:00
kent@mysql.com
c3af8b202d libmysqld.dsp:
Corrected path to my_decimal.cpp
2005-02-24 11:24:59 +01:00
mskold@mysql.com
b8a6e7e3f5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-24 11:22:51 +01:00
mskold@mysql.com
00d5e43c75 Added support for condition pushdown to storage engine for LIKE of varbin 2005-02-24 11:09:14 +01:00
msvensson@neptunus.(none)
84abf2378e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-02-24 10:08:47 +01:00
msvensson@neptunus.(none)
703faaba63 Update text for option 2005-02-24 10:07:37 +01:00
msvensson@neptunus.(none)
2570dc8883 Convert ndb-cache-check-time fomr milliseconds to seconds 2005-02-24 09:42:11 +01:00
ramil@mysql.com
077ed062af Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-02-24 12:18:37 +04:00
ramil@mysql.com
c1b78b1a4f A fix (mysql_priv.h should be included first) 2005-02-24 12:17:59 +04:00
bar@mysql.com
29e513d2a7 sql_select.cc:
Redundant "Item::" was removed.
2005-02-24 12:05:08 +04:00
mwagner@here.mwagner.org
561c8d3d84 Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-02-23 23:53:48 -06:00
mwagner@here.mwagner.org
27efaa9127 Bootstrap:
Add new manual.texi include files
2005-02-23 23:44:13 -06:00
joreland@mysql.com
2952f73c16 merge 2005-02-24 06:24:46 +01:00
joreland@mysql.com
b90e9e4cc9 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-24 06:19:41 +01:00
joreland@mysql.com
00625adadc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-24 06:18:02 +01:00
joreland@mysql.com
87402eb5bb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-24 06:14:43 +01:00
reggie@mdk10.(none)
18799ea2ca Added my_mmap to mysys library
mysys.dsp:
  Added my_mmap
2005-02-23 23:10:22 -06:00
reggie@mdk10.(none)
579293a29f More changes to make 5.0.3 compile on Windows
sql_map.cc:
  moved include of sys/stat outside of HAVE_SYS_MMAN_H define
my_decimal.h:
  Added define for EMBEDDED_SERVER for call to string2my_decimal
mi_packrec.c:
  removed cast to caddr_t
2005-02-23 22:55:46 -06:00
bell@51.0.168.192.in-addr.arpa
cfdf5bcdc8 fixed test results 2005-02-24 04:07:58 +02:00
bell@51.0.168.192.in-addr.arpa
36265381fc Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-24 03:28:33 +02:00
bell@51.0.168.192.in-addr.arpa
3cb61419bd get time for thread switching 2005-02-24 03:25:53 +02:00
bell@51.0.168.192.in-addr.arpa
bf43b0d31a fixed typo in test 2005-02-24 02:59:36 +02:00
mats@mysql.com
199c01ddb3 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
bell@51.0.168.192.in-addr.arpa
5d6cc9de06 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-24 01:11:59 +02:00
reggie@mdk10.(none)
2ffd3a3a61 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
2005-02-23 16:29:03 -06:00
mats@mysql.com
bfce3aee8d Bug#8412: merged from 4.1 2005-02-23 23:01:51 +01:00
bell@51.0.168.192.in-addr.arpa
99114bb60e Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-23 23:00:41 +02:00
bell@51.0.168.192.in-addr.arpa
8655e4327e Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0
2005-02-23 22:56:24 +02:00
bell@51.0.168.192.in-addr.arpa
270d93b83d Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-23 22:16:51 +02:00
mats@mysql.com
30ade5b57e Bug#8412: Setting error code to 0 on statements that cannot fail. 2005-02-23 20:59:00 +01:00
serg@serg.mylan
55420a8d01 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
serg@serg.mylan
b8288584e9 innodb-dependent test moved from rpl_rotate_logs.test to binlog.test 2005-02-23 20:35:59 +01:00
paul@snake-hub.snake.net
2047a1f411 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
paul@snake-hub.snake.net
c2507d88f5 Fix badly spelled symbol. 2005-02-23 13:15:03 -06:00
serg@serg.mylan
e38b3e2390 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-23 20:10:58 +01:00
mskold@mysql.com
07cdc9e334 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-23 20:08:21 +01:00
guilhem@mysql.com
bef1690816 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
guilhem@mysql.com
624aaa4b09 result fixes after my change to mysqlbinlog (which was accidentally
pushed some minutes ago)
2005-02-23 19:59:25 +01:00
mats@mysql.com
6ad51ffb3c Bug#8412: Merge from 4.0 2005-02-23 19:58:54 +01:00
timour@mysql.com
cb44ad44e3 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
timour@mysql.com
5d534812d5 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.
2005-02-23 20:49:47 +02:00
mats@mysql.com
a4cdb93b38 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
serg@serg.mylan
9c9d1fd406 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-23 19:20:17 +01:00
guilhem@mysql.com
69fb5af28a mysqlbinlog: safety measures (safe setting for completion_type,
auto-end-rollback in case crashed binlog) which cannot hurt.
2005-02-23 19:18:14 +01:00
guilhem@mysql.com
66daa0d2bd 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
guilhem@mysql.com
99f0d74688 Merge mysql.com:/home/mysql_src/mysql-4.1-clean
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-02-23 18:52:15 +01:00