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

42975 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@poseidon.mysql.com
18d227b1b0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-14 10:18:02 +07:00
cmiller@zippy.cornsilk.net
ae27eeea58 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/tmpmerge
 2007-02-13 10:50:44 -05:00
df@kahlann.erinye.com
b22c89d36b .del-README.txt-renamed: 
Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed
 2007-02-13 16:31:24 +01:00
ndbdev@ndbmaster.mysql.com
3685960425 adopt to changes in load_defaults 2007-02-13 14:32:07 +01:00
msvensson@pilot.mysql.com
b74a067246 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-13 10:27:39 +01:00
msvensson@pilot.mysql.com
7e6e518a47 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-13 10:00:59 +01:00
msvensson@pilot.mysql.com
7dcdbdf37b Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-13 10:00:53 +01:00
msvensson@pilot.mysql.com
818cb094fc Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-13 09:56:56 +01:00
tomas@poseidon.mysql.com
294df8e709 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-13 13:18:37 +07:00
tomas@poseidon.mysql.com
7de79a2d17 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-13 13:12:54 +07:00
jonas@perch.ndb.mysql.com
fe0d7ee45d 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-13 02:56:35 +01:00
jonas@perch.ndb.mysql.com
7083110de6 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-13 02:54:51 +01:00
jonas@perch.ndb.mysql.com
fc94ac8a10 ndb - new atrt 2007-02-13 02:38:54 +01:00
kent@kent-amd64.(none)
f4ab936ff1 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1
 2007-02-12 23:37:12 +01:00
pekka@orca.ndb.mysql.com
5914074e16 Merge clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-merge 
into  clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-merge
 2007-02-12 21:13:19 +01:00
tnurnberg@mysql.com/sin.azundris.com
293352cbe4 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/tnurnberg/24660/50-24660
 2007-02-12 14:49:34 +01:00
tnurnberg@mysql.com/sin.azundris.com
8dc8e07fcf Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/home/tnurnberg/24660/41-24660
 2007-02-12 14:39:45 +01:00
tnurnberg@mysql.com/sin.azundris.com
ed82b013b8 Merge mysql.com:/home/tnurnberg/24660/41-24660 
into  mysql.com:/home/tnurnberg/24660/50-24660
 2007-02-12 14:32:06 +01:00
tnurnberg@mysql.com/sin.azundris.com
db7ac2c0c7 Bug#24660: "enum" field type definition problem 
ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales.
This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
being used. Now if 0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an error.

Any solution would have broken some sort of existing behaviour. This solution should
serve both fractions (those with 0xff and those with ',' in their enums), but
WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
That is, mysqldump with their current server, and restore when upgrading to one with
this patch.
 2007-02-12 14:31:44 +01:00
mskold/marty@linux.site
3a3cc31401 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-12 11:10:28 +01:00
mskold/marty@linux.site
e0411f937e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-12 11:01:59 +01:00
tomas@poseidon.mysql.com
98a874853d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-12 15:10:58 +07:00
mskold/marty@mysql.com/linux.site
113a84bd33 Enabled engine_condition_pushdown (on) as default 2007-02-09 21:04:43 +01:00
mskold/marty@linux.site
dc71b3f939 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-09 17:01:29 +01:00
mskold/marty@linux.site
6e418074b6 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-09 16:40:36 +01:00
mskold/marty@linux.site
d6bb9d21bf Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-09 16:33:52 +01:00
mskold/marty@mysql.com/linux.site
6ac9a28ef0 bug #26225 Engine condition pushdown doesn't work with prepare statements (ps_7ndb): ensure that query plan for prepared statement is analyzed correctly 2007-02-09 16:31:12 +01:00
tomas@poseidon.mysql.com
9545bef37d Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-09 20:31:52 +07:00
lzhou/zhl@dev3-63.(none)
088b3855a9 BUG#22025 Return correct error message when transporter error occur. 2007-02-09 13:31:51 +00:00
joerg@trift2.
7a87a3c416 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-02-09 12:53:53 +01:00
joerg@trift2.
f6a4f27c97 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-02-09 12:32:26 +01:00
jbruehe@bk-internal.mysql.com
9c77c4d119 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-build
 2007-02-09 12:23:43 +01:00
joerg@trift2.
e8669853b9 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-02-09 12:08:41 +01:00
kent@mysql.com/kent-amd64.(none)
3bb1114647 make_binary_distribution.sh: 
Copy "ndb_size.tmpl" into binary distribution (Bug#24191)
 2007-02-09 00:10:40 +01:00
tsmith@siva.hindu.god
498756195a Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-02-08 16:02:58 -07:00
tsmith@siva.hindu.god
4211f6d7d7 Merge siva.hindu.god:/home/tsmith/m/bk/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
 2007-02-08 16:01:45 -07:00
tsmith@siva.hindu.god
4579445b2a Merge siva.hindu.god:/home/tsmith/m/bk/41 
into  siva.hindu.god:/home/tsmith/m/bk/maint/41
 2007-02-08 16:01:13 -07:00
hhunger@hh-nb.hungers
816b8b4193 updates caused by 5.1.16 2007-02-08 10:03:17 +01:00
tomas@poseidon.mysql.com
18f63370aa Bug #24000 ndb_config.cpp has the wrong name ndb_condig.cpp in source distro 2007-02-08 13:40:05 +07:00
tomas@poseidon.mysql.com
f05a67c72b ndb: correction of "ignore error" patch 2007-02-08 01:09:38 +07:00
tomas@poseidon.mysql.com
097c8431e2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.mysql.com:/home/tomas/mysql-4.1-ndb
 2007-02-08 00:25:30 +07:00
tomas@poseidon.mysql.com
d56756de0a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-08 00:00:14 +07:00
msvensson@pilot.mysql.com
764d84852e 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-07 15:11:19 +01:00
msvensson@pilot.mysql.com
eee38feda8 Avoid problem with "noinst_HEADERS" being sucked into "mysqld_LDADD" if openssl_libs and yassl_libs are empty strings 2007-02-07 15:11:03 +01:00
joerg@trift2.
80ceb0690e Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-02-07 13:42:49 +01:00
mskold/marty@mysql.com/linux.site
77ab74831f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-02-07 12:33:36 +01:00
mskold/marty@mysql.com/linux.site
5df38bfc3e Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-02-07 12:29:34 +01:00
mskold/marty@linux.site
65c9dcc011 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-07 12:06:13 +01:00
mskold/marty@linux.site
8dd443f986 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-07 11:44:41 +01:00
mskold/marty@linux.site
fd0232b226 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-07 11:40:43 +01:00