serg@serg.mylan
eb5dfbe3ac
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-29 14:58:03 +02:00
serg@serg.mylan
1400111205
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-29 14:56:11 +02:00
bar@mysql.com
e8b86b0410
type_bit.result:
...
after merge fix
,
2005-03-29 17:41:17 +05:00
bar@mysql.com
7131f313be
after merge fix
2005-03-29 17:37:10 +05:00
bar@mysql.com
6d3f944d80
merge
2005-03-29 17:24:26 +05:00
petr@mysql.com
97bd09e1c2
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-03-29 16:16:12 +04:00
petr@mysql.com
e57534e64b
more merge fixes
2005-03-29 16:15:22 +04:00
serg@serg.mylan
0eb073ee5f
update results
2005-03-29 13:57:15 +02:00
bar@mysql.com
5085f368f8
ctype-utf8.c, ctype-sjis.c:
...
Safer and mode readable way.
2005-03-29 16:23:44 +05:00
bar@mysql.com
4a848d3675
ctype-big5.c:
...
More readable and safer way.
2005-03-29 16:19:31 +05:00
bar@mysql.com
ba115894c5
Better error message.
...
Bugs#9057: Incorrect errormsg for too-large char field in table definition
2005-03-29 15:43:00 +05:00
konstantin@mysql.com
2115900460
Remove redundant my_security_attr_free() from
...
handle_connections_shared_memory (double free spotted by Monty).
2005-03-29 14:30:34 +04:00
kent@mysql.com
65294b3ba6
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-29 12:08:14 +02:00
monty@mysql.com
c4467b817d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-29 12:58:31 +03:00
petr@mysql.com
7428d7ee25
manual merge
2005-03-29 13:55:11 +04:00
bar@mysql.com
396bbdbee5
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2005-03-29 14:49:33 +05:00
bar@mysql.com
2d1e9862bc
Adding Cybozu's patch.
...
Not active by default.
One need to pass -DHAVE_CYBOZU_COLLATION to
activate it.
2005-03-29 14:48:47 +05:00
monty@mysql.com
dd4b0710dd
Cleanups during review
2005-03-29 12:37:36 +03:00
petr@mysql.com
28a02c9bd0
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/cps/mysql/trees/mysql-4.1
2005-03-29 11:58:34 +04:00
kent@mysql.com
d917683515
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-29 08:06:43 +02:00
kent@mysql.com
0544c68e1c
mysql-test-run.pl:
...
Corrected typo
mtr_diff.pl:
A simplified unified diff in Perl
new file
2005-03-29 07:29:38 +02:00
pekka@mysql.com
727015dbb3
Merge
2005-03-28 23:06:19 +02:00
pekka@mysql.com
a259bcebd7
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2005-03-28 22:56:40 +02:00
pekka@mysql.com
5dea61b879
ndb - set up long key page vars in ACC_LOCKREQ (bug#????)
2005-03-28 22:55:32 +02:00
reggie@mdk10.(none)
04b3c901d6
Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent'
...
My code in get_actual_tablename was not checking to make sure SHOW TABLES LIKE % was returning rows. Now I check that the resultset is not null and has at least 1 row before I process the table.
mysqldump.c:
Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows
2005-03-28 13:06:43 -06:00
serg@serg.mylan
55d3d94c3b
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-28 13:56:27 +02:00
pekka@mysql.com
2a428a1af9
Merge mysql.com:/export/space/pekka/ndb/version/my41
...
into mysql.com:/export/space/pekka/ndb/version/my50
2005-03-28 11:52:16 +02:00
pekka@mysql.com
42a641ffde
ndb - make printSchemaFile available (compile manually)
2005-03-28 11:51:31 +02:00
bar@eagle.intranet.mysql.r18.ru
f0d41136df
Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
...
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-28 14:23:03 +05:00
bar@mysql.com
9852c6a082
union.test:
...
Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
Prove that this problem was fixed with bug9425 fix too.
2005-03-28 14:17:47 +05:00
bar@eagle.intranet.mysql.r18.ru
8e028d2f88
item_func.cc:
...
Post merge additional fix for DECIMAL type:
Bugs: #9425 : A user variable doesn't always have implicit coercibility
2005-03-28 14:15:43 +05:00
bar@eagle.intranet.mysql.r18.ru
ef81035ff4
Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
...
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-28 14:08:25 +05:00
bar@mysql.com
e60daecc87
Bug#9425 A user variable doesn't always have implicit coercibility
...
Coercibility fixes for numeric types and not defined values were done.
2005-03-28 14:01:57 +05:00
serg@serg.mylan
a2f7cceb82
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-28 10:20:41 +02:00
bar@eagle.intranet.mysql.r18.ru
d19fff495b
Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
...
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-28 12:34:00 +05:00
bar@mysql.com
06bcfe8886
func_system.test, ctype_utf8.test, func_system.result, ctype_utf8.result:
...
Prove that the queries mentioned in
Bugs#5980: NULL requires a characterset in a union
works fine after recent changes related to itroducing
more coercibility level: IRNORABLE and SYSCONST.
2005-03-28 12:24:12 +05:00
serg@serg.mylan
a2ad96cf9e
more wild_compare tests
2005-03-27 15:46:06 +02:00
serg@serg.mylan
8207241882
merged
2005-03-26 20:15:18 +01:00
serg@serg.mylan
2dd1847bc2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-26 19:49:24 +01:00
serg@serg.mylan
b100adf750
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-03-26 19:49:17 +01:00
serg@serg.mylan
72c9ac844b
fixes for "backport wild_compare fix from 4.1 - bug#3924"
2005-03-26 19:46:42 +01:00
gbichot@quadita2.mysql.com
e207736b84
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-03-26 19:20:13 +01:00
konstantin@mysql.com
eeeedd31b9
Manual merge
2005-03-26 01:44:54 +03:00
konstantin@mysql.com
ff8017f0d3
A fix for Bug#8226 "Cannot connect via shared memory":
...
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
2005-03-26 01:21:52 +03:00
brian@zim.(none)
aa44d86235
fixed conflict making embedded server with libmysqld
2005-03-25 14:12:46 -08:00
brian@zim.(none)
013c2ed3be
Fixing blackhole support in libmysqld
2005-03-25 14:09:19 -08:00
brian@zim.(none)
8e50a98e71
Adding rules for building blackhole, also updating test case.
2005-03-25 13:43:42 -08:00
brian@zim.(none)
3d2554bcef
Resolving merge.
2005-03-25 12:39:16 -08:00
brian@zim.(none)
89838b1ebc
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-03-25 12:37:24 -08:00
brian@zim.(none)
0c21adf370
Fix upgrade/downgrade issue.
2005-03-25 12:36:04 -08:00
