1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Commit Graph

13745 Commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
81f9676de6 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-09-03 17:55:01 +02:00
cmiller@maint1.mysql.com
51e4432b79 mysql-test-run.pl:
'reorder' default off until test cases fixed.
2006-09-02 13:30:37 +02:00
cmiller@maint1.mysql.com
ba0df1ca7e Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my51-mtr_reorder
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint
2006-09-01 21:58:07 +02:00
cmiller@maint1.mysql.com
8cacf3f54c Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my50-mtr_reorder
into  maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my51-mtr_reorder
2006-09-01 21:54:34 +02:00
cmiller@maint1.mysql.com
46b3997c51 mtr_cases.pl:
Provide a more extensible, easier-to-change way of reordering
  test cases.
2006-09-01 21:53:23 +02:00
anozdrin/alik@alik.
faad252336 Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-tree
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2006-09-01 22:24:51 +04:00
jimw@rama.(none)
bfb06f15fd Bug #19874: SHOW COLUMNS and SHOW KEYS handle identifiers containing \ incorrectly
Identifiers with embedded escape characters were not handled correctly by
  some SHOW statements due to some old code that was doing some extra unescaping.
2006-09-01 10:39:48 -07:00
msvensson@neptunus.(none)
ba7035ab55 Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-01 16:57:51 +02:00
msvensson@neptunus.(none)
906d17779b Turn on reorder as default. 2006-09-01 16:56:46 +02:00
msvensson@neptunus.(none)
2036bdc88e Move test that requires innodb to "mysql_innodb" 2006-09-01 16:51:37 +02:00
mskold/marty@linux.site
712f1f3da4 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 16:16:49 +02:00
mskold/marty@mysql.com/linux.site
166580275c Removed absolute path 2006-09-01 16:14:59 +02:00
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
andrey@example.com
ca39997c0e WL#3337 (Event scheduler new architecture)
This is a post-review patch.

Fixes the typelib implementation, available only in 5.1.11.

--event-scheduler cmdline : DISABLED | ON | OFF | 0 | 1
DISABLED - makes the scheduler unavailable during the server run
(ON|1)-  When the server is started the scheduler will be started. It can
         be stopped and restarted by setting appropriate values to
         GLOBAL event_scheduler
(OFF|0)- When the server is started, the scheduler won't be started. It
         can be started and again stopped by setting appropriate values to
         GLOBAL event_scheduler. _DEFAULT_ value

The GLOBAL variable event_scheduler can have the following values:
OFF | ON | 0 | 1
DISABLED is not possible and every attempt will end with an error that
it's not a valid value for the variable.
OFF | 0 - This is the pre-5.1.11 behavior - The scheduler stops, if not
          already stopped, and can be started again  by setting
          the value of the variable to ON|1.
ON | 1  - This is the pre-5.1.11 behavior - The scheduler starts, if not
          already started, and can be stopped again by setting the value
          of the variable to OFF|0.
2006-09-01 13:08:44 +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)
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)
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
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
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
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
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
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
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
msvensson@shellback.(none)
31df5d1d0d Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-31 10:33:35 +02:00
msvensson@shellback.(none)
71450a865f Bug#21721 Test suite does not start with NDB, hangs forever; problem around "ndb_mgmd"
- Wait for ndb_mgmd with timeout
2006-08-31 10:28:48 +02:00
mikael/pappa@dator5.(none)
67ca3ba522 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into  dator5.(none):/home/pappa/bug21388
2006-08-31 04:26:14 -04:00
mikael/pappa@dator5.(none)
8c5db16fc5 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug21388
2006-08-31 04:21:14 -04:00
msvensson@shellback.(none)
f19bdd996f Add check in 'spawn_impl' that we are not trying to span when the path to the executable is empty or undefined 2006-08-31 10:18:55 +02:00
evgen@moonbone.local
94028c618f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-31 12:14:27 +04:00
cmiller@zippy.cornsilk.net
d575196c35 Manual merge. 2006-08-30 21:26:43 -04:00
cmiller@zippy.cornsilk.net
f864c06e50 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-30 18:19:39 -04:00
tsmith@maint2.mysql.com
0af0180468 Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
2006-08-31 00:01:43 +02:00
tsmith@maint2.mysql.com
6809271303 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/51
2006-08-30 23:20:01 +02:00