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

28979 commits

This branch
This branch
All branches
Author SHA1 Message Date
jani@a193-229-222-105.elisa-laajakaista.fi
bb6c11bf3b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-12-14 00:20:55 +02: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
evgen@moonbone.local
012933ce39 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/15268-bug-5.0-mysql
 2005-12-13 23:26:35 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
f263c2f5a5 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-12-13 21:55:58 +02: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
hartmut@mysql.com
84929a0f43 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2005-12-13 19:50:23 +01: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
jani@a193-229-222-105.elisa-laajakaista.fi
7ded800078 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-12-13 19:46:35 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
13d7abe06f Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-12-13 18:44:20 +02: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
jani@a193-229-222-105.elisa-laajakaista.fi
32466b14fb Minor Netware specific changes. 2005-12-13 18:30:10 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
2692cdb071 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-12-13 18:22:00 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e16230b3ce Increased stack size for clients on Netware. 
New libc suggests doing this.
 2005-12-13 17:53:26 +02: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
aivanov@mysql.com
124b76c5a8 Changes from the innodb-5.1-ss28 snapshot. 
Removed include/Makefile.am and the reference to it.
 Deleted db/db0err.h and db directory.
 Check index column sizes in a better way (bug 13315).
 Fixed comments for memory allocation functions and added
 some extra checks. Adapted callers.
 2005-12-13 16:49:24 +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
ramil@mysql.com
fa5f802746 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/usr/home/ram/work/mysql-5.0-release
 2005-12-13 16:49:37 +04: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
jonas@perch.ndb.mysql.com
2738871583 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-12-13 11:48:26 +01:00
jonas@perch.ndb.mysql.com
dc6220bd47 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-12-13 11:45:42 +01:00
knielsen@mysql.com
c1551bf94d BUG#15624: Use --real_sleep in rpl_deadlock.test to avoid breaking when run with --sleep. 2005-12-13 11:42:10 +01:00
ramil@mysql.com
8f1b038e72 Fix for bug#15209: MySQL installation problem on Windows ME. 2005-12-13 12:20:05 +04:00
knielsen@production.mysql.com
79eb655d66 Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
 2005-12-13 06:45:22 +01:00
kent@mysql.com
7fe1a4038c Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-12-13 00:47:11 +01:00
kent@mysql.com
9f399bbabd my_pthread.h: 
Bug#15629: Increased thread stack for all 64 bit platforms,
  else test case 'sp' and 'call fib(20)' gives stack overrun
 2005-12-13 00:45:32 +01:00
jimw@mysql.com
e36df26e5b Fix sp.result after merge 2005-12-12 14:53:47 -08:00
knielsen@production.mysql.com
4c275451ca Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
 2005-12-12 21:48:53 +01:00
rparranovo@mysql.com
acc6609bfd * made the following changes for the generic 5.1 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:45:54 -03: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
knielsen@production.mysql.com
fca8b65672 Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
 2005-12-12 20:10:39 +01: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
99cf03b295 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into mysql.com:/M50/clone-5.0
 2005-12-12 19:00:08 +01:00
joerg@mysql.com
e8c6234ffd Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into mysql.com:/M50/clone-5.0
 2005-12-12 18:57:26 +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