mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-05 02:33:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
44422 commits 2856 branches 349 tags 1.7 GiB
Commit graph

44422 commits

Author SHA1 Message Date
iggy@recycle.(none)
ebbd5525ca Post Merge Fix. 2007-03-20 10:22:15 -04:00
kaa@polly.local
41bdc9c1af Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  polly.local:/tmp/maint/mysql-5.1-maint
 2007-03-20 17:18:43 +03:00
df@pippilotta.erinye.com
aab816e779 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-03-20 15:15:38 +01:00
kent@mysql.com/kent-amd64.(none)
cd1005ab04 vio.vcproj, mysqld.vcproj, mysys.vcproj, libmysqld.vcproj, mysqldemb.vcproj: 
No need to set LICENSE or USE_SYMDIR from project files
make_win_bin_dist:
  Changed location of SQL initialization files to be "share/"
 2007-03-20 15:12:50 +01:00
iggy@recycle.(none)
8ecbf6c03d Merge recycle.(none):/src/bug25765/my50-bug25765 
into  recycle.(none):/src/bug25765/my51-bug25765
 2007-03-20 10:09:53 -04:00
iggy@recycle.(none)
9a5f0bff4f Bug#25765 too many dbg heap assertions on windows 
- SAFEMALLOC should be defined for each project in debug Windows builds.
SAFEMALLOC was not defined for the innodb project. Debug asserts caused 
due to mixed SAFEMALLOC defines.
 2007-03-20 10:07:23 -04: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
df@pippilotta.erinye.com
50c909128e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-03-20 13:44:47 +01:00
df@pippilotta.erinye.com
f6c30190b3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-03-20 13:34:09 +01:00
df@pippilotta.erinye.com
56856d6f31 small build fix 2007-03-20 13:33:17 +01:00
df@pippilotta.erinye.com
8161dcaacb build fix for netware 2007-03-20 13:32:49 +01: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
tomas@whalegate.ndb.mysql.com
64b9bda21f BUG#24363 If the table structure has been changed, the default action about the restore will fail. 
- correction of patch, original patch will segfault for print option
 2007-03-20 11:11:08 +01:00
tomas@whalegate.ndb.mysql.com
36e3a94bf8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-20 10:47:56 +01:00
tomas@whalegate.ndb.mysql.com
ac8592ce2c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-20 10:37:11 +01:00
tomas@whalegate.ndb.mysql.com
07d1f742f9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-20 10:25:55 +01:00
df@pippilotta.erinye.com
e4a9917b6c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-03-20 10:24:11 +01:00
df@pippilotta.erinye.com
bc7e1eeeba Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-03-20 10:23:11 +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
310c281c18 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-20 09:02:57 +01: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
tomas@poseidon.
0312d1bf91 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2007-03-20 08:57:34 +01:00
df@pippilotta.erinye.com
5572ab1462 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-03-20 08:49:47 +01:00
tomas@whalegate.ndb.mysql.com
c3993eceb4 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-20 08:49:29 +01:00
joerg@trift2.
8e209e9358 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-03-20 08:41:33 +01:00
ibabaev@bk-internal.mysql.com
45fb6c90f0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-03-20 03:59:32 +01:00
tsmith@quadxeon.mysql.com
f2fc78e81a Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-19 23:56:36 +01:00
evgen@moonbone.local
41c732493e sql_insert.cc: 
After merge fix.
 2007-03-20 01:37:33 +03: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
3ef6094884 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-03-20 00:44:25 +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
kent@mysql.com/kent-amd64.(none)
731c3e5b20 mysys.vcproj: 
Removed accidently added my_winsem.c
make_win_bin_dist:
  Corrected test for relwithdebinfo target
mysql.sln:
  Specify that comp_err depends on zlib
 2007-03-19 22:41:16 +01: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
kostja@bodhi.local
a9065201d5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-03-19 23:59:53 +03:00
df@pippilotta.erinye.com
eb0ddb2184 BUG#27270 Can't compile latest 5.1-main 2007-03-19 20:44:46 +01:00
jonas@perch.ndb.mysql.com
925f06e511 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
 2007-03-19 18:30:06 +01:00
kent@mysql.com/kent-amd64.(none)
e9d65ba363 make_win_bin_dist: 
Restore accidently removed line
 2007-03-19 16:45:37 +01:00
kent@mysql.com/kent-amd64.(none)
19a6a09126 Many files: 
Major cleanup of old Visual Studio project files, aligning engines etc
 2007-03-19 16:18:10 +01:00
joerg@trift2.
3b1d0c2a2a Merge mysqldev@production.mysql.com:my/mysql-5.0-release/ 
into  trift2.:/MySQL/M50/clone-5.0
 2007-03-19 15:27:58 +01:00
joerg@trift2.
1e3cec5458 netware/Makefile.am : "libmysql.imp" must survive a "make clean" for the NetWare builds. 2007-03-19 15:24:07 +01:00
jonas@perch.ndb.mysql.com
229ee6d4f1 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-19 14:55:13 +01:00
jonas@perch.ndb.mysql.com
886e11736b ndb - test_event 
Fix compile error with gcc4
 2007-03-19 14:51:17 +01:00