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

41653 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith/tim@siva.hindu.god
26c0934ee3 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-12-22 13:23:12 -07:00
patg@radha.patg.net
edc6cfa2c3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
 2006-12-22 12:23:24 -05:00
baker@bk-internal.mysql.com
abef375178 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-22 18:04:33 +01:00
kaa@polly.local
7245cb3d92 Merge polly.local:/tmp/maint/bug24037/my51-bug24037 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-12-22 17:33:54 +03:00
kaa@polly.local
381a79f72c Merge polly.local:/tmp/maint/bug24037/my50-bug24037 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-12-22 17:26:14 +03:00
patg@radha.patg.net
2e538b4192 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
 2006-12-22 08:57:32 -05:00
kaa@polly.local
2e68c3408e Merge polly.local:/tmp/maint/bug24037/my41-bug24037 
into  polly.local:/home/kaa/src/maint/mysql-4.1-maint
 2006-12-22 16:19:45 +03:00
kaa@polly.local
dffa5d05d7 Merge polly.local:/tmp/maint/bug24037/my50-bug24037 
into  polly.local:/tmp/maint/bug24037/my51-bug24037
 2006-12-22 16:14:57 +03:00
kaa@polly.local
581afd4ccc Merge polly.local:/tmp/maint/bug24037/my41-bug24037 
into  polly.local:/tmp/maint/bug24037/my50-bug24037
 2006-12-22 16:08:10 +03:00
msvensson@pilot.mysql.com
4563cb45f2 Add the missing file 2006-12-22 13:57:33 +01:00
msvensson@pilot.mysql.com
70b2f28f55 Wait for mysqld connected to NDB to come out of read only mode 2006-12-22 13:34:23 +01:00
kaa@polly.local
86a9ad6883 Fix for the bug #24037 "Lossy Hebrew to Unicode conversion". 
Added definitions for the following Hebrew characters as specified by the ISO/IEC 8859-8:1999:

LEFT-TO-RIGHT MARK (LRM)
RIGHT-TO-LEFT MARK (RLM)
 2006-12-22 15:30:37 +03:00
msvensson@pilot.mysql.com
c3b6f11091 Potential use of NULL pointer in 'plugin_for_each_with_mask', check pointer 
before referencing it.
 2006-12-22 12:35:06 +01:00
msvensson@pilot.mysql.com
6ead92dfe2 Merge pilot.mysql.com:/home/msvensson/mysql/my51-ndb-gca-my51-m 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2006-12-22 12:33:34 +01:00
msvensson@pilot.mysql.com
fa33971252 Potential use of NULL pointer in 'plugin_for_each_with_mask', check pointer 
before referencing it.
 2006-12-22 12:27:26 +01:00
msvensson@pilot.mysql.com
791a5cf75e Merge pilot.mysql.com:/home/msvensson/mysql/my51-ndb-gca-my51-m 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
 2006-12-22 12:14:37 +01:00
msvensson@pilot.mysql.com
eb7500f44a Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061220175325|03033 2006-12-22 12:14:12 +01:00
msvensson@pilot.mysql.com
abe43135b1 Bug#22694 "function plugin_foreach_with_mask() uses an uninitialized pointer" 
Fix uninitialized memory.
 2006-12-22 12:12:58 +01:00
msvensson@pilot.mysql.com
1f006872c8 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2006-12-22 10:20:39 +01:00
msvensson@pilot.mysql.com
0af60de724 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061215122345|24188 2006-12-22 10:20:20 +01:00
msvensson@pilot.mysql.com
8da9222853 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2006-12-22 10:00:58 +01:00
msvensson@pilot.mysql.com
b28e8faf23 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2006-12-22 10:00:12 +01:00
msvensson@pilot.mysql.com
73d82523a3 Set default number of masters to 1 2006-12-22 09:59:41 +01:00
patg@radha.patg.net
efefea6a5e WL #3031 
* Various windows errors fixed
* Increased max key length for federated
 2006-12-21 22:38:54 -05:00
tsmith/tim@siva.hindu.god
8075fc447e Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-21 18:23:14 -07:00
tsmith/tim@siva.hindu.god
f204db4dd1 Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-21 18:20:09 -07:00
tsmith/tim@siva.hindu.god
93bbb19fc1 Merge siva.hindu.god:/usr/home/tim/m/bk/g41 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-12-21 18:18:27 -07:00
msvensson@pilot.mysql.com
c862eae163 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2006-12-22 01:13:02 +01:00
msvensson@pilot.mysql.com
0af85f8516 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2006-12-22 01:12:02 +01:00
msvensson@pilot.mysql.com
a386c9d7cf Merge neptunus:mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2006-12-22 01:11:27 +01:00
msvensson@pilot.mysql.com
e1fcd181ef Merge neptunus:mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2006-12-22 00:58:32 +01:00
msvensson@pilot.mysql.com
acc5e0e3d5 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2006-12-22 00:39:08 +01:00
msvensson@pilot.mysql.com
2e744d5644 Bug #23125 [patch] trigger test fails when run as root 
- Skip tests using chmod when running as root
 2006-12-22 00:38:34 +01:00
msvensson@pilot.mysql.com
945c35eee9 Bug#24148 regression tests hang with SSL enabled 
- Don't call SSL_shutdown a second time
 2006-12-22 00:05:40 +01:00
istruewing@chilla.local
bd929199b3 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-21 19:04:31 +01:00
istruewing@chilla.local
dee46f9100 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-21 18:41:01 +01:00
msvensson@pilot.mysql.com
045a953909 Merge bk-internal:/home/bk/mysql-5.1-ndb 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
 2006-12-21 17:38:44 +01:00
istruewing@chilla.local
ea353c72a6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-21 17:13:38 +01:00
msvensson@pilot.mysql.com
fe89182899 Add call to 'thd::clean_up' before deleting THD 2006-12-21 16:43:11 +01:00
mskold/marty@linux.site
7993c76c10 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-21 16:30:07 +01:00
msvensson@pilot.mysql.com
a498886d74 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
 2006-12-21 15:12:15 +01:00
joerg@trift2.
51fcec6a20 configure.in : Update of the NDB version number was missing, do it. 2006-12-21 13:35:41 +01:00
joerg@trift2.
1341cf1827 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M51/tmp-5.1
 2006-12-21 12:18:28 +01:00
msvensson@pilot.mysql.com
a44f076061 Merge neptunus:mysql/my51-ndb-valgrind 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
 2006-12-21 12:08:39 +01:00
joerg@trift2.
2d1292ce7d Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-12-21 11:58:03 +01:00
tsmith/tim@siva.hindu.god
c2de802e9c Post-merge fix (related to bug 24200 changes) 2006-12-20 17:11:47 -07:00
msvensson@neptunus.(none)
fe0a11d194 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-20 23:59:34 +01:00
tsmith/tim@siva.hindu.god
ab4c0f3b81 Merge siva.hindu.god:/usr/home/tim/m/bk/50-build 
into  siva.hindu.god:/usr/home/tim/m/bk/51-build
 2006-12-20 15:46:36 -07:00
msvensson@neptunus.(none)
da6773f97b Count number of masters the test is actually using and only start as 
many as neeeded
 2006-12-20 23:44:53 +01:00
tsmith/tim@siva.hindu.god
aee48b346f Merge siva.hindu.god:/usr/home/tim/m/bk/50-build 
into  siva.hindu.god:/usr/home/tim/m/bk/51-build
 2006-12-20 15:12:42 -07:00