mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43059 commits 2793 branches 343 tags 1.7 GiB
Commit graph

43059 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.mysql.com
256cb08ba9 Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:44:05 +01:00
msvensson@neptunus.(none)
6502f4300b Merge neptunus.(none):/home/msvensson/mysql/my41-nmj 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:42:40 +01:00
msvensson@pilot.mysql.com
f6d3ac52dd Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 14:32:08 +01:00
msvensson@pilot.mysql.com
61686e8556 Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 14:30:23 +01:00
msvensson@pilot.mysql.com
36207f8088 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:27:43 +01:00
msvensson@pilot.mysql.com
3f06339d7c Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:27:00 +01:00
msvensson@pilot.mysql.com
3a48e8ee27 Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 
into  pilot.mysql.com:/home/msvensson/mysql/bug24805/my51-bug24805
 2007-02-06 14:22:48 +01:00
msvensson@pilot.mysql.com
958308a5cf Bug#24805 mtr.pl can't handle test with --disable-log-bin 
- Don't give mysqld the --log-bin argument if .opt file
  contains --skip-log-bin
- Enable flush2 test
 2007-02-06 14:19:07 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
878759b218 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b23782/b23782.5.0
 2007-02-06 17:18:43 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
8222657a1c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b23782/b23782.5.1
 2007-02-06 17:16:39 +04:00
msvensson@neptunus.(none)
8c37b28c0b Bug#8983 one place that isn't strict-aliasing-safe 
- Backport fix from 5.0
 2007-02-06 14:07:40 +01:00
ramil/ram@myoffice.izhnet.ru
d5b11a5e7a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug23938/my51-bug23938
 2007-02-06 17:06:19 +04:00
msvensson@neptunus.(none)
72fbdf2933 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-06 13:55:07 +01:00
hhunger@hh-nb.hungers
e6055e21f5 copy from test-extra-5.1 to main tree 2007-02-06 13:35:54 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
61ec25116e Merge mysql.com:/home/ram/work/b23782/b23782.5.0 
into  mysql.com:/home/ram/work/b23782/b23782.5.1
 2007-02-06 15:59:37 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
85f2f924fd Fix for bug #23782: Stored procedures: crash if variable in procedure 
analyse

We have to call fix_fields() for procedure analyse' arguments as they may   
not be
fixed in some circumstances.

(as the crash appears when mysqld starts skipping binlog, a test case
will be added when we can --skip-bin-log in -master.opt)
 2007-02-06 15:58:40 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d69e5063b2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
 2007-02-06 14:58:07 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a4bbd5bf76 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
 2007-02-06 14:28:46 +04:00
ramil/ram@myoffice.izhnet.ru
6fea92a146 Merge mysql.com:/usr/home/ram/work/bug23938/my50-bug23938 
into  mysql.com:/usr/home/ram/work/bug23938/my51-bug23938
 2007-02-06 14:20:46 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f103fde258 Merge mysql.com:/usr/home/ram/work/bug23938/my41-bug23938 
into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
 2007-02-06 13:57:20 +04:00
gkodinov/kgeorge@macbook.gmz
5092f7ab26 Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison 
Ignoring error codes from type conversion allows default (wrong) values to
 go unnoticed in the formation of index search conditions.
 Fixed by correctly checking for conversion errors.
 2007-02-06 11:08:57 +02:00
tomas@poseidon.mysql.com
78a208fb15 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-06 15:02:48 +07:00
tomas@poseidon.mysql.com
6765e30aa0 ndb: only inject events (ACTIVE, NODE_FAILURE, CLUSTER_FAILURE) if bit shows connected 2007-02-06 15:01:24 +07:00
tomas@poseidon.mysql.com
3fc4f75ec7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-06 15:00:19 +07:00
tomas@poseidon.mysql.com
54bd795f12 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-06 12:45:42 +07:00
tomas@poseidon.mysql.com
bbe3008a49 Bug #26021 - ndb: valgrind warning handle_trailing_share/ndbcluster_free_share invalid read 2007-02-06 12:40:26 +07:00
tomas@poseidon.mysql.com
a8f0edea67 ndb: remove WAITFOR_RESPONSE_TIMEOUT printout 
- to get cleaner error log in debug mode
 2007-02-06 11:57:56 +07:00
jonas@perch.ndb.mysql.com
9364181baf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-05 21:50:39 +01:00
jonas@eel.(none)
3edab3e4c8 ndb - some more hugo abort option fix 2007-02-05 21:38:16 +01:00
jonas@eel.(none)
35bfea9466 ndb - 
Add abort option to lots of Hugo code, 
as it assumes it and default value has changed
 2007-02-05 20:28:11 +01:00
jonas@eel.(none)
8619dfc222 ndb - bug#25801 
- improve error message if starting wo/ enough REDO
  - decrease likelyhood of trying to start too early
 2007-02-05 19:47:19 +01:00
tomas@poseidon.mysql.com
77ee8eab9c Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-06 00:10:56 +07:00
tomas@poseidon.mysql.com
addb495339 Bug #26021 valgrind warning handle_trailing_share/ndbcluster_free_share invalid read 
- revert bugfix, needs more work
 2007-02-06 00:09:45 +07:00
tomas@poseidon.mysql.com
8d3ba4105f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-06 00:07:39 +07:00
kroki/tomash@moonlight.home
5dc4f103ae Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug25897 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1
 2007-02-05 18:29:36 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
1dd93dda08 Test and bug fixes and removed unneccessary files. 2007-02-05 17:09:44 +02:00
svoj@june.mysql.com
4a6770e06e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-02-05 15:31:20 +04:00
knielsen@ymer.(none)
cb9e8bcad8 Fix false Valgrind warning. 
On some compiler/platform combination, an assignment of form *p= *p
would map to a memcpy() call, and Valgrind flags this as an overlapped
memcpy() error.

Fix by prefixing *p= *q with if(p!=q) when building for Valgrind
(HAVE_purify).
 2007-02-05 10:50:08 +01:00
tomas@poseidon.mysql.com
771c979514 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-05 13:22:33 +07:00
tomas@poseidon.mysql.com
475da34697 Bug #26021 - valgrind reports error regarding handle_trailing_share and client thread share usage 
- add ndb_share connect_count to decide if share can be reused to setup replication
 2007-02-05 13:21:18 +07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
64a728ce0c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug10798/my41-bug10798
 2007-02-05 10:20:47 +04:00
ramil/ram@myoffice.izhnet.ru
9e36baa952 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug10798/my51-bug10798
 2007-02-05 10:17:51 +04:00
tomas@poseidon.mysql.com
68e0fd6735 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-05 13:10:24 +07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
47ae650a57 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
 2007-02-05 10:09:31 +04:00
ramil/ram@myoffice.izhnet.ru
0974b9fa11 Merge mysql.com:/usr/home/ram/work/bug10798/my50-bug10798 
into  mysql.com:/usr/home/ram/work/bug10798/my51-bug10798
 2007-02-05 09:56:30 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b0977714a8 Merge mysql.com:/usr/home/ram/work/bug10798/my41-bug10798 
into  mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
 2007-02-05 09:54:23 +04:00
tomas@poseidon.mysql.com
aad58e2613 corrected merge error 2007-02-05 12:51:45 +07:00
tomas@poseidon.mysql.com
3c265e5944 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-05 12:19:24 +07:00
tomas@poseidon.mysql.com
b3fa3c8d62 Bug #26019 - valgrind warning ndbcluster_log_schema_op/safe_mutex_lock invalid read 
protect the setting of ndb_schema_share = NULL with a mutex
 2007-02-05 12:04:36 +07:00
baker@bk-internal.mysql.com
a602d4a56e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-02-05 00:31:36 +01:00