mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28822 commits 2781 branches 343 tags 1.6 GiB
Commit graph

28822 commits

This branch
This branch
All branches
Author SHA1 Message Date
holyfoot@deer.(none)
55e7f4503e bug #15521 (Cannot reorganise a partition with a new name equal to the old name) 2005-12-15 15:24:35 +04:00
jonas@perch.ndb.mysql.com
ae66c0b6d1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-14 11:10:56 +01:00
jonas@perch.ndb.mysql.com
4454e7a631 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-14 11:06:40 +01:00
jonas@perch.ndb.mysql.com
1864165ff3 bug#15682 - ndb - invalid handling of varchar in position/rnd_pos 2005-12-14 10:57:09 +01:00
aivanov@mysql.com
645805385d Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92 
into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss92
 2005-12-13 23:56:22 +03:00
aivanov@mysql.com
11073be8d0 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92
 2005-12-13 22:29:36 +03:00
aivanov@mysql.com
2e499986aa Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for 
table' lockup".
 Changes from the innodb-5.0-ss92 snapshot.
 Do not call os_file_create_tmpfile() at runtime. Instead, create
 all tempfiles at startup and guard access to them with mutexes.
 2005-12-13 21:35:24 +03:00
jonas@perch.ndb.mysql.com
7db9b21297 ndb - merge fix 2005-12-13 19:21:02 +01:00
jonas@perch.ndb.mysql.com
530e22edbf Bug#15675 - ndb - fix read_multi_range.test drop all tables it using 
NOTE: only changes to test script
 2005-12-13 17:33:19 +01:00
aivanov@mysql.com
594eb6cf6c Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
 2005-12-13 17:38:40 +03:00
jonas@perch.ndb.mysql.com
86ff121759 ndb - merge error 
note bug#15629 has been fixed in release clone (sp on 64 bit platform), but not merged here yet
 2005-12-13 14:41:28 +01:00
aivanov@mysql.com
ba09e4c004 Null-merge from 4.1 2005-12-13 16:29:31 +03:00
aivanov@mysql.com
d1d161ec2c Merge mysql.com:/home/alexi/mysql-4.1 
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
Null merge
 2005-12-13 16:12:56 +03:00
jonas@perch.ndb.mysql.com
eae7c39a5c Update ndb version in configure.in 2005-12-13 12:12:41 +01:00
jonas@perch.ndb.mysql.com
1ef416199a Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-13 12:07:36 +01:00
jonas@perch.ndb.mysql.com
522ba61027 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-12-13 11:58:46 +01:00
jonas@perch.ndb.mysql.com
57360b6b0d Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2005-12-13 11:54:42 +01:00
jimw@mysql.com
e36df26e5b Fix sp.result after merge 2005-12-12 14:53:47 -08:00
rparranovo@mysql.com
5775ad80e9 Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/novo/MySQL/mysql-5.0
 2005-12-12 17:32:10 -03:00
rparranovo@mysql.com
ea54b05897 mysql.spec.sh: 
* made the following changes for the generic 5.0 RPM spec file
  - Added zlib to the list of (static) libraries installed
  - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
  - Compile MySQL with bundled zlib
  - Fixed %packager name to "MySQL Production Engineering Team"
 2005-12-12 17:29:02 -03:00
jimw@mysql.com
00d29cd259 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-12 11:57:07 -08:00
aivanov@mysql.com
75af3821d7 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11
 2005-12-12 22:46:49 +03:00
jimw@mysql.com
90befc0a0e Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-12 11:39:33 -08:00
paul@snake-hub.snake.net
3a9c099ba3 Merge snake-hub.snake.net:/tmp/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2005-12-12 12:17:56 -06:00
paul@snake-hub.snake.net
c708d9140f mysqltest.c: 
Put options in proper order.
 2005-12-12 12:15:25 -06:00
jimw@mysql.com
e18679c7ff Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-12 10:11:56 -08:00
joerg@mysql.com
2a3d35fa02 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-12-12 19:11:21 +01:00
aivanov@mysql.com
7ae2d46903 Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for 
table' lockup".
 Changes from the innodb-4.1-ss11 snapshot.
 Do not call os_file-create_tmpfile() at runtime. Instead, create
 a tempfile at startup and guard access to it with a mutex.
 Also, fix bugs:
 10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
 13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
 KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
 datatypes between foreign key references are compatible.
 Also, added test cases (also for bug 9802).
 2005-12-12 21:06:59 +03:00
joerg@mysql.com
a86cb213f2 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/bug12429 2005-12-12 19:04:47 +01:00
joerg@mysql.com
36655f9a1e Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/bug12429 2005-12-12 18:54:35 +01:00
joerg@mysql.com
c256d035dd Merge mysql.com:/M50/bug12429 into mysql.com:/M51/merge-5.1 2005-12-12 18:50:00 +01:00
joerg@mysql.com
62d726582e rpl_until.test + rpl_until.result Fix (completion) for bug#12429 
Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
 2005-12-12 18:00:37 +01:00
joerg@mysql.com
8dfe471426 rpl_until.test + rpl_until.result 
Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.

Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com
 2005-12-12 17:51:56 +01:00
jonas@perch.ndb.mysql.com
6f7ca617f5 ndb - bug#15685 
Error in abort handling in TC when timeout during abort
 2005-12-12 17:19:04 +01:00
kent@mysql.com
bbf65edaa9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-12-12 16:17:58 +01:00
kent@mysql.com
a6849a9238 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-12-12 16:12:36 +01:00
kent@mysql.com
ab882e0b5f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-12-12 15:49:41 +01:00
msvensson@neptunus.(none)
f356bf5615 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-12-12 15:48:34 +01:00
msvensson@neptunus.(none)
0705a2b1ca Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-12-12 15:22:25 +01:00
msvensson@neptunus.(none)
e0142f908e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/bug9535/my51-bug9535
 2005-12-12 15:19:14 +01:00
dlenev@mysql.com
5ff3e4ec57 Merge mysql.com:/home/dlenev/src/mysql-5.0-merges 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2005-12-12 14:59:14 +03:00
kent@mysql.com
51443fe422 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-12-12 12:30:18 +01:00
anozdrin@mysql.com
de84d76299 Merge WL#2984 2005-12-12 13:29:48 +03:00
aivanov@mysql.com
c34595c975 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-14614
 2005-12-12 13:16:06 +03:00
igor@rurik.mysql.com
ede2e0d254 item_sum.h, item.cc: 
Post review corrections in comments.
 2005-12-11 22:21:19 -08:00
aivanov@mysql.com
a61b810508 Fixed BUG #14614: Replication of tables with trigger generates 
error message if database is changed.
 2005-12-11 17:06:36 +03:00
kent@mysql.com
cf57f12407 make_win_src_distribution.sh: 
Removed Visual Studio 6 project files, as they are not maintained
 2005-12-11 09:21:13 +01:00
igor@rurik.mysql.com
ad53d72033 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-12-10 23:31:03 -08:00
jonas@perch.ndb.mysql.com
17e8f6ca63 bug#15632 - ndb 
Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes
 2005-12-09 13:51:12 +01:00
anozdrin@mysql.com
5d105fb7e7 Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 
into  mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge
 2005-12-09 15:14:19 +03:00