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

19327 commits

This branch
This branch
All branches
Author SHA1 Message Date
joreland@mysql.com
6ac2e2af4d Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-20 20:51:21 +01:00
joreland@mysql.com
abd6afa9af 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
tomas@poseidon.ndb.mysql.com
1b753dd535 mgmapi.cpp: 
compile error
 2005-01-20 20:51:19 +01:00
joreland@mysql.com
d34cc94185 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-20 20:46:11 +01:00
tomas@poseidon.ndb.mysql.com
ef054b9142 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-20 20:46:10 +01:00
tomas@poseidon.ndb.mysql.com
39c9f50ac9 mysql-test-run.sh: 
skip ndbcluster start failure if --force given
 2005-01-20 20:27:17 +01:00
tomas@poseidon.ndb.mysql.com
ee308b78ab Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-20 20:21:50 +01:00
tomas@poseidon.ndb.mysql.com
be31bce977 Merge tulin@bk-internal.mysql.com:/home/bk/wl2299 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-20 20:16:10 +01:00
joreland@mysql.com
d168651e9c Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-20 19:54:59 +01:00
joreland@mysql.com
de2bbb3018 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
joreland@mysql.com
da275f1738 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-20 19:44:34 +01:00
sergefp@mysql.com
2113675cbc 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
heikki@hundin.mysql.fi
c1e5f61be1 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-01-20 19:01:44 +02:00
lenz@mysql.com
e456b6c086 - fixed one missing occasion from the mysql_client_test renaming 2005-01-20 17:00:30 +01:00
ingo@mysql.com
9bf63b1436 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-20 16:41:09 +01:00
mskold@mysql.com
d959e2ab40 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-20 16:41:08 +01:00
tomas@poseidon.ndb.mysql.com
050be0de87 NdbDictionaryImpl.cpp: 
corrected bug when looking at dist keys in create table
 2005-01-20 16:41:07 +01:00
lenz@mysql.com
9675b0698f - renamed client_test -> mysql_client_test 
- renamed the tests that use the embedded server (client_test -> 
  mysql_client_test_embedded, mysqltest -> mysql_test_embedded
  and changed some Makefiles and scripts so they are installed in $bindir
  (required to be able to run the test suite against the embedded server)
 2005-01-20 16:25:38 +01:00
ingo@mysql.com
f5d36349a9 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-20 16:20:34 +01:00
mskold@mysql.com
44a511a191 Fix for Bug #7988 Bitfield test fails 2005-01-20 15:50:56 +01:00
tomas@poseidon.ndb.mysql.com
86197400bc Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-20 15:37:27 +01:00
tomas@poseidon.ndb.mysql.com
dd6958eb20 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-20 15:21:00 +01:00
kent@mysql.com
7885d70b88 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
ingo@mysql.com
bd24018f34 BUG#6034 - Error code 124: Wrong medium type 
Merged a different solution from 4.1 to 5.0.
Unexplainable diffs.
 2005-01-20 14:14:51 +01:00
tomas@poseidon.ndb.mysql.com
ac53ecce1c 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
 2005-01-20 13:45:42 +01:00
bar@mysql.com
6b5c7c7290 Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-20 16:08:27 +04:00
ingo@mysql.com
4bff1b05fd BUG#6034 - Error code 124: Wrong medium type 
Completely recoded the bugfix for 4.1.
This is just a merge changeset.
 2005-01-20 12:48:46 +01:00
kent@mysql.com
f4cdb433c6 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
bar@mysql.com
ca48cfbfcc 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
bar@mysql.com
5ed1b14464 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 :)
 2005-01-20 15:33:21 +04:00
joreland@mysql.com
e6791ba5ac Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-20 12:30:15 +01:00
joreland@mysql.com
187dce645b 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
lenz@mysql.com
2900199727 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-01-20 12:21:10 +01:00
joreland@mysql.com
e49de25171 bug#8010 - ndb 
release connections when last op was simple read
 2005-01-20 12:19:48 +01:00
lenz@mysql.com
4b0a82487f Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-01-20 12:09:17 +01:00
lenz@mysql.com
3215550735 - Improved Do-rpm to perform RPM builds inside of a chrooted build 
environment (using "build" on SUSE Linux)
 2005-01-20 12:07:44 +01:00
bar@mysql.com
1d6ce096a6 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
ram@gw.mysql.r18.ru
dfe8132fb4 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
lenz@mysql.com
98e7e2b439 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
joreland@mysql.com
bca4f68773 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
joreland@mysql.com
a27e3d1a3f 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
joreland@mysql.com
8f0cdf54ee 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
bar@mysql.com
ee9ed940b7 Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-20 13:12:16 +04:00
bar@mysql.com
07be090e6e errmsg.txt: 
Minor fix after character set conversion.
 2005-01-20 13:08:16 +04:00
sergefp@mysql.com
a5a99cf7a9 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
ram@gw.mysql.r18.ru
c397751373 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 12:56:18 +04:00
joreland@mysql.com
b0e888fd8f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-20 09:55:09 +01:00
joreland@mysql.com
670de075ff Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-01-20 09:53:29 +01:00
bar@mysql.com
0afb9b244a configure.in: 
Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.
.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt
 2005-01-20 12:44:33 +04:00
bar@mysql.com
c1d40baf18 Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-20 12:42:08 +04:00