sasha@asksasha.com
f6f22df951
fix for BUG#12974: mysqld segfaults when depreciated option --sql-bin-update-same is used
2005-10-22 18:17:11 -06:00
pem@mysql.com
0647d280b3
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug13941/mysql-5.0
2005-10-21 14:51:51 +02:00
bar@mysql.com
b8e755ae0c
ctype_utf8.result:
...
After merge fix.
2005-10-21 16:58:10 +05:00
bar@mysql.com
321d833eef
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 16:53:50 +05:00
pem@mysql.com
1d5aeb51da
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug13941/mysql-5.0
2005-10-21 13:24:41 +02:00
bar@mysql.com
fc771accbf
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 16:24:40 +05:00
pem@mysql.com
c865f491ef
Post-review fix.
2005-10-21 13:08:00 +02:00
gluh@mysql.com
f921ca2830
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.14089
2005-10-21 14:42:00 +05:00
bar@mysql.com
a167ddc6e7
Bug#13233
...
select distinct char(column) fails with utf8
ctype_utf8.result, ctype_utf8.test:
Adding test case
sql_yacc.yy:
Adding new syntax.
item_strfunc.h:
Fixing wrong max_length calculation.
Also, adding CHAR(x USING charset),
for easier migrating from 4.1 to 5.0,
according to Monty's suggestion.
2005-10-21 14:41:56 +05:00
gluh@eagle.intranet.mysql.r18.ru
e8d52711ad
fix for bug#14089 FROM list subquery always fails when
...
information_schema is current database
skip the check of I_S tables if table is derived table
2005-10-21 13:14:54 +05:00
bar@mysql.com
612c0560a4
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12371
2005-10-21 11:55:46 +05:00
jonas@perch.ndb.mysql.com
c8ca75264c
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-10-21 06:43:33 +02:00
jonas@perch.ndb.mysql.com
6f3caecffd
bug#14199 - ndb leak of index opertaions in TC leading to error 288
2005-10-21 06:41:49 +02:00
andrey@lmy004.
38b2e56d9f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-bug12595-4
2005-10-21 04:07:17 +03:00
andrey@lmy004.
991b6f1440
fix for bug #12595 (ESCAPE must be exactly 1 character long)
...
ESCAPE has length of 1 if specified and sql_mode is NO_BACKSLASH_ESCAPES
or has length of 0 or 1 in every other situation.
(approved patch applied on a up-to-date tree re-commit)
2005-10-21 04:01:52 +03:00
petr@mysql.com
62317fb4ae
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-10-21 03:27:18 +04:00
petr@mysql.com
9e3d89b73e
Fix Bug#14107 (IM test failures on QNX)
...
(v.2 with post-review fixes)
2005-10-21 03:25:07 +04:00
kent@mysql.com
70c816c801
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-20 23:23:33 +02:00
kent@mysql.com
977187eb30
configure.in:
...
Set the version number to 5.0.16
2005-10-20 13:37:54 +02:00
msvensson@neptunus.(none)
c7174f18f9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-10-20 10:28:52 +02:00
bar@mysql.com
7671bc00c4
Bug#12371: executing prepared statement fails (illegal mix of collations)
...
ctype_utf8.test, ctype_utf8.result:
Adding test case.
item.h:
item.cc:
Adding Item_param::safe_charset_converter
2005-10-20 11:56:27 +05:00
bar@mysql.com
6c258beb2d
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-10-20 11:12:34 +05:00
bar@mysql.com
af3d8bd4ad
charset.c:
...
Bug#13238 mysqldump and mysqladmin hangs
Avoid recursion into init_available_charsets.
Serg's version didn't work for me: I got
double mutex locking.
Pushing this version instead
(It was approved by Serg anyway)
2005-10-20 10:30:51 +05:00
jimw@mysql.com
2c90e2f7a6
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-19 13:47:05 -07:00
kent@mysql.com
e3c4993bf3
mysql.spec.sh:
...
Made yaSSL support an option (off by default)
2005-10-19 22:00:12 +02:00
elliot@mysql.com
9b62dd1545
Merge mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-10-19 14:40:05 -04:00
elliot@mysql.com
f9648bc815
Merge bk-innodb.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0
2005-10-19 13:20:21 -04:00
aivanov@mysql.com
2a7c88c50d
Merge mysql.com:/home/alexi/mysql-4.1
...
into mysql.com:/home/alexi/dev/mysql-4.1-4375
2005-10-19 21:07:08 +04:00
elliot@mysql.com
0955163bb1
BUG#14056 Column prefix index on UTF-8 primary key column causes 'Can't find record..'
...
Applying InnoDB patch from Jan Lindstrom
2005-10-19 12:06:29 -04:00
aivanov@mysql.com
e203a42dfc
Fix for BUG#4375: Windows specific directories are copied
...
during replication.
Modified my_dir(). Now this function skips hidden and system
files which sometimes are created by Windows.
NOTE. The fix is similar to the previuos one (05 July 2004)
except for correct setting of the 'attrib' variable value
(within the previous fix this variable was left uninitialized
when my_dir() was called with My_flags & MY_WANT_STAT == 0).
2005-10-19 18:01:23 +04:00
pem@mysql.com
ca5e435f82
Fixed BUG#13941: replace() string fuction behaves badly inside stored
...
procedure
For some functions returning strings (like "replace" and "ifnull" - where
val_str() is returning a pointer into one of the parameters) - we ended
up with a dangling pointer after the new operator destroyed the reuse item
in the eval function.
A working, if not very elegant, solution is to simply copy the string in
such cases.
2005-10-19 14:54:54 +02:00
konstantin@mysql.com
bee76b78a2
A fix and a test case for Bug#13587 "Server crash when SP is created
...
without database"
2005-10-19 14:46:32 +04:00
sergefp@mysql.com
867e790dc8
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12915-merge
2005-10-19 12:42:50 +04:00
sergefp@mysql.com
841a2abde0
Post-merge fixes
2005-10-19 12:41:30 +04:00
patg@krsna.patg.net
b310e430f9
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-18 18:53:54 -07:00
patg@krsna.patg.net
f1bd9c0d0a
Changeset:
...
Changed option text in mysqldump.c
mysqldump.c:
Changed text to read "+00:00" as opposed to "UTC" (per what the code does)
2005-10-18 18:51:07 -07:00
kent@mysql.com
8bccfab21f
mysql.spec.sh:
...
Enabled yaSSL
mysql-test-run.pl:
Increased test case timeout from 15 min
2005-10-19 02:53:03 +02:00
patg@krsna.patg.net
c35d32a04d
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
2005-10-18 16:31:12 -07:00
patg@krsna.patg.net
4b71f1762e
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
2005-10-18 16:02:24 -07:00
patg@krsna.patg.net
85f12e97c8
Re-application of earlier patch for create_where_from_key and and delete_all_rows
2005-10-18 15:54:50 -07:00
reggie@ugeek.(none)
600c7df8f1
readd the my_cgets call that SergeyV originally put in
2005-10-18 17:53:09 -05:00
brian@zim.(none)
3cde418f27
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-10-18 15:01:50 -07:00
brian@zim.(none)
6ab502e523
Per a user request there is now support for "CHECK TABLE" where the table is an archive file.
2005-10-18 14:52:38 -07:00
sergefp@mysql.com
e7065d355c
BUG#121915: Merge 4.1->5.0
2005-10-19 01:52:06 +04:00
bell@sanja.is.com.ua
7be184a1f7
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
2005-10-19 00:26:19 +03:00
petr@mysql.com
2fc14efff1
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-build
2005-10-19 01:26:18 +04:00
bell@sanja.is.com.ua
aadf571b4f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-10-19 00:26:18 +03:00
ranger@regul.home.lan
9fc23406de
Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into regul.home.lan:/mnt/md/bk/mysql-5.0
2005-10-19 00:26:17 +03:00
ranger@regul.home.lan
e3b17f529c
After review fixes
2005-10-18 23:49:31 +03:00
petr@mysql.com
1f97d42b3d
fix compilation failure on serg's box: we shouldn't
...
use USE_PRAGMA_INTERFACE before include of my_global.h,
where it is defined
2005-10-19 00:31:00 +04:00