mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32233 commits 2774 branches 343 tags 1.6 GiB
Commit graph

32233 commits

This branch
This branch
All branches
Author SHA1 Message Date
bpontz@shasta.mysql.com
4cdb80a855 Commented out lines in disabled.def that have bug numbers that are closed 2006-03-24 09:45:44 -05:00
msvensson@neptunus.(none)
31e04d4571 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 13:55:10 +01:00
msvensson@neptunus.(none)
3dd641bd5c Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 13:50:41 +01:00
mskold@mysql.com
1c6f8158f2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-24 13:28:29 +01:00
mskold@mysql.com
aa465e5b14 Enabled test rpl_ndb_insert_ignore 2006-03-24 13:26:35 +01:00
jonas@perch.ndb.mysql.com
038287aa9d ndb autotest 
fix \ in makefile (merge error)
 2006-03-24 12:36:39 +01:00
msvensson@neptunus.(none)
ab1f95df3e Merge 192.168.0.100:mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 12:33:11 +01:00
jonas@perch.ndb.mysql.com
2a12e49dd9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-03-24 12:25:03 +01:00
msvensson@shellback.(none)
6a6d305540 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 12:02:39 +01:00
mskold@mysql.com
4a187cd64f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-24 11:59:11 +01:00
tomas@poseidon.ndb.mysql.com
a809bdf56a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-24 11:59:10 +01:00
tomas@poseidon.ndb.mysql.com
77ec5f70d1 disabled.def: 
enabled rpl_ndb_blob since a "hanging" bug was fixed
 2006-03-24 11:57:31 +01:00
jonas@perch.ndb.mysql.com
b3ee3a81a5 ndb - bug#18295 
more work-arounds for gcc4
 2006-03-24 11:35:57 +01:00
msvensson@devsrv-b.mysql.com
95d2706e32 Fix 'metaphon' function to correctly calculate the length of the returned string 2006-03-24 11:12:32 +01:00
mskold@mysql.com
a444f0a3ae Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-24 10:48:28 +01:00
mskold@mysql.com
7015003c3e Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted' 2006-03-24 10:42:55 +01:00
bar@mysql.com
7831fab08c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-24 13:32:16 +04:00
jonas@perch.ndb.mysql.com
4a22082b66 ndb - 
more compiler warnings...
 2006-03-24 10:23:50 +01:00
jonas@perch.ndb.mysql.com
31efa863dd ndb - 
still some compiler warnings
 2006-03-24 10:19:10 +01:00
jonas@perch.ndb.mysql.com
14ec452bdd Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-03-24 10:17:18 +01:00
jonas@perch.ndb.mysql.com
6c9727bf73 Merge ndbdev@ndbmaster.mysql.com:jonas/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-03-24 10:12:35 +01:00
tomas@poseidon.ndb.mysql.com
d0a3ce5da4 - corrected bug causing hang in getTable when using blob tables 
- make sure cluster/schema table is always created first
 2006-03-24 10:12:34 +01:00
bar@mysql.com
8110748117 after merge fix 2006-03-24 12:42:28 +04:00
jonas@perch.ndb.mysql.com
4164c2a0e0 ndb - bug#18295 
rewrite/clean up code a bit to avoid a gcc4 compiler bug
 2006-03-24 09:42:10 +01:00
jonas@perch.ndb.mysql.com
6a582297b6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2006-03-24 09:36:56 +01:00
jonas@perch.ndb.mysql.com
ae1bb1bd09 ndb - merge fixes 2006-03-24 08:58:40 +01:00
jonas@perch.ndb.mysql.com
34328efe03 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-03-24 07:43:55 +01:00
msvensson@shellback.(none)
0568175984 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 07:25:14 +01:00
brian@zim.(none)
8eab1ba028 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-03-23 15:04:45 -08:00
msvensson@shellback.(none)
de6b1b777c Bug#18474 Unlistable directories yield no info from information_schema, part2 
- Make the windows implementation of 'my_dir' behave like the default implementation
 2006-03-23 23:09:34 +01:00
tomas@poseidon.ndb.mysql.com
5cc1da5424 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-23 22:50:20 +01:00
tomas@poseidon.ndb.mysql.com
57198f85d6 Bug #18472 race condition between multiple mysqld's when setting up cluster/schema 
- check that event is the correct one, and only delete if wrong version
 2006-03-23 22:49:02 +01:00
mskold@mysql.com
a945c58ffe Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-23 22:39:30 +01:00
msvensson@shellback.(none)
7162b65c24 Only run in libtool if running in valgrind. 
Apparently libtool isn't properly setup on all our build hosts.
 2006-03-23 22:29:53 +01:00
msvensson@shellback.(none)
9c7279e361 Merge production:mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-23 21:49:30 +01:00
msvensson@shellback.(none)
8f1ed3c463 Dump result to .log file at test failure 2006-03-23 21:48:31 +01:00
msvensson@devsrv-b.mysql.com
1b3c22b459 Remove DBUG print that looks at args[0] even if arg_count is 0 2006-03-23 21:45:00 +01:00
msvensson@shellback.(none)
3495ba51f7 Fix type "enfif" -> "endif" 2006-03-23 20:59:23 +01:00
msvensson@shellback.(none)
948cecf477 Delete gdbinit file before writing to it 
Concat type+idx to get a unique gdbinit filename
 2006-03-23 20:05:09 +01:00
brian@zim.(none)
56844bf3b5 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-03-23 10:10:24 -08:00
msvensson@shellback.(none)
4602e426dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-23 18:58:53 +01:00
msvensson@shellback.(none)
2ef46f5ab7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-23 18:54:40 +01:00
bar@mysql.com
94814d735f ctype-utf8.c, ctype-simple.c: 
Forgot to include into the previous changeset.
 2006-03-23 21:41:29 +04:00
msvensson@shellback.(none)
b5bea5e312 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-23 18:14:02 +01:00
brian@zim.(none)
9fc9d0f282 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-03-23 08:46:26 -08:00
kent@mysql.com
9d387d1c6e Merge 2006-03-23 17:41:53 +01:00
kent@mysql.com
3c93e6efa5 config-win.h: 
If CYBOZU defined, set character sets etc
 2006-03-23 17:25:49 +01:00
bar@mysql.com
add4b40ebe Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-23 19:59:21 +04:00
msvensson@shellback.(none)
f4426c0d3d Remove unused option "verbose" 2006-03-23 16:41:29 +01:00
msvensson@shellback.(none)
8091b7b5f1 Moved "tmpdir" and 2vardor" to the documented flags and add some documentation 2006-03-23 16:39:51 +01:00