aelkin/elkin@koti.dsl.inet.fi
2c12ddc1d4
manual merge
2007-10-04 13:13:04 +03:00
aelkin/elkin@koti.dsl.inet.fi
4c6e14ce8d
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/5.1-merge
2007-10-04 12:27:14 +03:00
bar@mysql.com/bar.myoffice.izhnet.ru
2b42750a51
Bug#29323 mysql client only accetps ANSI encoded files
...
Fix: ignore BOM marker in the first line.
2007-10-04 13:06:01 +05:00
aelkin/elkin@koti.dsl.inet.fi
d155f65a96
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug26000_show_slave_status_when_no_active_mi
2007-10-03 15:12:53 +03:00
aelkin/elkin@koti.dsl.inet.fi
9461b6113b
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug26000_show_slave_status_when_no_active_mi
2007-10-03 13:43:56 +03:00
sven@murkla.(none)
5daff6547e
BUG#30752 rpl_dual_pos_advance valgrind (jump depends on uninitialized LOG_INFO)
...
Problem: one thread could read uninitialized memory from (the stack of) another
thread.
Fix: swapped order of initializing the memory and making it available to the
other thread.
Fix: put lock around the statement that makes the memory available to the other
thread.
Fix: all fields of the struct are now initialized in the constructor, to avoid
future problems.
2007-10-03 11:57:14 +02:00
bar@bar.myoffice.izhnet.ru
3745968ddc
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b30315
...
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
2007-10-03 12:18:17 +05:00
bar@bar.myoffice.izhnet.ru
5efd35b0f3
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b30315
...
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
2007-10-03 12:02:30 +05:00
bar@bar.myoffice.izhnet.ru
b96cc51ff6
Merge mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
2007-10-02 15:41:43 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
5e14f4f038
Bug#29675 collation_connection is defined twice for the same value
...
Removing redundant initialization.
2007-10-02 15:20:45 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
065bcba38e
Fixing comments to use "#" instead of "--"
2007-10-02 13:28:58 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
aacebc7ce8
Bug#30315 Character sets: insertion of euckr code value 0xa141 fails
...
Problem: some valid euc-kr characters were rejected because
condition checking multi-byte tail didn't allow
multi-byte characters having the second byte in the ranges
[0x41..0x5A] and [0x61..0x7A].
Fix: allow these byte ranges for mb tails
2007-10-01 15:35:42 +05:00
lars/lthalmann@dl145k.mysql.com
d214425f90
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-10-01 11:30:48 +02:00
lars/lthalmann@dl145j.mysql.com
8dd6398eac
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-10-01 11:26:58 +02:00
lars/lthalmann@dl145h.mysql.com
b6553689fd
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-10-01 11:25:32 +02:00
lars/lthalmann@dl145h.mysql.com
b89dcdffcd
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-10-01 11:24:11 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
9511030c76
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-10-01 11:23:44 +02:00
aelkin/elkin@koti.dsl.inet.fi
5dc3fbf187
Bug #26000 SHOW SLAVE STATUS can crash mysqld during shutdown process
...
active_mi has been reset (shutdown) at the time of quering with
SHOW SLAVE STATUS so that
at handling of SHOW an attempt to read its members segfaults.
Fixed with checking the value of active_mi before to call show_master_info()
Merely send_ok() is invoked when active_mi does not exist.
A test can not be easiely written.
Notice, there are more analogical cases in the code which require a similar
treatment (to be reported as a bug separately).
2007-09-26 21:59:17 +02:00
df@pippilotta.erinye.com
7ef6e66bc6
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-25 17:53:01 +02:00
df@pippilotta.erinye.com
43310df9d9
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-25 17:44:53 +02:00
df@pippilotta.erinye.com
461f559adf
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-25 17:42:25 +02:00
jperkin@production.mysql.com
d6db96fb55
Merge production.mysql.com:/usersnfs/jperkin/bk/build-5.0
...
into production.mysql.com:/usersnfs/jperkin/bk/build-5.1
2007-09-24 11:48:27 +02:00
mats@kindahl-laptop.dnsalias.net
a2247b2b3f
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-rpl
2007-09-24 11:46:11 +02:00
mats@kindahl-laptop.dnsalias.net
b2f5b2e83d
BUG#31076 (Server crashes when start slave is issued):
...
Second patch to initailize more uninitialized variables.
2007-09-24 10:50:57 +02:00
jonathan@bagpuss.adsl.perkin.org.uk
3b3be2ada1
Revert previous attempt to fix bug#27693, the files removed from the
...
cmake list are auto-generated and thus still required. Correct fix
not yet known.
2007-09-22 16:29:15 +02:00
gkodinov/kgeorge@macbook.local
ed7e4b82c1
fixed warnings by bug 30639
2007-09-21 12:17:09 +02:00
gkodinov/kgeorge@macbook.local
4eee02dd3d
fixed type conversion warnings revealed by bug 30639
2007-09-21 10:15:16 +02:00
mats@kindahl-laptop.dnsalias.net
cd88c4dc8a
Fixing bug in test in that a database was not dropped and was visible
...
in following tests.
2007-09-21 08:13:52 +02:00
mats@kindahl-laptop.dnsalias.net
8b5248a52b
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-rpl
2007-09-20 18:30:00 +02:00
mats@kindahl-laptop.dnsalias.net
c5622b424f
BUG#31076 (Server crashes when start slave is issued):
...
Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22
due to an uninitialized variable.
2007-09-20 16:31:05 +02:00
gluh@eagle.(none)
7dbcdf9a64
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 16:28:46 +05:00
gluh@mysql.com/eagle.(none)
eef0772b89
result fix
2007-09-20 16:27:58 +05:00
gluh@eagle.(none)
2a02dd13e2
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 14:40:24 +05:00
gluh@mysql.com/eagle.(none)
4ffcc4f266
result fix
2007-09-20 14:38:41 +05:00
gluh@eagle.(none)
88a4df4ec0
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-20 14:10:05 +05:00
gluh@mysql.com/eagle.(none)
6b81174cde
Bug#27747 database metadata doesn't return sufficient column default info
...
added get_field_default_value() function which obtains default value from the field
(used in store_create_info() & get_schema_column_record() functions)
2007-09-20 13:54:46 +05:00
gkodinov/kgeorge@magare.gmz
3dd2ed30ae
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30639-5.1-opt
2007-09-19 18:02:59 +03:00
gkodinov/kgeorge@magare.gmz
c2abf960f9
Bug #30639 : limit offset,rowcount wraps when rowcount >= 2^32 in windows
...
The parser uses ulonglong to store the LIMIT number. This number
then is stored into a variable of type ha_rows. ha_rows is either
4 or 8 byte depending on the BIG_TABLES define from config.h
So an overflow may occur (and LIMIT becomes zero) while storing an
ulonglong value in ha_rows.
Fixed by :
1. Using the maximum possible value for ha_rows on overflow
2. Defining BIG_TABLES for the windows builds (to match the others)
2007-09-19 17:47:52 +03:00
gluh@eagle.(none)
7c87dc6e52
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-19 14:10:01 +05:00
gluh@eagle.(none)
e7a9c4d648
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-09-19 14:09:23 +05:00
gluh@eagle.(none)
56c927e696
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-09-19 13:50:38 +05:00
lars/lthalmann@dl145h.mysql.com
0ad6384f9e
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
2007-09-17 14:14:02 +02:00
lars/lthalmann@dl145k.mysql.com
3379f375a3
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-09-17 13:31:35 +02:00
lars/lthalmann@dl145h.mysql.com
234e55623b
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-09-17 12:38:22 +02:00
aelkin@dl145j.mysql.com
0c153419ce
Merge: bug@27417,23333 and bug#28960 tests with 5.1
2007-09-17 12:31:10 +02:00
aelkin@dl145j.mysql.com
11c9a13a24
Merge: bug#27417,23333 manual work for fixing tests and a source code.
2007-09-16 18:16:40 +02:00
aelkin@dl145j.mysql.com
e9b287f27e
Manual merge fixes/tests for bugs_28960,27417,23333.
2007-09-16 12:07:00 +02:00
aelkin@dl145j.mysql.com
1a0fea60a3
Merge dl145j.mysql.com:/tmp/andrei/mysql-5.0-rpl
...
into dl145j.mysql.com:/tmp/andrei/5.1-merge
2007-09-15 21:25:56 +02:00
gshchepa@devsrv-b.mysql.com
2e26008c3e
Many files:
...
Post-merge fix.
2007-09-15 07:39:58 +02:00
gshchepa@devsrv-b.mysql.com
6234432241
Merge devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
...
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
2007-09-15 07:08:07 +02:00