mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41545 commits 2778 branches 343 tags 1.6 GiB
Commit graph

41545 commits

This branch
This branch
All branches
Author SHA1 Message Date
skozlov/ksm@mysql.com/virtop.localdomain
1f10aa10d9 fix for commit 1.2368 2006-12-18 12:52:59 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
4843e335fc fix for commit 1.2368 2006-12-18 09:46:44 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
5b7c2c91c1 WL#2862 2006-12-17 23:08:04 +03:00
df@kahlann.erinye.com
6a0ce67209 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-15 22:57:40 +01:00
df@kahlann.erinye.com
905d9e848c also include data files for varbinary test in binary distribution 2006-12-15 17:57:31 +01:00
df@kahlann.erinye.com
0cce240581 minor fixup 2006-12-15 17:45:17 +01:00
jonas@perch.ndb.mysql.com
6ffda53e88 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-12-15 17:24:15 +01:00
jonas@perch.ndb.mysql.com
e67d2a07ef 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
 2006-12-15 17:17:29 +01:00
jonas@perch.ndb.mysql.com
ec4030cf71 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-15 17:14:41 +01:00
jonas@perch.ndb.mysql.com
2e37545419 merge fix 2006-12-15 17:12:41 +01:00
jonas@perch.ndb.mysql.com
e8e875ca33 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-15 16:57:43 +01:00
patg@radha.patg.net
2301aff234 WL #3031 
Yet another test result that needed to be regenerated due to new error
messages. This test only runs via ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row rpl_extraCol_innodb
 2006-12-15 09:42:41 -05:00
jonas@perch.ndb.mysql.com
b4d323c09a ndb - bug#25059 
incorrect handling of commit/ignore error in unique index code
 2006-12-15 15:39:45 +01:00
jonas@perch.ndb.mysql.com
5b16e6bf95 ndb - bug#25090 
add testcase
 2006-12-15 13:31:31 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
1d6ff3a203 Raise version number after cloning 5.0.32 2006-12-15 13:18:16 +01:00
jonas@perch.ndb.mysql.com
c9fe45e12a ndb - bug#25090 
make sure apicon timer is reset when setting CS_CONNECTED
 2006-12-15 12:37:55 +01:00
mskold/marty@linux.site
8753c50e37 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-15 09:59:26 +01:00
df@kahlann.erinye.com
c4676b699a 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-15 09:28:40 +01:00
df@kahlann.erinye.com
911435414a 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-15 09:27:23 +01:00
mskold/marty@linux.site
10f8e9fbb8 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-12-15 09:06:15 +01:00
mskold/marty@mysql.com/linux.site
532fe009b8 bug#19956 Problems with VARCHAR primary key and BLOB fields:added test case 2006-12-15 09:03:21 +01:00
joerg@trift2.
9b8c7ffc19 Merge trift2.:/MySQL/M41/spec-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-12-14 22:57:33 +01:00
joerg@trift2.
daba0ecbdc Merge trift2.:/MySQL/M50/spec-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-12-14 22:52:38 +01:00
joerg@trift2.
436aa807fb Merge trift2.:/MySQL/M50/spec-5.0 
into  trift2.:/MySQL/M51/spec-5.1
 2006-12-14 22:45:06 +01:00
joerg@trift2.
a62051b77c support-files/mysql.spec.sh 
The "mysqlmanager" man page got moved from section 1 to 8.
 2006-12-14 22:41:26 +01:00
joerg@trift2.
8bdcf736bb Merge trift2.:/MySQL/M41/spec-4.1 
into  trift2.:/MySQL/M50/spec-5.0
 2006-12-14 22:37:13 +01:00
joerg@trift2.
5582d60177 support-files/mysql.spec.sh 
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
 2006-12-14 22:30:32 +01:00
mskold/marty@mysql.com/linux.site
856b919986 bug#19956 Problems with VARCHAR primary key and BLOB fields:put back removed error handling for HA_ERR_KEY_NOT_FOUND 2006-12-14 16:52:50 +01:00
mskold/marty@linux.site
db8329151f Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-14 16:42:24 +01:00
mskold/marty@linux.site
8f5f4d38a6 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-12-14 16:31:38 +01:00
mskold/marty@mysql.com/linux.site
8d8d063f91 Removed check for impossible error return 2006-12-14 16:27:14 +01:00
patg@radha.patg.net
860c27db19 BUG #25074 
mysql_upgrade test gives inconsitent results
 2006-12-14 10:07:17 -05:00
df@kahlann.erinye.com
02d6bcaae0 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-14 13:32:27 +01:00
df@kahlann.erinye.com
0231b019cd 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-14 13:31:11 +01:00
df@kahlann.erinye.com
9497df0b86 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2006-12-14 09:34:24 +01:00
df@kahlann.erinye.com
95564bfea3 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-14 09:33:27 +01:00
df@kahlann.erinye.com
e0f9996e3d Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-14 09:31:51 +01:00
msvensson@neptunus.(none)
2dbdd8ba58 Remove old hack to avoid reception of SUB_DATA signals to destroyed Ndb object 2006-12-13 21:04:10 +01:00
svoj@mysql.com/april.(none)
a708a3b5a6 After merge fix. 2006-12-13 19:20:34 +04:00
svoj@april.(none)
35e7dea871 Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.1-engines
 2006-12-13 17:32:40 +04:00
svoj@mysql.com/april.(none)
db88cf3df7 Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines
 2006-12-13 16:29:33 +04:00
svoj@mysql.com/april.(none)
f92ae8d6c1 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines
 2006-12-13 15:53:37 +04:00
patg@radha.local
cd32c0b948 WL# 3031 
Found that the results from select had to be fixed too.
 2006-12-12 19:39:45 -05:00
patg@radha.local
6ba9115e90 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  radha.local:/Users/patg/mysql-build/mysql-5.1-arch-clean
 2006-12-12 19:29:29 -05:00
patg@radha.local
45d734dba7 WL #3031 
changed to test verbiage to test PB on 5.1 arch tree
 2006-12-12 19:12:30 -05:00
malff/marcsql@weblab.(none)
c55862698e Merge cleanup 2006-12-12 16:42:35 -07:00
patg@radha.local
69e774f522 WL #3031 
Trying again (!) to commit the fix containing replace-result to fix the problem
with hard-coded ports in the result file of the federated_server test.
 2006-12-12 17:23:11 -05:00
malff/marcsql@weblab.(none)
f22dad8bd7 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-merge2
 2006-12-12 13:50:55 -07:00
kostja@bodhi.local
b893d347a1 Post-merge fixes. 2006-12-12 23:22:46 +03:00
patg@radha.myhome.westell.com
0cab9beb75 WL# 3031 
Added --replace-result to avoid hard-coding of port
 2006-12-12 13:18:49 -05:00