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
serg@serg.mylan
79573a5ee8
after merge fixes
2005-03-09 19:22:30 +01:00
serg@serg.mylan
956682de1a
merged
2005-03-09 14:09:06 +01:00
joerg@mysql.com
b2c4d73997
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-03-08 17:35:53 +01:00
joerg@mysql.com
3bbc35ac01
Merge changes.
2005-03-08 17:24:07 +01: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
serg@serg.mylan
d6fa7288c8
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-07 14:28:10 +01:00
joerg@mysql.com
792d401981
Merge 4.0.24 compile changes into the 4.1 tree.
2005-03-07 10:28:56 +01: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
serg@serg.mylan
2b447eceb1
myisam/ft_parser.c
...
protection against invalid string in ft_get_word
mysys/my_symlink2.c
typo fixed
2005-03-06 12:31:40 +01:00
joerg@mysql.com
4e136e8d1a
Please the Sun C compiler by qualifying 'inline' as 'static inline'.
2005-03-04 12:31:30 +01:00
ingo@mysql.com
212388bd3c
Merge with after merge fix
2005-03-04 11:37:45 +01:00
joerg@mysql.com
6ccbe89d52
Qualify 'inline' functions as 'static inline' to please the Sun C compiler.
2005-03-04 11:26:08 +01:00
serg@serg.mylan
f2c414e024
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-04 00:05:52 +01:00
jimw@mysql.com
f7c01cfb76
Merged from 4.1
2005-03-03 15:01:46 -08:00
serg@serg.mylan
e47d0a0e2d
merge
2005-03-03 23:07:20 +01:00
serg@serg.mylan
45641ff65c
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-03-03 21:13:57 +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
jimw@mysql.com
9df04058fe
Merge mysql.com:/home/jimw/my/mysql-4.1-8707
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-03 10:50:18 -08: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
serg@serg.mylan
60e1c869f5
workaround for a bug removed
2005-03-02 15:29:46 +01:00
reggie@mdk10.(none)
1c45844a22
my_mmap.c:
...
Changed #warning pragma at the bottom to only occur when being used on non-Windows OS
2005-03-01 05:54:48 -06: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
petr@mysql.com
053f2fcb7d
fix compilation failure on sunfire280
2005-03-01 01:38:04 +03:00
monty@mysql.com
3839e443a4
merge with 4.1
2005-02-28 12:18:39 +02:00
monty@mysql.com
253bfcf783
Fixed wrong memory references found by purify
...
(No really critical errors found, but a few possible wrong results)
2005-02-28 11:59:46 +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
monty@mysql.com
7e5f74f8f2
Merge with global tree
2005-02-25 17:12:06 +02:00
ramil@mysql.com
4ab10bcedf
merge
2005-02-25 16:34:17 +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
reggie@mdk10.(none)
2ffd3a3a61
Changes to allow 5.0.3 to compile on Windows after XA was pushed
...
logging_ok:
Logging to logging@openlogging.org accepted
mi_packrec.c:
Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
mi_extra.c:
Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
my_mmap.c:
Changed how no mmap message is printed for Windows
sql_map.cc:
Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap
2005-02-23 16:29:03 -06:00
jimw@mysql.com
3ecabaa9f7
Don't try to create a symlink if the DATA DIRECTORY specified for a table
...
is the same as the normal datadir for that database. (Bug #8707 )
2005-02-23 13:59:04 -08:00
bar@mysql.com
a88af6c1dd
Merge
2005-02-23 17:03:34 +04:00
monty@mysql.com
e2ea35ec67
Merge with 4.1
2005-02-22 15:47:00 +02: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
bar@mysql.com
c0230f6f5f
ctype_latin1.result, ctype_latin1.test, charset.c:
...
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
2005-02-22 09:56:07 +04: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
petr@mysql.com
451de5dbfb
merge
2005-02-19 02:22:05 +03:00
petr@mysql.com
dbc0937dd0
made IM to work with --defaults-file smoothly
2005-02-18 14:58:30 +03:00
serg@serg.mylan
c0dda01f76
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 12:02:46 +01:00
bar@mysql.com
dcb0f52e9a
Merge: don't add this into configure in as it is already in
...
config/ac-macros/character_sets.m4
2005-02-18 13:21:30 +04:00
bar@mysql.com
c926e43f65
A way not to compile UCA collations
2005-02-18 12:58:16 +04:00
jimw@mysql.com
7eb8c130f7
Merge
2005-02-17 16:16:58 -08:00
jimw@mysql.com
e2291bdc7e
Only escape the first character in a sequence of bytes that appears to be
...
a multibyte character, but was not a valid multibyte character. Refinement
of fix for Bug #8378 .
2005-02-15 11:31:01 -08:00
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
monty@mysql.com
a1a39fab84
Merge with 4.1
2005-02-10 02:27:37 +02:00
jimw@mysql.com
5bb39302ab
When escaping a string in a multi-byte character set, escape all bytes of
...
a character that appears to be a multi-byte character based on its first
byte, but is not actually a valid multi-byte character. (Bug #8378 )
2005-02-09 16:14:13 -08:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb
Applied a patch for Netware.
2005-02-08 19:49:40 +02:00
