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
31108 commits 2793 branches 343 tags 1.7 GiB
Commit graph

31108 commits

This branch
This branch
All branches
Author SHA1 Message Date
bar@mysql.com
7939a200e4 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/autopush/mysql-5.0.b10979
 2006-07-07 15:51:30 +05:00
bar@mysql.com
c86acb53fa Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b10979
 2006-07-07 12:14:12 +05:00
knielsen@ymer.(none)
31ddb04105 Merge ymer.(none):/usr/local/mysql/mysql-5.0-bug19951 
into  ymer.(none):/usr/local/mysql/tmp-5.0
 2006-07-06 23:52:05 +02:00
knielsen@ymer.(none)
5ea51287d6 BUG#19951: Race conditions in test wait_timeout. 
Fix random failures in test 'wait_timeout' that depend on exact timing.

1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.

2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.
 2006-07-06 23:49:09 +02:00
tomas@poseidon.ndb.mysql.com
73064141f6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 20:09:25 +02:00
tomas@poseidon.ndb.mysql.com
8816f98036 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 19:03:33 +02:00
tomas@poseidon.ndb.mysql.com
4199719438 Bug #20820 auto inc table not handled correctly when restored from cluster backup 2006-07-06 18:50:44 +02:00
joerg@trift2.
a873811ae8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into trift2.:/M50/merge-5.0
 2006-07-06 16:03:02 +02:00
tomas@poseidon.ndb.mysql.com
27a8cade86 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 16:03:01 +02:00
tomas@poseidon.ndb.mysql.com
e68194dcc0 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 15:23:35 +02:00
tomas@poseidon.ndb.mysql.com
9944e41f6e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-07-06 15:20:22 +02:00
tomas@poseidon.ndb.mysql.com
ec8771af69 backport of ndb DictCache fix 
- don't invalidate tables that are in state RETRIEVING
 2006-07-06 15:18:00 +02:00
jonas@perch.ndb.mysql.com
72bdce708c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-07-06 09:47:59 +02:00
jonas@perch.ndb.mysql.com
52a28cfa5b Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-07-06 09:41:25 +02:00
jonas@perch.ndb.mysql.com
f5ec695c18 ndb - revert bug fix for bug#20442 2006-07-06 09:38:18 +02:00
tomas@poseidon.ndb.mysql.com
f413bc2fe8 ndbd: added missing jamEntry(); 2006-07-05 20:24:12 +02:00
tomas@poseidon.ndb.mysql.com
aacb705613 Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails 
- updated error message to more correctly reflect the issue
 2006-07-05 20:20:39 +02:00
joerg@mysql.com
c9dc1184fd Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does). 2006-07-05 20:17:04 +02:00
tomas@poseidon.ndb.mysql.com
8b57568a5f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-05 16:40:24 +02:00
tomas@poseidon.ndb.mysql.com
a0ab5ae09f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-05 16:34:34 +02:00
tomas@poseidon.ndb.mysql.com
04ae971576 Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it. 
- remove some event code to get rid of some bugs
 2006-07-05 16:26:08 +02:00
knielsen@mysql.com
ff0041e8a6 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/knielsen/tmp-5.0
 2006-07-04 19:10:08 +02:00
jonas@mc01.ndb.mysql.com
d0146162e5 ndb - ps_7ndb as discovered by pb 
fix race in scan close
 2006-07-04 16:54:07 +02:00
knielsen@mysql.com
7892dca173 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/knielsen/tmp-5.0
 2006-07-04 14:10:53 +02:00
jonas@perch.ndb.mysql.com
795eafbce3 Merge tomas@poseidon:mysql-5.0-main 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-07-04 12:47:08 +02:00
tomas@poseidon.ndb.mysql.com
0b2024ac88 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-04 12:47:07 +02:00
knielsen@rt.int.sifira.dk
7062993817 Merge mysqldev@production:my/mysql-5.0-release 
into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.0
 2006-07-04 12:08:58 +02:00
tomas@poseidon.ndb.mysql.com
1e4ccec835 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-release
 2006-07-04 12:08:57 +02:00
tomas@poseidon.ndb.mysql.com
98874725e0 Bug #20784 Uninitialized memory in update on table with PK not on first column 
- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
 2006-07-04 11:43:06 +02:00
jonas@perch.ndb.mysql.com
5e68b4ab68 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-07-04 09:56:27 +02:00
tomas@poseidon.ndb.mysql.com
904100ee73 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-03 22:58:10 +02:00
tnurnberg@mysql.com
b3e368df19 Bug#20783: Valgrind uninitialised warning in test case ctype_uca 
Two functions have different ideas of what a string should look like;
one of them reads memory it assumes the other one may have written.
And "if you assume ..."
  
We now use a more defensive variety of the assuming function, this fixes
a warning thrown by the valgrind tool.
 2006-07-03 21:41:15 +02:00
kent@mysql.com
caa3fcf673 client.c: 
Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
 2006-07-03 20:08:38 +02:00
kent@mysql.com
4b6878e4b0 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2006-07-03 19:53:57 +02:00
kent@suse9-x86.mysql.com
7455f8a31f mwldnlm, mwccnlm, mwasmnlm: 
Use Perl for filtering, do more filtering
 2006-07-03 16:44:17 +02:00
kent@suse9-x86.mysql.com
6b08a98644 Makefile.am: 
Avoid duplicate symbol errors on Netware
mwldnlm, mwccnlm, mwasmnlm:
  Filter garbage characters from output
 2006-07-03 10:56:19 +02:00
gluh@mysql.com
d2b378d57f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
 2006-07-03 13:19:18 +05:00
kent@mysql.com
eba43438b9 mysqld.vcproj: 
Don't define __NT__ for 'Max' target
 2006-07-01 23:52:19 +02:00
konstantin@mysql.com
1c4dffc8ca Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-07-01 22:13:42 +04:00
kent@mysql.com
06b4c9abbb my_sys.h: 
Added missing parameter type change for _my_strdup_with_length()
 2006-07-01 15:11:59 +02:00
sergefp@mysql.com
775ec4fb85 Post-merge fix 2006-07-01 09:28:41 +04:00
sergefp@mysql.com
f863685241 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/psergey/mysql-5.0-bug16168-merge
 2006-07-01 07:04:27 +04:00
sergefp@mysql.com
784b3118a5 Merge mysql.com:/home/psergey/mysql-4.1-bug16168-push 
into  mysql.com:/home/psergey/mysql-5.0-bug16168-merge
 2006-07-01 01:25:59 +04:00
konstantin@mysql.com
fbeb42a9e1 Remove an unused variable. 2006-07-01 00:33:47 +04:00
konstantin@mysql.com
41fea3d763 Remove a couple of unused/barely used names. 2006-07-01 00:14:28 +04:00
joerg@mysql.com
34d5c36c2b Manual transfer of the following changeset into the 5.0.23 release clone: 
1.2525 06/06/30 18:29:27 monty@mysql.com +3 -0
   Reverted wrong bug fix (Bug#11228)
 2006-06-30 19:37:11 +02:00
monty@mysql.com
f62829636b After merge fixes 2006-06-30 20:07:33 +03:00
monty@mysql.com
2f86009c9e Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2006-06-30 19:15:18 +03:00
monty@mysql.com
445dfdc3a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-06-30 19:15:17 +03:00
tomas@poseidon.ndb.mysql.com
805551ead3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-06-30 18:15:16 +02:00