marko@hundin.mysql.fi
f18796bc51
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-07-26 23:15:12 +03:00
bar@mysql.com
92e7d181f9
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12109
2005-07-26 16:48:32 +05:00
bar@mysql.com
637ec56206
ctype-big5.c:
...
ctype-cp932.c:
ctype-gbk.c:
ctype-mb.c:
ctype-simple.c:
ctype-sjis.c:
ctype-ucs2.c:
ctype-ujis.c:
ctype-utf8.c:
Adding explicit cast to return type
in pointer substructions to avoid
warnings from some compilers.
2005-07-26 16:38:10 +05:00
marko@hundin.mysql.fi
a89939c8e7
InnoDB: Do not flush after each write, not even when creating the
...
data files. Previously, writes were flushed until the doublewrite
buffer was created. That would be too slow on systems where
os_file_flush() [or fsync(2)] is slow. (Bug #12125 )
2005-07-26 14:03:34 +03:00
bar@mysql.com
31b1bdc52a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b10201
2005-07-26 12:53:06 +05:00
bar@mysql.com
0c2035b7bd
func_gconcat.result, func_gconcat.test:
...
Adding test
item_sum.cc:
Adding a call for collation/charset aggregation,
to collect attributes from the arguments. The actual bug fix.
item_func.h, item_func.cc, item.h, item.cc:
- Removing collation aggrgation functions from Item_func class
in item.cc, and adding it as non-class functions in item.cc
to be able to reuse this code for group_concat.
- Adding replacement for these functions into Item_func class
as wrappers for moved functions, to minizize patch size,
2005-07-26 12:52:02 +05:00
joreland@mysql.com
d3567611c6
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-26 08:02:23 +02:00
joreland@mysql.com
be8d46028f
ndb_config test requires ndb
2005-07-26 07:59:10 +02:00
bar@mysql.com
975b4969a5
charset.c:
...
Bug#12109 possible locking bug in init_available_charset
Recheck charset_initialized inside locked code,
to garantee two threads are not entering
consequently.
2005-07-25 21:34:20 +05:00
lenz@mysql.com
ef3bc773db
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-07-25 15:22:42 +02:00
lenz@mysql.com
5dc9a48594
Merge mysql.com:/space/my/mysql-4.1-merge
...
into mysql.com:/space/my/mysql-4.1
2005-07-25 15:19:27 +02:00
lenz@mysql.com
0c30acae32
- merge from 4.0: updated scripts/Makefile.am to properly create but not install
...
make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
- removed make_win_binary_distribution.sh
2005-07-25 14:39:23 +02:00
lenz@mysql.com
d9bacfa236
- Make sure the scripts make_binary_distribution, make_sharedlib_distribution and
...
make_win_src_distribution are created, but not installed
- removed make_win_binary_distribution.sh as it's obsolete and outdated
2005-07-25 14:14:24 +02:00
joreland@mysql.com
ca6eb7c70a
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 13:48:34 +02:00
joreland@mysql.com
0cd9e2e269
fix compile error
2005-07-25 13:47:40 +02:00
joreland@mysql.com
01f5d4effd
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 12:48:24 +02:00
joreland@mysql.com
7040b3277a
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 12:42:32 +02:00
joreland@mysql.com
07cdfdca69
ndb - Fix LCP during SR parameters
2005-07-25 12:41:25 +02:00
georg@lmy002.wdf.sap.corp
5498a13751
fix for bug #7924 .
...
added export symbols mysql_server_init and
mysql_server_end to allow client to connect to external and embedded
server using the same code (required for Connector/OO.org). (Backport from 5.0 - cs. 1.35)
2005-07-25 07:51:17 +02:00
joreland@mysql.com
b285050e52
ndb - add mysql-test-run test case for ndb_config
2005-07-24 17:35:39 +02:00
joreland@mysql.com
5490cdfb24
Add tool to extract config info from ndb_mgmd
2005-07-23 12:06:02 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ca0803a024
Undefined RINT for Netware.
2005-07-23 01:11:29 +03:00
jimw@mysql.com
535ba76b98
Merge mysql.com:/home/jimw/my/mysql-4.1-10407
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-22 11:57:34 -07:00
jimw@mysql.com
e26a344d19
Fix calculation for length of LPAD() and RPAD() reported to
...
client via mysql_fetch_fields(). (Bug #11311 )
2005-07-22 11:46:29 -07:00
bar@mysql.com
44a446dc07
ctype-gbk.c:
...
Bug #11987
mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
Allow to store and retrieve even unassigned GBK codes.
Like we did in Big5 earlier.
have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
new file
2005-07-22 21:06:02 +05:00
bar@mysql.com
a7e5fa4d83
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b11754
2005-07-22 15:33:13 +05:00
stewart@mysql.com
6d8e118f3c
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/stewart/Documents/MySQL/4.0/main
2005-07-22 19:53:32 +10:00
stewart@mysql.com
614c6cd8ef
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-07-22 19:49:50 +10:00
bar@mysql.com
4d75b059c0
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b11754
2005-07-22 13:27:30 +05:00
hf@deer.(none)
62aad2bcd0
merging
2005-07-22 12:15:09 +05:00
hf@deer.(none)
5efe010f8a
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.clean
2005-07-22 12:01:28 +05:00
jimw@mysql.com
6eae678f56
Fix error message generated when trying to create a table in a
...
non-existent database. (Bug #10407 )
2005-07-21 20:08:54 -07:00
stewart@mysql.com
71215f68e5
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/stewart/Documents/MySQL/4.0/main
2005-07-22 12:52:06 +10:00
stewart@mysql.com
49c157d073
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-07-22 11:32:03 +10:00
hf@deer.(none)
ea81d5eaa3
Fix for bug #12042 (User breakpoints calling free() in embedded library)
2005-07-21 17:17:46 +05:00
bar@mysql.com
bd35a72d8a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b11216
2005-07-21 16:43:06 +05:00
joreland@mysql.com
d9f7fbe73f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 13:27:09 +02:00
bar@mysql.com
6d912fb2ac
ctype-latin1.c:
...
removing extra empty line
,
2005-07-21 16:19:08 +05:00
bar@mysql.com
6a97af8a02
Bug#11216: 'show character set' describes latin1 incorrectly
...
Index.xml:
Fixing latin1 comment:
it is actually cp1252, not iso-8859-1
ctype_latin1.result:
changeing test results accordingly.
ctype-latin1.c:
Fixed to- and from-Unicode conversion maps
for better Unicode round trip of undefined
characters.
2005-07-21 16:05:19 +05:00
lenz@mysql.com
7f758438c8
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-07-21 12:55:39 +02:00
joreland@mysql.com
12d6820834
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 12:43:38 +02:00
joreland@mysql.com
5939b37f29
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 11:15:44 +02:00
joreland@mysql.com
a7830ed93c
bug#11942 - ndb - backup during DDL
...
fix bug introduced in alter table
2005-07-21 11:13:07 +02:00
lenz@mysql.com
9f5e591f37
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0
2005-07-21 10:15:28 +02:00
lenz@mysql.com
1a305963b7
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-07-21 10:15:08 +02:00
bar@mysql.com
b11e78381a
ctype-cp932.c:
...
After backporting from 5.0 fix.
There is no an extra argument in 4.1.
2005-07-21 13:10:27 +05:00
joreland@mysql.com
99744a9fd8
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 09:35:42 +02:00
lenz@mysql.com
805ff29108
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2005-07-21 09:12:49 +02:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ac6623f08f
Fix merge
2005-07-20 22:30:34 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
9663b9a974
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
2005-07-20 21:58:33 -04:00