mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-23 01:19:30 +02:00
Code Issues Projects Releases Packages Wiki Activity
47584 commits 3189 branches 363 tags 1.7 GiB
Commit graph

47584 commits

Author SHA1 Message Date
df@pippilotta.erinye.com
9dc622e540 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
 2007-06-13 15:13:54 +02:00
df@pippilotta.erinye.com
fb3a572ff8 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-06-13 15:13:08 +02:00
df@pippilotta.erinye.com
1eae867a4f Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-13 15:11:58 +02:00
df@pippilotta.erinye.com
e84571f742 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-06-13 15:10:45 +02:00
df@pippilotta.erinye.com
a98dca4c87 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-13 15:09:49 +02:00
joerg@trift2.
b3917e94fa Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-13 15:04:21 +02:00
joerg@trift2.
a4494a1b81 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-13 14:57:31 +02:00
stewart@flamingspork.com[stewart]
23eb8698dc [PATCH] BUG#29063 mgmapi: connect timeout set incorrectly 
correctly divide timeout by 1000 to convert to seconds for SocketClient

Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================
 2007-06-13 22:54:14 +10:00
stewart@flamingspork.com[stewart]
17fc7a8161 [PATCH] BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly 
Add test to testMgm for Connect timeout. add to autotest.

Index: ndb-work/storage/ndb/test/ndbapi/testMgm.cpp
===================================================================
 2007-06-13 22:54:00 +10:00
joerg@trift2.
f004ab37ef Merge trift2.:/MySQL/M50/merge-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-13 14:52:45 +02:00
joerg@trift2.
4d8632f2e0 Merge trift2.:/MySQL/M51/merge-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-13 14:43:57 +02:00
joerg@trift2.
536ea333d8 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-13 14:36:18 +02:00
df@pippilotta.erinye.com
5ce49c284f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-13 14:24:31 +02:00
joerg@trift2.
4ed489d66b Merge trift2.:/MySQL/M50/merge-5.0 
into  trift2.:/MySQL/M51/merge-5.1
 2007-06-13 14:23:09 +02:00
joerg@trift2.
36adff6d0d Merge trift2.:/MySQL/M41/tmp-4.1 
into  trift2.:/MySQL/M50/merge-5.0
 2007-06-13 13:55:42 +02:00
joerg@trift2.
a4a2c7202c Merge trift2.:/MySQL/M41/tmp-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-13 13:35:04 +02:00
joerg@trift2.
018a5d403b sql/item_func.cc 
Improved check for thread identity in the "embedded" case,
    provided by Monty.
    
    This finishes the fixes for bug#27078.
 2007-06-13 13:33:00 +02:00
df@pippilotta.erinye.com
6de0de60cf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-13 13:19:43 +02:00
df@pippilotta.erinye.com
750b37a888 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-13 13:17:29 +02:00
df@pippilotta.erinye.com
d32bdf767e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-13 13:16:18 +02:00
df@pippilotta.erinye.com
8b47143e27 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-06-13 13:04:33 +02:00
df@pippilotta.erinye.com
7b7dda69de Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-06-13 13:02:17 +02:00
df@pippilotta.erinye.com
51672e9598 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
 2007-06-13 12:58:56 +02:00
df@pippilotta.erinye.com
d735865d0c Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-13 12:56:43 +02:00
df@pippilotta.erinye.com
fcb2c8817a Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-13 12:54:02 +02:00
df@pippilotta.erinye.com
6558e01153 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-13 12:42:08 +02:00
df@pippilotta.erinye.com
8780879044 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-13 12:38:05 +02:00
df@pippilotta.erinye.com
7ed3a78331 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-13 12:37:10 +02:00
df@pippilotta.erinye.com
f5d6c2906d Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-13 12:35:13 +02:00
df@pippilotta.erinye.com
c379f6d99c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit
 2007-06-13 12:04:05 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
3587614be7 after-merge fix. 2007-06-13 14:59:31 +05:00
df@pippilotta.erinye.com
4f9c468eb9 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
 2007-06-13 11:54:28 +02:00
df@pippilotta.erinye.com
36ea2e3091 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
 2007-06-13 11:48:07 +02:00
df@pippilotta.erinye.com
320ec82616 BK changes for 
https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally
 2007-06-13 11:44:58 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
87e7709fae Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28748/b28748.5.0
 2007-06-13 14:21:44 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
722f9305e0 Merge mysql.com:/home/ram/work/b28748/b28748.5.0 
into  mysql.com:/home/ram/work/b28748/b28748.5.1
 2007-06-13 14:16:39 +05:00
jmiller/ndbdev@ndb08.mysql.com
bbb9054c49 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/data2/mysql-5.1-maint
 2007-06-13 05:53:37 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
af62cf8072 Updated patch for Bug#28497 based off of Magnus's review 2007-06-13 05:52:43 +02:00
antony@ppcg5.local
3bb1769bc0 Bug#25800 
"Embedded server requires mysql.plugin"
  Embedded builds should not print any error when the mysql.plugin
  table does not exist. This is achieved by checking for the existance
  of the mysql.plugin table before attempting to open it and proceed
  silently if it does not exist.
 2007-06-12 19:28:05 -07:00
kent@mysql.com/kent-amd64.(none)
affeddbd8f make_win_bin_dist: 
Aligned headers to include with Unix 'make install'
 2007-06-12 19:49:02 +02:00
gkodinov/kgeorge@magare.gmz
72f395a559 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27816-5.1-opt
 2007-06-12 19:24:48 +03:00
gkodinov/kgeorge@magare.gmz
0d6bae220e Merge bk-internal:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
 2007-06-12 18:42:43 +03:00
gkodinov/kgeorge@magare.gmz
eb1fb60975 5.0-opt -> 5.1-opt merge 2007-06-12 18:41:56 +03:00
cmiller@zippy.cornsilk.net
da33797903 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
 2007-06-12 10:33:39 -04:00
cmiller@zippy.cornsilk.net
5ee2d957cb Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-06-12 10:33:22 -04:00
gkodinov/kgeorge@magare.gmz
fbefe9d552 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
 2007-06-12 16:34:54 +03:00
holyfoot/hf@hfmain.(none)
79f0900f9a Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28757/my51-28757
 2007-06-12 18:33:49 +05:00
cmiller@zippy.cornsilk.net
10e6bf0f3f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-06-12 08:56:00 -04:00
holyfoot/hf@mysql.com/hfmain.(none)
7093310760 Bug Test program / embedded server crash in test "unsafe_binlog_innodb" 
the reported test failure is fixed by the patch to 28333,
but there's a bit more to fix in the test itself - to
drop tables created in this test at the test's beginning.
 2007-06-12 17:53:16 +05:00
cmiller@zippy.cornsilk.net
33c59b5d02 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
 2007-06-12 08:48:30 -04:00