Commit graph

22185 commits

Author SHA1 Message Date
gshchepa/uchum@gleb.loc
0e8292c97c Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  gleb.loc:/home/uchum/work/bk/4.1-opt
2007-07-03 21:48:52 +05:00
gshchepa/uchum@gleb.loc
1f85dac21c loaddata.result, loaddata.test:
Test case update for bug #29294.
2007-07-03 21:45:20 +05:00
gshchepa/uchum@gleb.loc
5f5929846b sql_class.cc:
Windows compilation error fix.
2007-07-03 21:05:17 +05:00
gshchepa/uchum@gleb.loc
dbe4fb94ca Fixed bug #29294.
The `SELECT 'r' INTO OUTFILE ... FIELDS ENCLOSED BY 'r' ' statement
encoded the 'r' string to a 4 byte string of value x'725c7272'
(sequence of 4 characters: r\rr).
The LOAD DATA statement decoded this string to a 1 byte string of
value x'0d' (ASCII Carriage Return character) instead of the original
'r' character.
The same error also happened with the FIELDS ENCLOSED BY clause
followed by special characters: 'n', 't', 'r', 'b', '0', 'Z' and 'N'.

NOTE 1: This is a result of the undocumented feature: the LOAD DATA INFILE
recognises 2-byte input sequences like \n, \t, \r and \Z in addition
to documented 2-byte sequences: \0 and \N. This feature should be
documented (here backspace character is a default ESCAPED BY character,
in the real-life example it may be any ESCAPED BY character).

NOTE 2, changed behaviour:
Now the `SELECT INTO OUTFILE' statement with the `FIELDS ENCLOSED BY'
clause followed by one of: 'n', 't', 'r', 'b', '0', 'Z' or 'N' characters
encodes this special character itself by doubling it ('r' --> 'rr'),
not by prepending it with an escape character.
2007-07-03 19:37:46 +05:00
df@pippilotta.erinye.com
788176880f Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-29 09:51:09 +02:00
gshchepa/uchum@gleb.loc
f8bf427ba4 Fixed bug #29251.
Sometimes special 0 ENUM values was ALTERed to normal
empty string ENUM values.

Special 0 ENUM value has the same string representation
as normal ENUM value defined as '' (empty string).
The do_field_string function was used to convert
ENUM data at an ALTER TABLE request, but this
function doesn't care about numerical "indices" of
ENUM values, i.e. do_field_string doesn't distinguish
a special 0 value from an empty string value.

A new copy function called do_field_enum has been added to
copy special 0 ENUM values without conversion to an empty
string.
2007-06-27 03:41:50 +05:00
tsmith@maint1.mysql.com
2bfa624a52 Merge maint1.mysql.com:/data/localhome/tsmith/bk/41
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
2007-06-26 23:56:56 +02:00
gshchepa/uchum@gleb.loc
78e900dd92 Merge gleb.loc:/home/uchum/work/bk/4.1
into  gleb.loc:/home/uchum/work/bk/4.1-opt
2007-06-25 14:08:53 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
06eb3e2881 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/home/ram/work/b29079/b29079.4.1
2007-06-23 09:23:49 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
aabbd2fb69 Fix for bug #29079: Semantics of "bigint" depend on platform specifics (size, signedness of char ?)
Problem: long and long long types mess in a comparison may lead to wrong results on some platforms.
Fix: prefer [unsigned] long long as [u]longlong as it's used unconditionally in many places.
2007-06-22 17:12:40 +05:00
df@pippilotta.erinye.com
f5e622e72e Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-21 14:39:13 +02:00
gkodinov/kgeorge@magare.gmz
5966c565f0 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B29116-4.1-opt
2007-06-20 13:17:09 +03:00
gkodinov/kgeorge@magare.gmz
91f3301c03 Bug #29116: Test "rpl_change_master" returns different
counters from relay

Updated the test to return columns vertically.
2007-06-19 13:19:20 +03:00
msvensson@pilot.(none)
e003d8ad3b Merge bk-internal:/home/bk/mysql-4.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
2007-06-19 11:30:45 +02:00
msvensson@pilot.(none)
caebb719b2 WL#3232 mysqltest, enable --source $variables/<remaining_path_to_file>
- Add test case for this already existing feature
2007-06-19 11:06:02 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
5a9d6856de Bug #29117 (init_file test crashes with embedded server)
we use net->vio in my_net_local_init, but in the my_net_init
implementation we set it after the call, so work with unspecified
net->vio value
2007-06-19 11:13:11 +05:00
tsmith@maint1.mysql.com
b6bd61d4d4 Merge maint1.mysql.com:/data/localhome/tsmith/bk/41
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
2007-06-18 22:10:54 +02:00
joerg@trift2.
57853e7dfe Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build
into  trift2.:/MySQL/M41/push-4.1
2007-06-18 21:16:09 +02:00
df@pippilotta.erinye.com
1067f08ac9 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
2007-06-18 20:18:26 +02:00
df@pippilotta.erinye.com
94a3e239c5 don't use bk cset in commit e-mails 2007-06-18 20:13:33 +02:00
joerg@trift2.
1d09be3804 Merge trift2.:/MySQL/M41/clone-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-06-18 19:16:12 +02:00
joerg@trift2.
b9cc9dbb03 Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-06-18 11:25:26 +02:00
istruewing@chilla.local
52200be6d0 Merge chilla.local:/home/mydev/mysql-4.1-amain
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-06-15 16:24:43 +02:00
df@pippilotta.erinye.com
a4b4e550b5 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-15 09:28:37 +02:00
joerg@trift2.
b5c9cab55c Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-06-14 21:27:33 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
79062df3fb Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-06-14 16:35:46 +05:00
df@pippilotta.erinye.com
35413f161a fix. 2007-06-13 19:23:13 +02:00
df@pippilotta.erinye.com
9dc622e540 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
2007-06-13 15:13:54 +02:00
joerg@trift2.
a4a2c7202c Merge trift2.:/MySQL/M41/tmp-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-06-13 13:35:04 +02:00
joerg@trift2.
018a5d403b sql/item_func.cc
Improved check for thread identity in the "embedded" case,
    provided by Monty.
    
    This finishes the fixes for bug#27078.
2007-06-13 13:33:00 +02:00
df@pippilotta.erinye.com
51672e9598 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-13 12:58:56 +02:00
df@pippilotta.erinye.com
36ea2e3091 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-13 11:48:07 +02:00
df@pippilotta.erinye.com
320ec82616 BK changes for
https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally
2007-06-13 11:44:58 +02:00
msvensson@pilot.(none)
d2d4e66760 Bug#29065 mysql-test-run.pl aborts execution on missing log file from test tool
- Make tesingt continue even if test log file does not exists
2007-06-13 10:35:20 +02:00
cmiller@zippy.cornsilk.net
4c9af55908 Bug#28984: crasher on connect with out of range password length in \
protocol

Fixed duplicated code, same as last commit.

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.

Instead, cast the *passwd char to uchar.
2007-06-12 08:47:36 -04:00
joerg@trift2.
bd0b478e30 VC++Files/sql/mysqld.vcproj
Ensure ".pdb" and ".map" files are created for the MySQL server, in all configurations.
2007-06-12 10:25:24 +02:00
kent@mysql.com/c-554072d5.010-2112-6f72651.cust.bredbandsbolaget.se
425bbb3264 libmysqld.def:
Corrected name of mysql_thread_{init,end} (bug#29007)
2007-06-12 01:33:23 +02:00
istruewing@chilla.local
491e9d2292 Merge chilla.local:/home/mydev/mysql-4.1-amain
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-06-11 16:24:29 +02:00
kent@mysql.com/c-554072d5.010-2112-6f72651.cust.bredbandsbolaget.se
665c32a4ac mysqldemb.vcproj:
Added lots of missing files to make "mysqlserver.lib" complete (bug#29007)
mysql.sln:
  Let 'mysqlserver' project also depend on 'vio', else "vio.lib" will
  not be linked into the "mysqlserver.lib" static embedded lib (bug#29007)
2007-06-10 19:07:18 +02:00
cmiller@zippy.cornsilk.net
3ab51acf6a Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-06-08 16:52:40 -04:00
cmiller@zippy.cornsilk.net
a46744a49b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/41gca
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-release
2007-06-08 16:28:48 -04:00
cmiller@zippy.cornsilk.net
4584ac2c73 Bug #28984: crasher on connect with out of range password length in \
protocol

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.

Instead, cast the *passwd char to uchar.
2007-06-08 16:10:53 -04:00
joerg@trift2.
2d718ff1c2 Add a cast, needed by some platforms.
Still part of the fix for bug#27078.
2007-06-08 17:02:48 +02:00
joerg@trift2.
ab64b2f8f3 Do not use the "thd" pointer to identify a thread in the embedded lib,
but rather use the "thread_id" counter.

Fixes bug#27078:
Compile error: lib_sql.cc cast from 'THD*' to 'pthread_t' loses precision
2007-06-07 23:05:18 +02:00
joerg@trift2.
160b784a49 Merge trift2.:/MySQL/M41/bug23504-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-06-07 17:00:13 +02:00
joerg@trift2.
0d84c3f710 netware/*.def : Allocate 128K stack for all executables (bug#23504) 2007-06-07 12:59:31 +02:00
msvensson@pilot.(none)
65919873ff Merge pilot.(none):/data/msvensson/mysql/bug10218/my41-bug10218
into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
2007-06-07 09:21:20 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
e112a475bd Merge xiphis.org:/home/antony/work2/mysql-4.1-engines
into  xiphis.org:/home/antony/work2/mysql-4.1-engines.merge
2007-06-06 11:51:35 -07:00
joerg@trift2.
111212aa40 Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-06-06 20:10:52 +02:00
tsmith@quadxeon.mysql.com
75ed2c7d16 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
2007-06-06 19:00:15 +02:00