mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32235 commits 2791 branches 343 tags 1.7 GiB
Commit graph

32235 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
c8e6cdda84 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
 2006-03-24 17:46:00 +01:00
unknown
3adaea9d53 disabled test referring to bug 2006-03-24 17:41:26 +01:00
unknown
084d6e19e5 Commented out lines in disabled.def that have bug numbers that are closed 
mysql-test/t/disabled.def:
  Commented out tests in disabled.def that have bug numbers that are closed
 2006-03-24 09:45:44 -05:00
unknown
11d1a6fc41 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 13:55:10 +01:00
unknown
9501550d5a Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 13:50:41 +01:00
unknown
2c45951d8d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
 2006-03-24 13:28:29 +01:00
unknown
84992f54b7 Enabled test rpl_ndb_insert_ignore 2006-03-24 13:26:35 +01:00
unknown
f9140bdf63 ndb autotest 
fix \ in makefile (merge error)


storage/ndb/test/run-test/Makefile.am:
  fix makefile
 2006-03-24 12:36:39 +01:00
unknown
e65c4d2297 Merge 192.168.0.100:mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
 2006-03-24 12:33:11 +01:00
unknown
bd3cbbe544 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-03-24 12:25:03 +01:00
unknown
045d42e53f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 12:02:39 +01:00
unknown
9b5ce28914 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-03-24 11:59:11 +01:00
unknown
9d9ac1b000 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-24 11:59:10 +01:00
unknown
1469ff412a disabled.def: 
enabled rpl_ndb_blob since a "hanging" bug was fixed


mysql-test/t/disabled.def:
  enabled rpl_ndb_blob since a "hanging" bug was fixed
 2006-03-24 11:57:31 +01:00
unknown
f2e9a5cfa0 ndb - bug#18295 
more work-arounds for gcc4


storage/ndb/src/kernel/vm/Pool.hpp:
  More gcc4 craziness
 2006-03-24 11:35:57 +01:00
unknown
7c8acd5931 Fix 'metaphon' function to correctly calculate the length of the returned string 
sql/udf_example.cc:
  Calculate length of returned string correctly
 2006-03-24 11:12:32 +01:00
unknown
7a86236dfd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
 2006-03-24 10:48:28 +01:00
unknown
4a3c103ad9 Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted' 2006-03-24 10:42:55 +01:00
unknown
655139c943 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-24 13:32:16 +04:00
unknown
bf3c1e18a0 ndb - 
more compiler warnings...


storage/ndb/include/util/InputStream.hpp:
  more warnings
 2006-03-24 10:23:50 +01:00
unknown
6c9618d18d ndb - 
still some compiler warnings


storage/ndb/include/util/OutputStream.hpp:
  still some compiler warnings
storage/ndb/include/util/SimpleProperties.hpp:
  still some compiler warnings
storage/ndb/src/kernel/vm/Pool.hpp:
  still some compiler warnings
 2006-03-24 10:19:10 +01:00
unknown
cb7aa5abdb Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-03-24 10:17:18 +01:00
unknown
d592337739 Merge ndbdev@ndbmaster.mysql.com:jonas/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-03-24 10:12:35 +01:00
unknown
c2e4ef092b - corrected bug causing hang in getTable when using blob tables 
- make sure cluster/schema table is always created first


sql/ha_ndbcluster_binlog.cc:
  make sure cluster/schema table is always created first
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  corrected bug causing hang in getTable when using blob tables
 2006-03-24 10:12:34 +01:00
unknown
ec67344e55 after merge fix 2006-03-24 12:42:28 +04:00
unknown
118f8b2e4c ndb - bug#18295 
rewrite/clean up code a bit to avoid a gcc4 compiler bug


storage/ndb/src/kernel/vm/DLFifoList.hpp:
  Fix compiler bug
storage/ndb/src/kernel/vm/DLList.hpp:
  Fix compiler bug
storage/ndb/src/kernel/vm/SLList.hpp:
  Fix compiler bug
 2006-03-24 09:42:10 +01:00
unknown
b65db0cbfb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2006-03-24 09:36:56 +01:00
unknown
61e3fea2cf ndb - merge fixes 
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  merge
storage/ndb/src/ndbapi/Ndbif.cpp:
  merge
 2006-03-24 08:58:40 +01:00
unknown
b70b75567a Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartPerm.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
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/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  Auto merged
storage/ndb/test/run-test/conf-dl145a.txt:
  Auto merged
storage/ndb/test/run-test/conf-ndbmaster.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/run-test/conf-shark.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  merge
storage/ndb/test/run-test/Makefile.am:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
storage/ndb/tools/desc.cpp:
  merge
 2006-03-24 07:43:55 +01:00
unknown
0ea46d9c2e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 07:25:14 +01:00
unknown
a4962ed022 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-03-23 15:04:45 -08:00
unknown
f97d76ac1c Bug#18474 Unlistable directories yield no info from information_schema, part2 
- Make the windows implementation of 'my_dir' behave like the default implementation


mysys/my_lib.c:
  If 'findfirst' returns EINVAL, just continue and return 0 files to read in this dir.
 2006-03-23 23:09:34 +01:00
unknown
d953e15391 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster_binlog.cc:
  Auto merged
 2006-03-23 22:50:20 +01:00
unknown
dfbc4b3fcf Bug #18472 race condition between multiple mysqld's when setting up cluster/schema 
- check that event is the correct one, and only delete if wrong version
 2006-03-23 22:49:02 +01:00
unknown
b436ae59d5 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


mysql-test/r/ndb_insert.result:
  Auto merged
mysql-test/r/ndb_replace.result:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Keeping local and do manual merge
sql/ha_ndbcluster.h:
  Keeping local and do hand merge
 2006-03-23 22:39:30 +01:00
unknown
e1da710d5b Only run in libtool if running in valgrind. 
Apparently libtool isn't properly setup on all our build hosts.


mysql-test/mysql-test-run.pl:
  Only run in libtool if running in valgrind.
 2006-03-23 22:29:53 +01:00
unknown
74a7b9a5f5 Merge production:mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-23 21:49:30 +01:00
unknown
636064c0ba Dump result to .log file at test failure 
client/mysqltest.c:
  Dump accumulated result upuntil test failure into a <testname>.log file for later examination
mysql-test/lib/mtr_report.pl:
  Inform about the <testname>.log file's existence
 2006-03-23 21:48:31 +01:00
unknown
2711b9d5de Remove DBUG print that looks at args[0] even if arg_count is 0 2006-03-23 21:45:00 +01:00
unknown
6662707f74 Fix type "enfif" -> "endif" 2006-03-23 20:59:23 +01:00
unknown
d19fe3871a Delete gdbinit file before writing to it 
Concat type+idx to get a unique gdbinit filename
 2006-03-23 20:05:09 +01:00
unknown
f911a7febd Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-03-23 10:10:24 -08:00
unknown
52c4dbd88b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
 2006-03-23 18:58:53 +01:00
unknown
a616abb26e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-23 18:54:40 +01:00
unknown
d4c8ca0ca7 ctype-utf8.c, ctype-simple.c: 
Forgot to include into the previous changeset.


strings/ctype-simple.c:
  Forgot to include into the previous changeset.
strings/ctype-utf8.c:
  Forgot to include into the previous changeset.
 2006-03-23 21:41:29 +04:00
unknown
ae2e4edd05 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
sql/sql_error.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
 2006-03-23 18:14:02 +01:00
unknown
d138199210 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-03-23 08:46:26 -08:00
unknown
145e4258e5 Merge 
include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
include/config-win.h:
  SCCS merged
 2006-03-23 17:41:53 +01:00
unknown
5aa14b9832 config-win.h: 
If CYBOZU defined, set character sets etc


include/config-win.h:
  If CYBOZU defined, set character sets etc
 2006-03-23 17:25:49 +01:00
unknown
378efca2be Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-23 19:59:21 +04:00