mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
44343 commits 2781 branches 343 tags 1.6 GiB
Commit graph

44343 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
d6a3989a23 add a manual page back 
support-files/mysql.spec.sh:
  add mysql_install_db.1 back
 2007-04-10 11:31:45 +02:00
unknown
046b4bb53c remove manual pages that don't exist from rpm spec file 
support-files/mysql.spec.sh:
  remove vanished manual pages
 2007-04-05 10:00:04 +02:00
unknown
fe0716d037 build fixes for 5.1.17 
CMakeLists.txt:
  use correct runtime library for RelWithDebugInfo target and always generate .map files
scripts/make_win_bin_dist:
  use RelWithDebInfo target output if exists, include copy mysqld and mysqlmanager debug info in distribution
 2007-04-04 14:19:47 +02:00
unknown
08c1864902 fix previous mysqlbinlog test case fix 
mysql-test/r/mysqlbinlog.result:
  adjust to change in test file
mysql-test/t/mysqlbinlog.test:
  substitute correct directory
 2007-04-02 18:08:11 +02:00
unknown
5c0bbbe8ea BUG#25303 log_state fails 
sql/set_var.cc:
  BUG#25303 opt_slow_log is really a my_bool
 2007-04-02 15:36:59 +02:00
unknown
30cb61d057 BUG#27489 build fix 
scripts/make_binary_distribution.sh:
  BUG#27489 make_binary_distribution doesn't copy all files
 2007-04-02 15:20:46 +02:00
unknown
6bcf19c80a build fix for bug#27049 2007-04-02 15:19:06 +02:00
unknown
0b7ba9c2dc Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Manual merge (res.waitNodesStartPhase -> NdbSleep_SecSleep)
 2007-03-22 11:48:49 -06:00
unknown
bdb9b4483e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-03-22 11:26:18 +01:00
unknown
39e7b56050 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
 2007-03-22 11:25:29 +01:00
unknown
4dee1e6a97 ndb - 
fix test prg


ndb/test/ndbapi/testNodeRestart.cpp:
  fix test prg
 2007-03-22 11:12:18 +01:00
unknown
7403890a4c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
 2007-03-22 10:36:26 +01:00
unknown
4e288dc3cf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-22 10:34:46 +01:00
unknown
e4903c29cf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
 2007-03-22 10:33:26 +01:00
unknown
04c8e7e48a 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
unknown
8f69cbdb2e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-22 05:44:39 +01:00
unknown
fd2996ad32 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-22 01:22:22 +01:00
unknown
b636ad25c7 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/help.result:
  Auto merged
mysql-test/t/help.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2007-03-22 01:04:39 +01:00
unknown
b203723bd8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-21 23:58:02 +01:00
unknown
8ed9a54008 Update the result file with an updated comment. 2007-03-22 00:11:58 +03:00
unknown
c4311efa06 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-03-22 00:11:11 +03:00
unknown
20fd65ff83 Try to fix events_logs_tests race on Windows. 
mysql-test/t/events_logs_tests.test:
  Try to fix a race condition that breaks this test on Windows.
 2007-03-22 00:09:50 +03:00
unknown
817442e873 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
unknown
54a0f623c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-03-21 23:57:12 +03:00
unknown
e772a22d40 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug27144/my50-bug27144
 2007-03-21 14:46:38 -04:00
unknown
9e6d54e4a5 Merge recycle.(none):/src/bug27144/my50-bug27144 
into  recycle.(none):/src/bug27144/my51-bug27144


mysql-test/t/sp-destruct.test:
  SCCS merged
 2007-03-21 14:01:39 -04:00
unknown
65c34cc855 Bug#27144 sp-destruct.test is disabled on Windows 
- Update test to run properly on Windows.


mysql-test/t/sp-destruct.test:
  Bug#27144 sp-destruct.test is disabled on Windows
  - Enabled test on Windows.
  - Replaced non-portable system commands (mkdir, rmdir, mv, cp, echo) 
  with the mysqltest builtin commands.
  - Replace Windows directory seperator in error ER_NOT_FROM_FILE with
  posix directory seperator for single test/result pair.
 2007-03-21 13:58:11 -04:00
unknown
4390f78889 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug23736/my50-bug23736
 2007-03-21 13:43:03 -04:00
unknown
2608804665 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug23736/my51-bug23736
 2007-03-21 13:39:08 -04:00
unknown
858ff63811 Fix warnings on Windows. 
sql/event_data_objects.cc:
  Fix Windows 64 bit build warnings. No better fix exists at the moment.
 2007-03-21 20:32:15 +03:00
unknown
33a51fd843 Fix a broken merge. 
scripts/mysql_system_tables.sql:
  Add time_zone to the list of mysql.event columns.
scripts/mysql_system_tables_fix.sql:
  Update after a bad merge: now mysql_system_tables_fix contains
  only alter definitions, no CREATE definitions (single definition
  source approach that was implemented by Magnus).
 2007-03-21 19:20:44 +03:00
unknown
f668148944 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2007-03-21 15:42:13 +01:00
unknown
a1368c8e16 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-21 15:37:14 +01:00
unknown
2d3b2458fe Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2007-03-21 15:36:23 +01:00
unknown
b278b21030 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2007-03-21 15:35:22 +01:00
unknown
f5acedb6a7 ndb - bug#27283 
Additional fix for 2-node case


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Add error insert ref for errcode = 7181
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
 2007-03-21 15:34:47 +01:00
unknown
d344d81c95 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
mysql-test/install_test_db.sh:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
netware/Makefile.am:
  Manual merge
 2007-03-21 14:34:25 +01:00
unknown
2176fef446 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
netware/Makefile.am:
  Manual merge
 2007-03-21 14:30:47 +01:00
unknown
ed0badb128 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
mysql-test/install_test_db.sh:
  Manual merge
mysql-test/r/flush2.result:
  Manual merge
netware/Makefile.am:
  Manual merge
 2007-03-21 14:24:50 +01:00
unknown
94a40d6c39 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
unknown
6fb9ef87e3 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


sql/log.cc:
  Auto merged
 2007-03-21 13:14:12 +02:00
unknown
f58baa6a28 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-21 09:28:37 +01:00
unknown
f397b42288 mysqlbinlog-cp932.test: 
merging


mysql-test/t/mysqlbinlog-cp932.test:
  merging
 2007-03-21 09:28:26 +01:00
unknown
01fe2589be 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-21 09:28:22 +01:00
unknown
a7d1bd9f17 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
 2007-03-21 09:27:13 +01:00
unknown
447f5de15b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
 2007-03-21 09:26:05 +01:00
unknown
a7970e2408 Bug #26825 MySQL Server Crashes in high load 
- initialize to NULL, to avoid call of free on uninitialized variable
 2007-03-21 09:23:49 +01:00
unknown
e2e6aa89d3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


sql/ha_ndbcluster.cc:
  manual merge
 2007-03-21 09:08:05 +01:00
unknown
fb2858bc75 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-21 09:07:55 +01:00
unknown
1662b18757 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
 2007-03-21 09:06:44 +01:00