mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37727 commits 2788 branches 343 tags 1.7 GiB
Commit graph

37727 commits

This branch
This branch
All branches
Author SHA1 Message Date
mskold/marty@linux.site
04a62eb684 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-01 15:26:03 +02:00
mskold/marty@mysql.com/linux.site
8fdc781d39 Fixed ndbapi-examples, and added tests for mysql-test-run.pl 2006-09-01 15:14:50 +02:00
msvensson@neptunus.(none)
8f378e0f3a Fix problem with windows where stderr is not flushed until end of program. 2006-09-01 13:53:43 +02:00
msvensson@neptunus.(none)
4d359b80c6 Turn off reorder as default 2006-09-01 12:27:28 +02:00
evgen@moonbone.local
e1c245bff3 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 
into  moonbone.local:/work/tmp_merge-5.1-mysql
 2006-09-01 14:08:38 +04:00
msvensson@shellback.(none)
8de35293af Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-01 11:23:08 +02:00
msvensson@neptunus.(none)
206bdb8b35 Merge 192.168.0.20:mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-01 11:16:34 +02:00
msvensson@shellback.(none)
5a79f59e71 Merge shellback.(none):/home/msvensson/mysql/mtr/my51-mtr 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-01 10:33:52 +02:00
msvensson@shellback.(none)
a63285a647 Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtr 
into  shellback.(none):/home/msvensson/mysql/mtr/my51-mtr
 2006-09-01 10:32:20 +02:00
msvensson@shellback.(none)
89da26c14c Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtr 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-01 10:30:07 +02:00
msvensson@shellback.(none)
7afee46c55 Merge shellback.(none):/home/msvensson/mysql/mtr/my41-mtr 
into  shellback.(none):/home/msvensson/mysql/mtr/my50-mtr
 2006-09-01 10:25:50 +02:00
msvensson@shellback.(none)
324cf4ccb3 Add target to make "mtr", shortcut for running test suite 2006-09-01 10:21:08 +02:00
jonas@perch.ndb.mysql.com
1ff0ef83ee Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-09-01 10:20:35 +02:00
msvensson@shellback.(none)
9bdc99f130 Use "--skip-innodb" if running with testcases that does not need innodb 
Decreases test time when running a selected number of tests
 2006-09-01 10:01:47 +02:00
tsmith@maint2.mysql.com
e2f40aa6d0 Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-09-01 08:53:56 +02:00
mikael/pappa@dator5.(none)
636d902305 Removed Windows from tests since bug#19107 is known to hang test 2006-09-01 02:12:30 -04:00
jimw@rama.(none)
ebf482c447 Fix results of mysqldump test after messy merge 2006-08-31 21:21:23 -07:00
jimw@rama.(none)
9111a9c5c1 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-08-31 21:03:25 -07:00
jimw@rama.(none)
4d29dd1f3b Merge rama.(none):/home/jimw/my/mysql-5.0-clean 
into  rama.(none):/home/jimw/my/mysql-5.1-clean

mysqldump.result is wrong, will need to be cleaned up.
 2006-08-31 21:02:17 -07:00
jimw@rama.(none)
bd2825f5bb Restore bug fix lost in merge of client/mysqldump.c, and clean up mysqldump.test 
so that 4.1 and 5.0 tests are all in the right place and no tests are duplicated.
 2006-08-31 20:53:34 -07:00
tsmith@maint2.mysql.com
39a139193f post-merge fix 2006-09-01 05:00:32 +02:00
tsmith@maint2.mysql.com
81708c66a8 Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-09-01 03:44:03 +02:00
jimw@rama.(none)
5884eea9a3 Resolve conflicts 2006-08-31 18:24:37 -07:00
brian@zim.(none)
b5fdcc2962 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/tmp/mysql-5.1-arch
 2006-08-31 16:11:57 -07:00
mikael/pappa@dator5.(none)
35304be521 Merge dator5.(none):/home/pappa/clean-mysql-5.1-new-ndb 
into  dator5.(none):/home/pappa/push_clone
 2006-08-31 16:45:46 -04:00
brian@zim.(none)
422ab2973b Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/tmp/mysql-5.1-arch
 2006-08-31 13:42:46 -07:00
mikael/pappa@dator5.(none)
a4e0289c96 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 
into  dator5.(none):/home/pappa/push_clone
 2006-08-31 16:23:26 -04:00
msvensson@shellback.(none)
7f243b8d19 Only install the first masters db and copy it for the other 
Gives slightly faster startup
 2006-08-31 20:58:00 +02:00
georg@lmy002.wdf.sap.corp
27636d9303 Additional files for cmake support 2006-08-31 19:52:42 +02:00
cmiller@zippy.cornsilk.net
ee1ecdd33e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my51-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-08-31 12:47:15 -04:00
cmiller@zippy.cornsilk.net
1bbbc65cb5 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my50-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-08-31 12:46:42 -04:00
cmiller@zippy.cornsilk.net
8fbf3c5e8d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my51-no-strange-literals 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

Fixes bad merge.
 2006-08-31 11:34:17 -04:00
cmiller@zippy.cornsilk.net
4340ec8ce9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my50-no-strange-literals 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-08-31 11:31:45 -04:00
cmiller@zippy.cornsilk.net
bd0451e232 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my50-no-strange-literals 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my51-no-strange-literals
 2006-08-31 11:28:57 -04:00
cmiller@zippy.cornsilk.net
797b8206ed Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my41-no-strange-literals 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my50-no-strange-literals
 2006-08-31 11:27:55 -04:00
cmiller@zippy.cornsilk.net
436d3a3798 Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a 
single file is a bad practice.
 2006-08-31 11:14:04 -04:00
anozdrin/alik@alik.
5d8598a405 Fix im_instance_conf.imtest failure on AIX and HPUX. 
The problem was in dummy grep on AIX and HPUX.

The fix is to use more portable patterns.

The patch is only for test suite
(i.e. does not touch server codebase).
 2006-08-31 18:48:50 +04:00
rburnett@bk-internal.mysql.com
5ffa0bf316 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-31 15:29:59 +02:00
msvensson@shellback.(none)
9af6450e30 Update the generate_prefix_files.pl 2006-08-31 15:17:35 +02:00
msvensson@shellback.(none)
086fea9809 Bug#21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps! 
- Don't add the signatures for CRYPTO_* when compiling yaSSL for MySQL
 2006-08-31 15:16:44 +02:00
mikael/pappa@dator5.(none)
f0401bf10a BUG#21960: Reverted bad patch 2006-08-31 09:05:06 -04:00
pekka@orca.ndb.mysql.com
49408a826a Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-08-31 15:04:58 +02:00
msvensson@shellback.(none)
f368e0753e Bug #21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps! 
- Correct bug in perl script that faild to add rename macros for some functions.
 2006-08-31 14:26:12 +02:00
msvensson@shellback.(none)
d463972da7 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-31 11:57:36 +02:00
msvensson@shellback.(none)
b0754b3d02 Disable testing of "encrypt" in ctype_ucs.test 2006-08-31 11:53:08 +02:00
jonas@perch.ndb.mysql.com
7fc7ef51e1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
 2006-08-31 11:02:12 +02:00
mikael/pappa@dator5.(none)
5109531b61 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 
into  dator5.(none):/home/pappa/push_clone
 2006-08-31 04:56:09 -04:00
pekka@orca.ndb.mysql.com
2da1333a61 ndb - bug#21690 workaround-fix, cleanup in separate patch 2006-08-31 10:54:34 +02:00
mikael/pappa@dator5.(none)
ba792224c4 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/push_clone
 2006-08-31 04:49:34 -04:00
gluh@mysql.com/gluh.(none)
acaef19c61 Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..." 
fixed error message
 2006-08-31 13:43:26 +05:00