mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41398 commits 2793 branches 343 tags 1.7 GiB
Commit graph

41398 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
msvensson@neptunus.(none)
5ccd3608d5 When running with --valgrind and --debug send all the output from 
mysqld and valgrind to tracefile.
 2006-12-20 16:54:37 +01:00
msvensson@neptunus.(none)
be0368c230 Add possibility to activate --mark-progress of mysqltest 2006-12-20 16:53:06 +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
mtaylor@qualinost.(none)
ad0d802530 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2006-12-19 12:28:09 -08:00
mtaylor@qualinost.(none)
66d984cf52 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
 2006-12-19 12:20:29 -08: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
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
kaa@polly.local
d3f5fff400 Merge polly.local:/tmp/maint/bug24117/my51-bug24117 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-12-19 12:28:30 +03:00
kaa@polly.local
c637ffec56 Merge polly.local:/tmp/maint/bug24117/my50-bug24117 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-12-19 12:24:44 +03:00
kaa@polly.local
221be0084e Added copy_typelib() declaration to make ABI compatibility test happy 2006-12-19 12:21:41 +03:00
kaa@polly.local
84f6f1beed Merge polly.local:/tmp/maint/bug24117/my50-bug24117 
into  polly.local:/tmp/maint/bug24117/my51-bug24117
 2006-12-19 11:47:48 +03:00
kaa@polly.local
6a304f3fc1 Added copy_typelib() declaration to make ABI compatibility test happy 2006-12-19 11:21:14 +03:00
mtaylor@qualinost.(none)
92b5b1ef78 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
 2006-12-18 21:26:12 -08:00
mtaylor@qualinost.(none)
c58e3bc6f0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
 2006-12-18 21:21:50 -08:00
mtaylor@qualinost.(none)
bcebea9684 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2006-12-18 21:16:18 -08:00
mtaylor@qualinost.(none)
09591de344 Search through options to find where the slow query log actually is. 2006-12-18 21:12:01 -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