mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41276 commits 2784 branches 343 tags 1.6 GiB
Commit graph

41276 commits

This branch
This branch
All branches
Author SHA1 Message Date
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
kent@kent-amd64.(none)
3368730535 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:07:31 +01: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
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
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
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
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
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
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
joerg/mysqldev@bk-internal.mysql.com
a420981f74 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-build
 2006-12-20 22:29:03 +01:00
patg@radha.patg.net
b2008230ef WL #3031 
fixing pushbuild warnings and errors
 2006-12-20 13:40:58 -05:00
joerg@trift2.
7f0cb242bc Merge trift2.:/MySQL/M50/upward-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-12-20 19:24:04 +01:00
joerg@trift2.
d9ff6ef3fa Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M50/clone-5.0
 2006-12-20 11:17:31 +01:00
joerg@trift2.
90fc044fc2 Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415). 2006-12-20 11:13:16 +01:00
joerg@trift2.
c9572a10c4 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release 
into  trift2.:/MySQL/M50/clone-5.0
 2006-12-20 10:58:16 +01:00
joerg@trift2.
eb7dfa032c Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-12-20 10:56:43 +01:00
joerg@trift2.
f9802fd47d Disable test "im_deamon_life_cycle", Bug#24425, see note: [19 Dec 23:17] Trudy Pelzer 2006-12-20 10:54:41 +01:00
df@kahlann.erinye.com
dc33e0f49d Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-24896 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
 2006-12-20 10:40:05 +01:00
df@kahlann.erinye.com
e55331b4ed Merge dev:my/build-200612151202-5.0.32/mysql-5.0-release 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
 2006-12-20 09:44:47 +01:00
tsmith/tim@siva.hindu.god
945756e484 Merge siva.hindu.god:/usr/home/tim/m/bk/50-release 
into  siva.hindu.god:/usr/home/tim/m/bk/50-build
 2006-12-19 20:23:34 -07:00
tsmith/tim@siva.hindu.god
7c82a06dcf Remove warnings by casting 2006-12-19 20:17:33 -07:00
tsmith/tim@siva.hindu.god
73932df7d0 Merge siva.hindu.god:/usr/home/tim/m/bk/50-release 
into  siva.hindu.god:/usr/home/tim/m/bk/50-build
 2006-12-19 17:46:28 -07:00
tsmith/tim@siva.hindu.god
84a0873d05 Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200 
into  siva.hindu.god:/usr/home/tim/m/bk/50-release
 2006-12-19 17:43:56 -07:00
tsmith/tim@siva.hindu.god
6cbfc343a8 Alternative decimal2double implementation using an algorithm 
more similar to my_strtod() (and maybe even a bit faster due
to less floating point divisions).

This should at least partially fix Bug #23260 for DECIMALs
with a moderate number of total digits.
 2006-12-19 17:42:26 -07:00
tsmith/tim@siva.hindu.god
0d5dc51438 Added innodb_rollback_on_timeout option to restore the 4.1 
InnoDB timeout behavior (Bug #24200)
 2006-12-19 16:57:51 -07:00
tsmith/tim@siva.hindu.god
2bc45899c0 Bug #24947: REPEAT function returns NULL when passed a field as the count parameter 
Handling of large signed/unsigned values was not consistent, so some string functions could return bogus results.
The current fix is to simply patch up the val_str() methods for those string items.
It would be good clean this code up in general, to make similar problems much harder to make.  This is left as an exercise for the reader.
 2006-12-19 15:54:12 -07:00
df@kahlann.erinye.com
98e52bd61f Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
 2006-12-19 15:32:41 +01:00
df@kahlann.erinye.com
cf1fd5427c Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-19 15:31:10 +01:00
df@kahlann.erinye.com
6b27694ac8 remove hard-coded socket paths from some tests 2006-12-19 15:10:15 +01:00
patg@radha.patg.net
9fa4590c67 WL# 3031 
The final testcase needing new error codes. Really.
 2006-12-19 08:02:55 -05:00
dfischer/mysqldev@mysql.com/production.mysql.com
3cc1a4251a Merge mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into  mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release
 2006-12-19 11:48:08 +01:00
patg@radha.patg.net
62ee86dbfd Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-clean
 2006-12-18 21:08:39 -05:00
trudy@linux.site
6e258403c5 Updated file to use doxygen commenting style. 2006-12-18 18:08:38 -08:00
tsmith/tim@siva.hindu.god
2145103ac4 Merge siva.hindu.god:/usr/home/tim/m/bk/50-release 
into  siva.hindu.god:/usr/home/tim/m/bk/50-build
 2006-12-18 18:48:52 -07:00
tsmith/tim@siva.hindu.god
d60550a4d6 This ChangeSet must be null-merged to 5.1. 
Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.

Bugs fixed:
- Bug #21468: InnoDB crash during recovery with corrupted data pages: XA bug?
- Bug #24299: Identifiers in foreign keys cannot contain U+0160, U+0360, ..., U+FF60
- Bug #24386: Performance degradation caused by instrumentation in mutex_struct
- Bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect time fields
 2006-12-18 18:41:38 -07:00
trudy@linux.site
f498540b3f Added back missing closing brace at file-end. 2006-12-18 17:16:40 -08:00
trudy@linux.site
9351d5e586 Update file to use doxygen commenting style. 2006-12-18 16:52:56 -08:00
trudy@linux.site
7b74da641f Updated file to use doxygen commenting style. 2006-12-18 14:28:15 -08:00
patg@radha.patg.net
237a9482b9 WL# 3031 
- Added more test results for hard-coded error numbers
- Fix for windows
 2006-12-18 16:39:50 -05:00
baker@bk-internal.mysql.com
b1d173f510 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-18 17:57:34 +01:00
df@kahlann.erinye.com
7d840b96fb Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2006-12-18 14:41:55 +01:00
df@kahlann.erinye.com
ad1abb3cb3 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-18 14:38:00 +01:00
df@kahlann.erinye.com
038f0051b5 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
 2006-12-18 13:49:53 +01:00
df@kahlann.erinye.com
5ad288f18b Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-18 13:44:57 +01:00
df@kahlann.erinye.com
4a98f36e59 Use a temporary directory for sockets if the socket path becomes too long. 2006-12-18 13:44:21 +01:00
df@kahlann.erinye.com
c78b3c4ee8 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-18 13:35:29 +01:00