mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
22701 commits 2784 branches 343 tags 1.6 GiB
Commit graph

22701 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
a3f0726979 Merge 
BitKeeper/etc/logging_ok:
  auto-union
include/my_global.h:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  SCCS merged
 2005-05-10 12:34:16 +02:00
unknown
b69cd35a6d Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/t/range.test:
  Auto merged
sql/item_strfunc.h:
  Auto merged
 2005-05-10 10:49:50 +02:00
unknown
d7e49743e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-10 10:45:49 +02:00
unknown
31d7922823 Remove testcode 
sql/item_strfunc.h:
  Remove the testcode
 2005-05-10 10:45:16 +02:00
unknown
1fb790d3f0 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10095


mysql-test/t/range.test:
  Auto merged
 2005-05-10 00:43:18 +02:00
unknown
4a1b6c0102 Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not available 2005-05-10 00:40:41 +02:00
unknown
3db2d3d895 Merge mysql.com:/home/hf/work/mysql-4.1.ssj 
into mysql.com:/home/hf/work/mysql-5.0.clean


BitKeeper/etc/logging_ok:
  auto-union
strings/ctype-sjis.c:
  Auto merged
 2005-05-10 02:59:28 +05:00
unknown
163b8bdc37 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/hf/work/mysql-4.1.ssj
 2005-05-10 02:54:49 +05:00
unknown
5cc6f2edb3 Fix for bug #10493 (SJIS fields are not correctly saved) 
strings/ctype-sjis.c:
  pos should be decreased
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2005-05-10 02:15:59 +05:00
unknown
e16c5284bb Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-09 22:43:09 +02:00
unknown
d03e4637b6 Add compiler settings for Pentium M 
BUILD/check-cpu:
  Pentium M
 2005-05-09 21:59:03 +02:00
unknown
c90b0ab577 Merge 
include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
configure.in:
  Ignore 4.1 version change
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge 4.1
ndb/src/ndbapi/ClusterMgr.cpp:
  merge
ndb/test/run-test/Makefile.am:
  merge
sql/mysql_priv.h:
  merge from 4.1
sql/table.cc:
  Merge from 4.1
 2005-05-09 11:28:57 -07:00
unknown
6748f7f42f merge 
include/my_global.h:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
 2005-05-09 20:28:55 +02:00
unknown
438eeda64a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-09 20:28:54 +02:00
unknown
9a71e2dbc6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
 2005-05-09 18:28:53 +00:00
unknown
08cea5f83f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
 2005-05-09 18:20:24 +00:00
unknown
d775e4ec30 after merge fix 2005-05-09 18:18:59 +00:00
unknown
7ba252b974 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
 2005-05-09 17:24:34 +00:00
unknown
910f990984 manual merge 2005-05-09 17:21:44 +00:00
unknown
37dc7c80a5 Fix for bug #9404: information_schema: Weird error messages with SELECT SUM() ... GROUP BY queries 
heap/hp_hash.c:
  Fix for bug #9404: information_schema: Weird error messages with SELECT SUM() ... GROUP BY queries 
      use length in symbols instead of length in bytes
      to calculate record length and key length
 2005-05-09 16:22:49 +00:00
unknown
8815d6cf60 configure.in: 
Bumped up version number to indicate 4.1.12 was branched off


configure.in:
  Bumped up version number to indicate 4.1.12 was branched off
 2005-05-09 18:14:10 +02:00
unknown
66446b31b7 SUBSTR with negative argument didn't work 
with multi-byte strings, length() instead
of numchars() where used in a mistake.
 2005-05-09 20:55:06 +05:00
unknown
50a051bbc2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-05-09 16:05:52 +02:00
unknown
8eb32a2a71 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-09 16:04:38 +02:00
unknown
b8ea7d4b8a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/ram/work/mysql-4.1
 2005-05-09 18:50:57 +05:00
unknown
3a842fdfc0 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733


sql/sql_yacc.yy:
  Auto merged
 2005-05-09 14:50:56 +01:00
unknown
c1c449eefb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-09 15:37:09 +02:00
unknown
09e426bf3c a fix (bug #10438: Raid stopped working because of change in atomic add detection). 
include/my_global.h:
  a fix (bug #10438: Raid stopped working because of change in atomic add detection).
  In order to compile with atomic.h on itanium we redefine 'new' because it's used
  as a local variable in this file and conflicts with a kernel header.
 2005-05-09 18:33:21 +05:00
unknown
e514a1eea2 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-09 06:33:20 -07:00
unknown
19b8643830 Bug#8733 - server accepts malformed query (multiply mentioned distinct) 
Detect conflicting options in SELECT


mysql-test/r/select.result:
  Test for bug#8733
mysql-test/t/select.test:
  Test for bug#8733
sql/mysql_priv.h:
  New bit for ALL
sql/sql_yacc.yy:
  We want to complain if DISTINCT or ALL is used in SELECT when a
  conflicting option is already selected.
 2005-05-09 14:31:46 +01:00
unknown
fe760a6049 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-05-09 17:26:59 +04:00
unknown
608ec25174 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
 2005-05-09 15:15:25 +02:00
unknown
47808ddf69 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-05-09 17:01:23 +04:00
unknown
47b7b7f8e1 Merge bk-internal:/home/bk/mysql-5.0 
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-5.0
 2005-05-09 14:59:57 +02:00
unknown
818e3ef30a bug#10471 - ndb - potential inconsistent backup 
whith some multi update scenarios

  Make sure to init GCI on correct operation before firering operation


ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Init gci, to make sure that fire_trig_ord gets correct GCI
 2005-05-09 14:59:49 +02:00
unknown
8dffe2cdc6 make_binary_distribution.sh: 
- Add --machine override


scripts/make_binary_distribution.sh:
  - Add --machine override
 2005-05-09 14:57:45 +02:00
unknown
b7b8537a59 Fixes after review 
BUILD/check-cpu:
  Change variable name
  Add missing fi
  Test with -n instead of -z
 2005-05-09 14:49:27 +02:00
unknown
2e9ce665b3 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-09 05:30:11 -07:00
unknown
cb598b10f0 Manual merge of fix for bug #9913 into 5.0 tree. 
mysql-test/t/range.test:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge.
mysql-test/t/mysqldump.test:
  Manual merge.
 2005-05-09 16:21:57 +04:00
unknown
b3d194f252 Merge mysql.com:/home/hf/work/mysql-5.0.clean 
into mysql.com:/home/hf/work/mysql-5.0.emb
 2005-05-09 17:11:37 +05:00
unknown
59f6cf25f5 Fix for bug #9632 (strict.test fails in -embedded-server mode) 
libmysqld/libmysqld.c:
  we need this code before we create thd instance
sql/sql_parse.cc:
  dispatch_command is the more appropriate place for this code
 2005-05-09 16:26:06 +05:00
unknown
d6f7a337e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-09 12:48:32 +02:00
unknown
a91c804054 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
 2005-05-09 12:16:59 +02:00
unknown
12a3eb4dc8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-05-09 12:16:58 +02:00
unknown
24dcd86d5e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-09 15:07:29 +05:00
unknown
17297898c5 Merge bk-internal:/home/bk/mysql-5.0 
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-5.0
 2005-05-09 12:07:28 +02:00
unknown
1ccfed7d21 make_binary_distribution.sh: 
- Print the platform name for the build logs.


scripts/make_binary_distribution.sh:
  - Print the platform name for the build logs.
 2005-05-09 12:05:13 +02:00
unknown
81c5344609 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


include/my_global.h:
  Auto merged
 2005-05-09 11:31:27 +02:00
unknown
61b5eb0d99 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


include/my_global.h:
  Auto merged
 2005-05-09 11:31:14 +02:00
unknown
a028af0872 Merge mysql.com:/home/jimw/my/mysql-4.1-10435 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-09 02:30:25 -07:00