mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-07 03:33:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
44372 commits 2860 branches 349 tags 1.6 GiB
Commit graph

16856 commits

Author SHA1 Message Date
joerg@trift2.
751531fca7 mysql-test/t/query_cache_sql_prepare.test : Prevent this test from running in "embedded". 2007-03-23 17:31:10 +01:00
joerg@trift2.
2e5e79cf37 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-03-23 10:57:17 +01:00
omer@linux.site
cbdd03c5d5 Merge linux.site:/home/omer/source/bld50_0321 
into  linux.site:/home/omer/source/bld51_0322
 2007-03-22 14:49:25 -07:00
tomas@whalegate.ndb.mysql.com
753bc96eca Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-22 10:33:26 +01:00
tomas@whalegate.ndb.mysql.com
6e7528bd34 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-22 05:45:17 +01:00
tsmith@quadxeon.mysql.com
54e7bc8daa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-22 01:04:39 +01:00
kostja@bodhi.local
f017117d84 Update the result file with an updated comment. 2007-03-22 00:11:58 +03:00
kostja@bodhi.local
54076b30d0 Try to fix events_logs_tests race on Windows. 2007-03-22 00:09:50 +03:00
kostja@bodhi.local
95597c8371 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-03-21 23:59:37 +03:00
omer@linux.site
c21a5bc8b1 Modifying mysql-test-run.pl to allow steeing of --secure-file-priv to 'mysql-test' when 
running suites other tha the main one
 2007-03-21 11:05:43 -07:00
iggy@recycle.(none)
762eae0bf1 Merge recycle.(none):/src/bug27144/my50-bug27144 
into  recycle.(none):/src/bug27144/my51-bug27144
 2007-03-21 14:01:39 -04:00
iggy@recycle.(none)
a763917a6f Bug#27144 sp-destruct.test is disabled on Windows 
- Update test to run properly on Windows.
 2007-03-21 13:58:11 -04:00
msvensson@pilot.blaudden
a0c2fae01f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-21 14:34:25 +01:00
msvensson@pilot.blaudden
31b2f339a0 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-21 14:30:47 +01:00
msvensson@pilot.blaudden
7c5df4d35b Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-21 14:24:50 +01:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
79216dad87 Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build 
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
 2007-03-21 13:16:03 +02:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
ac1c81ddcf Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb 
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
 2007-03-21 13:14:12 +02:00
holyfoot/abotchkov@mysql.com/bk-internal.mysql.com
9d4a0118d8 mysqlbinlog-cp932.test: 
merging
 2007-03-21 09:28:26 +01:00
tomas@whalegate.ndb.mysql.com
ffb35b80fe minor fix of ndb cluster startup script 2007-03-21 08:02:11 +01:00
tsmith@quadxeon.mysql.com
9167aabaa3 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:27:45 +01:00
joerg@trift2.
d21bf44517 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/test-help-5.1
 2007-03-20 21:23:23 +01:00
tsmith@quadxeon.mysql.com
7018d9c5aa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:12:46 +01:00
joerg@trift2.
16ec3cb361 Merge trift2.:/MySQL/M50/test-help-5.0 
into  trift2.:/MySQL/M51/test-help-5.1
 2007-03-20 21:05:57 +01:00
tsmith@quadxeon.mysql.com
2250d1a752 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:05:48 +01:00
tsmith@quadxeon.mysql.com
2670f149d0 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
 2007-03-20 20:59:41 +01:00
joerg@trift2.
602ed0a945 Merge trift2.:/MySQL/M41/test-help-4.1 
into  trift2.:/MySQL/M50/test-help-5.0
 2007-03-20 19:52:40 +01:00
joerg@trift2.
69a2dcda37 Test "help": 
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.
 2007-03-20 19:36:11 +01:00
joerg@trift2.
54dd7a5112 Merge trift2.:/MySQL/M41/test-help-4.1 
into  trift2.:/MySQL/M50/test-help-5.0
 2007-03-20 19:29:46 +01:00
kent@mysql.com/kent-amd64.(none)
0e84886d61 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-20 19:23:20 +01:00
joerg@trift2.
86483de2e5 Test "help": 
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.
 2007-03-20 19:19:17 +01:00
kent@kent-amd64.(none)
a149769b2d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-20 17:58:30 +01:00
tomas@whalegate.ndb.mysql.com
7bd5241cb4 enabled test case 
+ some fixes to do the enable
 2007-03-20 17:07:53 +01:00
kaa@polly.local
41992a2729 Merge polly.local:/tmp/maint/bug23775/my50-bug23775 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-03-20 17:27:49 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
0233b13572 tests fixed to work in embedded server 2007-03-20 17:53:55 +04:00
kaa@polly.local
24052c23e1 Merge polly.local:/tmp/maint/bug23775/my51-bug23775 
into  polly.local:/tmp/maint/mysql-5.1-maint
 2007-03-20 15:48:25 +03:00
msvensson@pilot.blaudden
3dbc0f7852 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-20 11:23:17 +01:00
msvensson@pilot.blaudden
80fb08310e Bug#27070 server logs are created unrequested and in wrong directory 
- Avoid defaault log file names looking like <hostname>.pid.slow.log
  by using the FN_REPLACE_EXT flag to 'fn_format'
 - Remove the default log files generated by log_state.test before
   test completes
 2007-03-20 11:21:27 +01:00
msvensson@pilot.blaudden
d640af1881 Update test reulst after setting logging to be sent both to file and tables 2007-03-20 11:17:07 +01:00
msvensson@pilot.blaudden
68df4cbc5a Bug#27070 server logs are created unrequested and in wrong directory 
- Setting up a A->B->A replication causes relay logs being written
  by the master, remove them when test is finished
 2007-03-20 11:15:15 +01:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
7c22049dfa Bug max_binlog_size + innodb = not make new binlog and hang server 
There was hanging at binlog_commit by a thread executing autocommit query.

The hang appeared to be due to an overly condtion for early return 
from binlog_commit introduced by bug#20265 fix.

Fixed with reverting the logic back to 5.0 version.
 2007-03-20 10:50:10 +02:00
tsmith@quadxeon.mysql.com
f1b1eb030b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-20 09:00:38 +01:00
tsmith@quadxeon.mysql.com
9ff0553f7a Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-20 08:57:55 +01:00
tsmith@quadxeon.mysql.com
0eae26ef57 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-19 23:36:38 +01:00
evgen@moonbone.local
37add3b661 Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-03-20 01:29:09 +03:00
tsmith@quadxeon.mysql.com
6252477a7b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-19 23:10:58 +01:00
evgen@moonbone.local
31b9145ab3 sql_insert.cc: 
Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
trigger.test, trigger.result:
  Corrected test case for the bug#27006.
 2007-03-20 00:46:19 +03:00
kostja@bodhi.local
bdb10baec1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-03-20 00:42:11 +03:00
joerg@trift2.
90879b5737 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-03-19 22:18:31 +01:00
msvensson@pilot.blaudden
709f066948 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-19 11:15:59 +01:00
msvensson@pilot.blaudden
5463575a4c Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-19 09:26:07 +01:00