hf@eagle.intranet.mysql.r18.ru
4f368f9f93
Merging
2006-01-21 18:50:06 +04:00
hf@eagle.intranet.mysql.r18.ru
717dc2e940
Merge hf@192.168.21.12:work/mysql-4.1.14320
...
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
2006-01-21 17:54:30 +04:00
hf@eagle.intranet.mysql.r18.ru
b91380456f
Merge hf@192.168.21.12:work/mysql-4.1.9855
...
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
2006-01-21 17:53:29 +04:00
anozdrin@mysql.com
145fd62bc1
Fix for BUG#15588: String overrun during sp-vars.test
...
The bug appears after implementation of WL#2984
(Make stored routine variables work according to the standard).
2006-01-20 15:59:22 +03:00
pem@mysql.com
9522e88d0b
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15658/mysql-5.0
2006-01-19 16:13:38 +01:00
pem@mysql.com
a07bbd78da
Post-review fixes (BUG#15658).
2006-01-19 16:13:04 +01:00
knielsen@mysql.com
509b5b5a27
Fix option type error, crashes on 64-bit big endian.
2006-01-19 15:36:41 +01:00
pem@mysql.com
d894e3043e
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15658/mysql-5.0
2006-01-19 15:15:47 +01:00
konstantin@mysql.com
37c9e9e375
Merge mysql.com:/opt/local/work/mysql-4.1-15613
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-19 14:01:20 +03:00
pem@mysql.com
3a753667dd
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15658/mysql-5.0
2006-01-19 11:48:07 +01:00
konstantin@mysql.com
4ca48591f1
A fix and a test case for Bug#15613 "libmysqlclient API function
...
mysql_stmt_prepare returns wrong field length"
2006-01-18 22:50:31 +03:00
pem@mysql.com
6fad448a49
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14834/mysql-5.0
2006-01-18 18:18:04 +01:00
pem@mysql.com
5cf8418b10
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14834/mysql-5.0
2006-01-18 17:09:23 +01:00
aivanov@mysql.com
5f7279d0d5
Applied patch recieved from Marko:
...
Make innodb_thread_concurrency 0 by default, and extend the usable
range from 0 to 1000 (0 disables the thread throttling).
2006-01-18 15:20:56 +03:00
aivanov@mysql.com
af9d6bcf83
Applied patch recieved from Marko:
...
Make innodb_flush_log_at_trx_commit a settable global variable.
2006-01-18 15:02:03 +03:00
serg@serg.mylan
87f685edef
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-17 21:12:24 +01:00
msvensson@devsrv-b.mysql.com
df2fefd1e9
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug14634/my41-bug14634
...
into devsrv-b.mysql.com:/space/magnus/my41-bug14634
2006-01-17 19:40:40 +01:00
konstantin@mysql.com
8d6c98ed90
Bug#15206: "Misleading message "No data to FETCH":
...
reword the misleading message.
2006-01-17 21:10:47 +03:00
serg@serg.mylan
80f190e349
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-17 17:25:10 +01:00
msvensson@neptunus.(none)
c4ddf67710
Bug #14634 Running out of diskspace on tmpdir returns an inappropriate error
2006-01-17 16:48:26 +01:00
pem@mysql.com
ef68a070f2
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15231/mysql-5.0
2006-01-17 14:44:22 +01:00
pem@mysql.com
ba01e04a2c
Post-review fix. (BUG#15231)
2006-01-17 12:48:48 +01:00
jani@hundin.mysql.fi
2df00e30f2
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jani/mysql-5.0
2006-01-17 13:47:41 +02:00
pem@mysql.com
7817b99857
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15231/mysql-5.0
2006-01-17 12:44:51 +01:00
pem@mysql.com
2f44b60752
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14498/mysql-5.0
2006-01-17 10:04:11 +01:00
konstantin@mysql.com
34c37d1ac9
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-17 00:44:43 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
41ff5c80da
Changed condition similar to code in 4.1.
2006-01-16 23:15:00 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b948c2941d
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2006-01-16 21:31:22 +02:00
serg@serg.mylan
ae3d815b41
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-16 18:09:04 +01:00
andrey@lmy004.
7b2238d484
Merge
2006-01-16 16:21:41 +01:00
pem@mysql.com
559a243686
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14498/mysql-5.0
2006-01-16 15:37:25 +01:00
pem@mysql.com
a1b2960a8a
Post-review fix (BUG#14498).
2006-01-16 15:22:29 +01:00
aivanov@mysql.com
442dcf8be7
Restore fix for bug #15108 (by ramil) erroneously erased
...
by applying innodb-5.0-ss115 snapshot.
2006-01-16 15:23:02 +03:00
aivanov@mysql.com
708f9b3ceb
Changes from the innodb-5.0-ss115 snapshot.
...
Fixed bugs:
BUG#15991: "innodb-file-per-table + symlink database + rename = crash"
BUG#15650: "DELETE with LEFT JOIN crashes server"
BUG#15308: "Problem of Order with Enum Column in Primary Key"
BUG#14189: "VARBINARY and BINARY variables: trailing space ignored"
2006-01-16 14:32:43 +03:00
aivanov@mysql.com
c46f11fa96
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss14
2006-01-15 14:56:38 +03:00
aivanov@mysql.com
ee2b765751
Changes from innodb-4.1-ss14 snapshot
...
Fixed BUG#14056: Column prefix index on UTF-8 primary key
causes "Can't find record.."
Also fixed bug 15991.
2006-01-15 14:50:47 +03:00
konstantin@mysql.com
0a64381cee
Merge mysql.com:/opt/local/work/mysql-4.1-12734
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-14 19:12:07 +03:00
konstantin@mysql.com
48d48bc936
A fix and a test case for Bug#12734 " prepared statement may
...
return incorrect result set for a select SQL request"
2006-01-14 04:55:07 +03:00
sergefp@mysql.com
86daf2d493
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16393-r2
2006-01-14 01:28:42 +03:00
sergefp@mysql.com
dc14d007db
BUG#16393: post-review fixes: fix comments.
2006-01-14 01:26:42 +03:00
sergefp@mysql.com
e58314d482
BUG#16393: Let the 'ref' optimizer use ON condition of nested join to construct
...
'ref' accesses to all tables that are direct children of the nested join and are
not inner wrt their siblings.
2006-01-13 23:55:30 +03:00
svoj@april.(none)
d0a5e3db9f
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0
2006-01-13 21:30:05 +04:00
svoj@april.(none)
5581ef960a
BUG#13835: max key length is 1000 bytes when trying to create a fulltext index
...
Allow fulltext index on VARCHAR columns longer than max key length.
2006-01-13 21:25:12 +04:00
evgen@moonbone.local
cea01c7387
Merge
2006-01-13 16:27:38 +03:00
evgen@moonbone.local
02570c20bf
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/15538-bug-5.0-mysql
2006-01-13 14:30:20 +03:00
evgen@moonbone.local
8dbedc9ffd
Merge
2006-01-13 12:13:50 +03:00
dlenev@mysql.com
f9ea947bdc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2
2006-01-13 01:56:57 +03:00
dlenev@mysql.com
d14e701446
Fix for bug #12198 "Temporary table aliasing does not work inside stored
...
functions".
We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.
2006-01-13 01:51:56 +03:00
jani@ua141d10.elisa.omakaista.fi
4d59111a1c
Fixed a bug in merge.
2006-01-12 20:49:47 +02:00
jani@ua141d10.elisa.omakaista.fi
617585eb33
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-01-12 20:28:23 +02:00