ramil@mysql.com
e9dbf09dfc
Merge
2005-03-30 17:07:40 +05:00
serg@serg.mylan
1b4a815637
Fedora now defines read(2)/write(2) as macros.
...
Argh!
2005-03-29 23:31:56 +02: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
serg@serg.mylan
e029e3eb61
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-22 16:11:43 +01:00
heikki@hundin.mysql.fi
2aa44dd98d
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-21 22:29:02 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
a34ee2c900
A fix for Netware.
2005-03-21 18:11:11 +02:00
konstantin@mysql.com
d5af61b1a0
Rename decimal -> decimal_t, decimal_digit -> decimal_digit_t
2005-03-21 15:58:34 +03:00
serg@serg.mylan
54fc6fbfe8
set _XOPEN_SOURCE differently depending on __STDC_VERSION__
...
[sigh]
2005-03-18 14:59:07 +01:00
serg@serg.mylan
5e4944126d
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-17 17:00:31 +01:00
gluh@gluh.mysql.r18.ru
b435d6e862
Merge 4.1 -> 5.0
2005-03-17 16:51:07 +03:00
serg@serg.mylan
376a4ee03b
Field::quote_data():
...
don't call escape_string_for_mysql() unnecesary
don't overwrite local buffer
escape_string_for_mysql():
take a length of the destination buffer as an argument
2005-03-17 12:27:45 +01:00
monty@mysql.com
fde941e5b4
Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way
2005-03-16 01:15:45 +02:00
serg@serg.mylan
ed9c9732c9
sun forte does not define __sun__, only __sun and sun (gcc defines all the three)
2005-03-15 18:45:29 +01:00
serg@serg.mylan
caa29b4776
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-15 18:33:43 +01:00
serg@serg.mylan
10c06f257a
include/my_global.h
...
define _XOPEN_SOURCE=500 for solaris
include/my_sys.h
remove a cast
2005-03-15 18:31:56 +01:00
ramil@mysql.com
d5e3ba70f3
merging
2005-03-15 19:31:52 +04:00
ramil@mysql.com
46613bafbe
A fix (bug #8489 : Strange auto_increment behaviour with HEAP table).
2005-03-15 13:32:12 +04:00
jani@ua141d10.elisa.omakaista.fi
8db4423b8c
Fixed Bug#8922.
...
Reverted Jim's patch.
2005-03-08 18:12:12 +02:00
jimw@mysql.com
d22a4e70f9
Clean up merge
2005-03-07 13:26:27 -08:00
joerg@mysql.com
c45cfb7c07
Manual merge of the 4.0.24 compile changes into the 4.1 tree.
2005-03-07 10:27:20 +01:00
konstantin@mysql.com
0f1d024461
Porting of "buffered read" patch to 5.0 and post-review fixes.
...
The patch implements the idea suggested by Olaf van der Spek in
thread "Client: many small reads?" (internals@lists.mysql.com ).
Now small reads performed by the client library are buffered.
The buffering gives up to 2 times speedup when retrieving
one-column tables.
2005-03-06 00:10:08 +03:00
ingo@mysql.com
212388bd3c
Merge with after merge fix
2005-03-04 11:37:45 +01:00
joerg@mysql.com
631aac9d00
Prevent a collision with the system's '#define errno ...' by guarding the variable declaration.
2005-03-04 10:22:50 +01:00
serg@serg.mylan
e47d0a0e2d
merge
2005-03-03 23:07:20 +01:00
serg@serg.mylan
8d9a53a78c
Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
2005-03-03 19:51:29 +01:00
joerg@mysql.com
809b18e298
Prevent a collision with the system's '#define errno ...' by guarding the variable declaration.
2005-03-03 12:35:39 +01:00
jimw@mysql.com
2ca5cec8c2
Avoid calls to my_seek() and my_tell() on log files so that
...
non-seekable files like FIFOs can be used for logs other
than the binlog. (Bug #8271 )
2005-03-02 18:14:58 -08:00
petr@mysql.com
dfba6f4e9b
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/im-fix-review
2005-03-01 01:59:37 +03:00
monty@mysql.com
72b692e11f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-28 16:22:26 +02:00
monty@mysql.com
3839e443a4
merge with 4.1
2005-02-28 12:18:39 +02:00
petr@mysql.com
c193b3281d
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/im-fix-review
2005-02-27 18:53:11 +03:00
mskold@mysql.com
b9aa67bc76
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-26 16:15:36 +01:00
monty@mysql.com
7e5f74f8f2
Merge with global tree
2005-02-25 17:12:06 +02:00
ramil@mysql.com
dee22632f7
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b4802
2005-02-25 15:47:36 +04:00
monty@mysql.com
cd78e701a5
Show all generated warnings in SHOW ERROR
...
Previously we only stored the first given error (the error sent to the client)
2005-02-24 23:33:42 +02:00
joreland@mysql.com
2952f73c16
merge
2005-02-24 06:24:46 +01:00
mskold@mysql.com
07cdc9e334
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-23 20:08:21 +01:00
bell@52.0.168.192.in-addr.arpa
25e87cd6f7
Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
...
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-23 19:22:52 +02:00
mskold@mysql.com
364492239b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-23 15:54:22 +01:00
bar@mysql.com
a88af6c1dd
Merge
2005-02-23 17:03:34 +04:00
bar@mysql.com
4996daec19
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2005-02-23 16:29:01 +04:00
bar@mysql.com
99937c2b91
config-win.h:
...
Activate Unicode collations in Windows version.
2005-02-23 16:28:10 +04:00
serg@serg.mylan
a4dbb3b061
compatibility fixes, crashing tests
2005-02-22 15:22:37 +01:00
bar@mysql.com
5ef265f219
Bug#8349 myisamchk: --set-charset does not work
...
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message.
2005-02-22 16:37:25 +04:00
monty@mysql.com
e2dc9b4099
Backport my_strntod() from 5.0
...
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740 )
2005-02-22 12:51:23 +02:00
mskold@mysql.com
b3d3f73753
Merge
2005-02-21 16:13:29 +01:00
bell@51.0.168.192.in-addr.arpa
0ac11a0601
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-21 02:14:20 +02:00
petr@mysql.com
1e6bfa39c3
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/im-fix-review
2005-02-20 23:01:07 +03:00
serg@serg.mylan
1bc6ae8913
portability fixes
2005-02-20 20:08:33 +01:00