mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41456 commits 2857 branches 349 tags 1.6 GiB
Commit graph

41456 commits

Author SHA1 Message Date
unknown
0a27651fdf Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-18 14:38:00 +01:00
unknown
c32d646d25 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release


support-files/mysql.spec.sh:
  Auto merged
 2006-12-18 13:49:53 +01:00
unknown
052624e1bd Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-12-18 13:44:57 +01:00
unknown
e55c9a7ab5 Use a temporary directory for sockets if the socket path becomes too long. 2006-12-18 13:44:21 +01:00
unknown
5958296be1 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-18 13:35:29 +01:00
unknown
fd0a4f225f Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
 2006-12-18 11:59:14 +01:00
unknown
134b83d0a0 support-files/mysql.spec.sh 
Fix the move of "mysqlmanager" to section 8: Directory name was wrong.


support-files/mysql.spec.sh:
  Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
 2006-12-18 11:51:45 +01:00
unknown
71776740b6 fix for commit 1.2368 2006-12-18 12:52:59 +03:00
unknown
1b64ba4aea fix for commit 1.2368 2006-12-18 09:46:44 +03:00
unknown
185997ceaf WL#2862 2006-12-17 23:08:04 +03:00
unknown
d26bbd00b7 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-12-15 22:57:40 +01:00
unknown
36c7c608bf also include data files for varbinary test in binary distribution 2006-12-15 17:57:31 +01:00
unknown
ef8c57f988 minor fixup 
support-files/mysql.spec.sh:
  fixup
 2006-12-15 17:45:17 +01:00
unknown
da5a804366 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
 2006-12-15 17:24:15 +01:00
unknown
32d0850823 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
 2006-12-15 17:17:29 +01:00
unknown
ba0e1d011c Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
 2006-12-15 17:14:41 +01:00
unknown
c632e93e61 merge fix 2006-12-15 17:12:41 +01:00
unknown
c5301c5ac2 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  merge
 2006-12-15 16:57:43 +01:00
unknown
dcbf618831 WL 
Yet another test result that needed to be regenerated due to new error
messages. This test only runs via ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row rpl_extraCol_innodb
 2006-12-15 09:42:41 -05:00
unknown
9a79c0dc68 ndb - bug#25059 
incorrect handling of commit/ignore error in unique index code


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) handle potential ptr error
  2) remove incorrect commit-handling in uk code
ndb/src/ndbapi/NdbTransaction.cpp:
  1) force 4012
  2) handle AO_IgnoreError in uk code
ndb/src/ndbapi/Ndbif.cpp:
  force 4012
ndb/test/ndbapi/testIndex.cpp:
  test program for 25059
ndb/test/run-test/daily-basic-tests.txt:
  add testcase
 2006-12-15 15:39:45 +01:00
unknown
04ce9e4b48 ndb - bug#25090 
add testcase


ndb/test/ndbapi/testBasic.cpp:
  add testcase for bug#25090
ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#25090
 2006-12-15 13:31:31 +01:00
unknown
6dd079a6c1 Raise version number after cloning 5.0.32 2006-12-15 13:18:16 +01:00
unknown
52fad14534 ndb - bug#25090 
make sure apicon timer is reset when setting CS_CONNECTED


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  make sure apicon timer is reset when setting CS_CONNECTED
 2006-12-15 12:37:55 +01:00
unknown
1747206729 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-15 09:59:26 +01:00
unknown
5029f2729a Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2006-12-15 09:28:40 +01:00
unknown
0085879f43 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-15 09:27:23 +01:00
unknown
4d440ab0f7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
 2006-12-15 09:06:15 +01:00
unknown
386b381788 bug#19956 Problems with VARCHAR primary key and BLOB fields:added test case 2006-12-15 09:03:21 +01:00
unknown
8ca9c92880 Merge trift2.:/MySQL/M41/spec-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-12-14 22:57:33 +01:00
unknown
0221a9bd05 Merge trift2.:/MySQL/M50/spec-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-12-14 22:52:38 +01:00
unknown
8a2b3baaa9 Merge trift2.:/MySQL/M50/spec-5.0 
into  trift2.:/MySQL/M51/spec-5.1


support-files/mysql.spec.sh:
  SCCS merged
 2006-12-14 22:45:06 +01:00
unknown
13eeee6f3f support-files/mysql.spec.sh 
The "mysqlmanager" man page got moved from section 1 to 8.


support-files/mysql.spec.sh:
  The "mysqlmanager" man page got moved from section 1 to 8.
 2006-12-14 22:41:26 +01:00
unknown
d480867964 Merge trift2.:/MySQL/M41/spec-4.1 
into  trift2.:/MySQL/M50/spec-5.0


support-files/mysql.spec.sh:
  Manual merge.
 2006-12-14 22:37:13 +01:00
unknown
007357e7cd support-files/mysql.spec.sh 
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".


support-files/mysql.spec.sh:
  The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
 2006-12-14 22:30:32 +01:00
unknown
a4712f9fb4 bug#19956 Problems with VARCHAR primary key and BLOB fields:put back removed error handling for HA_ERR_KEY_NOT_FOUND 2006-12-14 16:52:50 +01:00
unknown
1072734844 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
 2006-12-14 16:42:24 +01:00
unknown
f8505697f0 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Merge (using local, will merge manually)
 2006-12-14 16:31:38 +01:00
unknown
14f7ff0025 Removed check for impossible error return 2006-12-14 16:27:14 +01:00
unknown
f05a59ec32 BUG 
mysql_upgrade test gives inconsitent results
 2006-12-14 10:07:17 -05:00
unknown
991de08780 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2006-12-14 13:32:27 +01:00
unknown
32fcce2b60 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-12-14 13:31:11 +01:00
unknown
430b2eafbc Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2006-12-14 09:34:24 +01:00
unknown
39d873cf3c Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-14 09:33:27 +01:00
unknown
ba79c76607 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-14 09:31:51 +01:00
unknown
6c5e6dabce Remove old hack to avoid reception of SUB_DATA signals to destroyed Ndb object 2006-12-13 21:04:10 +01:00
unknown
a1e3475b46 After merge fix. 2006-12-13 19:20:34 +04:00
unknown
9e46434910 Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.1-engines


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2006-12-13 17:32:40 +04:00
unknown
b9d2627ca1 Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/sql_parse.cc:
  SCCS merged
 2006-12-13 16:29:33 +04:00
unknown
a4ad07b7ea Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines


mysql-test/r/alter_table.result:
  SCCS merged
mysql-test/t/alter_table.test:
  SCCS merged
 2006-12-13 15:53:37 +04:00
unknown
1a95fcff76 WL# 3031 
Found that the results from select had to be fixed too.
 2006-12-12 19:39:45 -05:00