mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-03 09:43:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20567 commits 2854 branches 349 tags 1.7 GiB
Commit graph

20567 commits

Author SHA1 Message Date
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
serg@serg.mylan
383c6e312a don't log BEGIN in auto-commit mode 
correct end_log_pos for Xid_log_event
 2005-02-23 18:26:49 +01:00
bell@52.0.168.192.in-addr.arpa
25e87cd6f7 Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
 2005-02-23 19:22:52 +02:00
jani@ua141d10.elisa.omakaista.fi
d5f573713a 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
gluh@gluh.mysql.r18.ru
c6f1e9627a Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-02-23 20:22:51 +03:00
guilhem@mysql.com
772b1cedcd 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
gluh@gluh.mysql.r18.ru
fc9c20995f Fix for bug : SHOW ERRORS doesn't 2005-02-23 20:18:21 +03:00
jani@ua141d10.elisa.omakaista.fi
6e9b26e8b7 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
bell@52.0.168.192.in-addr.arpa
9d23922eb6 Post review changes 2005-02-23 18:51:10 +02:00
guilhem@mysql.com
086c2a915a 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.
 2005-02-23 17:38:51 +01:00
mskold@mysql.com
9e1b72d03d 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-23 17:20:01 +01:00
mskold@mysql.com
e0dbdca79e ha_ndbcluster.cc: 
Fixed faulty debug printout
ndb_condition_pushdown.test, ndb_condition_pushdown.result:
  Added BINARY and VARBINARY tests
 2005-02-23 17:18:06 +01:00
tomas@poseidon.ndb.mysql.com
bed049b061 added testcase for events where a "shadow table" is created 2005-02-23 16:57:07 +01:00
gluh@gluh.mysql.r18.ru
907c7af3ce Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-02-23 18:47:00 +03:00
gluh@gluh.mysql.r18.ru
2b5ee94a33 Fix for bug#6317: string function CHAR, parameter is NULL, wrong result 2005-02-23 18:15:45 +03:00
mskold@mysql.com
364492239b 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-23 15:54:22 +01:00
mskold@mysql.com
fcc37a0787 Fixes for condition pushdown to storage engine based on comments from code review 2005-02-23 15:51:26 +01:00