mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19046 commits 2778 branches 343 tags 1.6 GiB
Commit graph

19046 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
277a557e45 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
 2005-01-21 18:07:22 +01:00
unknown
a3f7796dd9 Bug#8070 
corrected possible unalignment in NdbRecAttr access methods
 2005-01-21 17:57:44 +01:00
unknown
5b5f5071ea Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-21 17:50:58 +01:00
unknown
11a37f4775 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-21 14:41:01 +01:00
unknown
90f9479098 sql_show.cc: 
#7943: Wrong prefix lengths reported on UTF-8 columns
  after merge fix.


sql/sql_show.cc:
  #7943: Wrong prefix lengths reported on UTF-8 columns
  after merge fix.
 2005-01-21 17:00:14 +04:00
unknown
7a13309132 merge bug##7943: Wrong prefix lengths reported on UTF-8 columns 
mysql-test/r/ctype_mb.result:
  Auto merged
sql/sql_show.cc:
  merge
 2005-01-21 16:55:17 +04:00
unknown
f813e0dac0 Bug#7943: Wrong prefix lengths reported on UTF-8 columns 
SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.
 2005-01-21 16:49:20 +04:00
unknown
92be4551cb Fix weird link error on sol9x86 
- use incremental linker


configure.in:
  Fix weird link error on sol9x86
 2005-01-21 13:16:46 +01:00
unknown
7063399ee4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-21 12:18:24 +01:00
unknown
eaec73c3be enabled adding option to ndb_mgm in mysql test run 2005-01-21 12:15:14 +01:00
unknown
d29c45330c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999


sql/share/errmsg.txt:
  Auto merged
 2005-01-21 12:10:19 +04:00
unknown
580bd979cd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-21 08:41:39 +01:00
unknown
4c0a0c3e56 moved START_AND_EXIT check so it can actually be used 
fix as not to overwrite previoulsy set flags in configure


config/ac-macros/ha_ndbcluster.m4:
  fix as not to overwrite previoulsy set flags in configure
configure.in:
  fix as not to overwrite previoulsy set flags in configure
mysql-test/mysql-test-run.sh:
  movet START_AND_EXIT check so it can actually be used
 2005-01-21 08:41:38 +01:00
unknown
a1b6bd5adc Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
 2005-01-21 08:30:21 +01:00
unknown
4bfad5aedb bug#8051 - ndb, typo, more info on crash 
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  typo
 2005-01-21 08:28:23 +01:00
unknown
7a3767fc5e Bug#8051 - ndb 
Make sure to ship error code in system error signal
 2005-01-21 07:53:02 +01:00
unknown
43abffc89b 2005-01-20 23:23:15 +01:00
unknown
d69fcc2e05 ha_ndbcluster.cc: 
read row size with wrong type


sql/ha_ndbcluster.cc:
  read row size with wrong type
 2005-01-20 22:28:08 +01:00
unknown
1cdaf36c2a ndb_autodiscover.result, ndb_autodiscover.test: 
removed this since it easily gives errors if previous tests fail


mysql-test/t/ndb_autodiscover.test:
  removed this since it easily gives errors if previous tests fail
mysql-test/r/ndb_autodiscover.result:
  removed this since it easily gives errors if previous tests fail
 2005-01-20 21:26:58 +01:00
unknown
f1fa487f0a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-20 20:51:20 +01:00
unknown
fb95d7421c mgmapi.cpp: 
compile error


ndb/src/mgmapi/mgmapi.cpp:
  compile error
 2005-01-20 20:51:19 +01:00
unknown
a6ad682405 mysql-test-run.sh: 
skip ndbcluster start failure if --force given


mysql-test/mysql-test-run.sh:
  skip ndbcluster start failure if --force given
 2005-01-20 20:27:17 +01:00
unknown
f7893fcc0c Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-20 19:54:17 +01:00
unknown
5002b603a6 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-wl2126-fix
 2005-01-20 20:57:30 +03:00
unknown
e467388754 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
 2005-01-20 16:41:08 +01:00
unknown
d4b9b95ee4 NdbDictionaryImpl.cpp: 
corrected bug when looking at dist keys in create table


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  corrected bug when looking at dist keys in create table
 2005-01-20 16:41:07 +01:00
unknown
48c669eecd Fix for Bug #7988 Bitfield test fails 2005-01-20 15:50:56 +01:00
unknown
ea6e5d1b57 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


mysql-test/r/ndb_autodiscover.result:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2005-01-20 15:37:27 +01:00
unknown
2e077d6061 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
 2005-01-20 15:21:00 +01:00
unknown
aea5775c56 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-20 14:16:29 +01:00
unknown
12d1ee5473 added variable NDB_MGM to be able to run the management client in tests 
added testcase for Bug#8035
    added option to wait for not-started
    Bug#8035


mysql-test/mysql-test-run.sh:
  added variable NDB_MGM to be able to run the management client in tests
mysql-test/r/ndb_autodiscover.result:
  added testcase for Bug#8035
mysql-test/t/ndb_autodiscover.test:
  added testcase for Bug#8035
ndb/tools/waiter.cpp:
  added option to wait for not-started
sql/lock.cc:
  Bug#8035
 2005-01-20 13:45:42 +01:00
unknown
95bf833e5d Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/func_in.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
 2005-01-20 16:08:27 +04:00
unknown
aa2eb4e009 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-20 12:40:42 +01:00
unknown
9241e34593 item_cmpfunc.cc: 
Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.


sql/item_cmpfunc.cc:
  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.
 2005-01-20 15:38:56 +04:00
unknown
59a68b8964 errmsg.txt: 
Adding Shift-JIS error messages
  for Japanese Windows distributions.
  Thanks to Serg for help with a perl program 
  to merge 4.1 messages into 5.0 format :)


sql/share/errmsg.txt:
  Adding Shift-JIS error messages
  for Japanese Windows distributions.
  Thanks Serg for help :)
 2005-01-20 15:33:21 +04:00
unknown
f4d40b1bcb Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2005-01-20 12:30:15 +01:00
unknown
d07dc11fa4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-01-20 12:27:33 +01:00
unknown
2ac6a8f757 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-01-20 12:21:10 +01:00
unknown
877ed48b3d bug#8010 - ndb 
release connections when last op was simple read


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#8010
    release connections when last op was simple read
 2005-01-20 12:19:48 +01:00
unknown
933d80d4ff Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-01-20 12:09:17 +01:00
unknown
89a24f9335 - Improved Do-rpm to perform RPM builds inside of a chrooted build 
environment (using "build" on SUSE Linux)


Build-tools/Do-rpm:
  - added functionality to perform RPM builds inside of a chrooted build
    environment (using "build" on SUSE Linux) - see "--help" for more details
 2005-01-20 12:07:44 +01:00
unknown
0a91d24f45 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-20 14:36:40 +04:00
unknown
6e5585fe9e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-20 14:22:02 +04:00
unknown
af23c2b34a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-20 10:47:42 +01:00
unknown
e52c48bb7d Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-20 10:13:45 +01:00
unknown
9ff491503e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-20 10:12:48 +01:00
unknown
25d215aa24 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-01-20 10:12:26 +01:00
unknown
968c24761a Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0


BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Auto merged
 2005-01-20 13:12:16 +04:00
unknown
a242d57436 errmsg.txt: 
Minor fix after character set conversion.


sql/share/japanese-sjis/errmsg.txt:
  Minor fix after character set conversion.
 2005-01-20 13:08:16 +04:00
unknown
80e5a7e8cf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-20 11:57:30 +03:00