database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
54,780 Commits 3,280 Branches 1,098 Tags
bbf344b646005c6fadeb718bc60f811cf8a42cb5
Commit Graph

22318 Commits

Author SHA1 Message Date
bar@bar.myoffice.izhnet.ru
c826b4e75d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28600
 2007-05-31 14:50:08 +05:00
holyfoot/hf@hfmain.(none)
cdda302fc1 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-05-31 14:23:45 +05:00
gshchepa/uchum@gleb.loc
7b4ed8001a Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
 2007-05-31 14:02:50 +05:00
lars/lthalmann@mysql.com/dl145j.mysql.com
685293b985 Disabled due to valgrind failure (talked to Tomas) 2007-05-31 10:34:22 +02:00
gshchepa/uchum@gleb.loc
89a4d89c26 Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
 2007-05-31 13:28:43 +05:00
lars/lthalmann@dl145j.mysql.com
30179dd8c0 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-05-31 10:27:53 +02:00
lars/lthalmann@dl145j.mysql.com
73ca08a481 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-05-31 10:23:37 +02:00
df@pippilotta.erinye.com
ce12b17f0a after-merge fixes: test cases that were moved to extra/binlog_tests do not need to check for binlog being enabled 2007-05-31 10:21:19 +02:00
lars/lthalmann@dl145h.mysql.com
4e90009904 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
 2007-05-31 10:20:58 +02:00
df@pippilotta.erinye.com
82dc913640 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn
 2007-05-31 10:09:34 +02:00
df@pippilotta.erinye.com
718314ff7e test case ps requires binlog for now 2007-05-31 10:07:35 +02:00
df@pippilotta.erinye.com
4f81444fd5 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn
 2007-05-31 10:00:49 +02:00
gshchepa/uchum@gleb.loc
be69f13dff Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28598
 2007-05-31 12:43:59 +05:00
df@pippilotta.erinye.com
779a055ed0 some test cases cannot run with --skip-log-bin 2007-05-31 09:34:24 +02:00
bar@bar.myoffice.izhnet.ru
c74a18fb5d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  mysql.com:/home/bar/mysql-5.1.b28600
 2007-05-31 12:10:37 +05:00
gshchepa/uchum@gleb.loc
e16953dfd8 Fixed bug #28598. 
mysqld crashed when a long-running explain query was killed from
another connection.

When the current thread caught a kill signal executing the function
best_extension_by_limited_search it just silently returned to  
the calling function greedy_search without initializing elements of
the join->best_positions array.
However, the greedy_search function ignored thd->killed status
after a calls to the best_extension_by_limited_search function, and
after several calls the greedy_search function used an uninitialized
data from the join->best_positions[idx] to search position in the
join->best_ref array. 
That search failed, and greedy_search tried to call swap_variables
function with NULL argument - that caused a crash.
 2007-05-31 12:10:21 +05:00
igor@olga.mysql.com
4fb062de84 Post merge fix. 2007-05-31 00:04:03 -07:00
tsmith@quadxeon.mysql.com
91c484339c Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-30 23:48:20 +02:00
tsmith@quadxeon.mysql.com
64f582396b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-05-30 23:46:21 +02:00
tsmith@quadxeon.mysql.com
d12181e9d0 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
 2007-05-30 23:45:34 +02:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
4835204dcc Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
 2007-05-30 22:33:54 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
95b1be9eb1 bug#22725 
refining the test because of Bug #28786 'reset master' does not reset binlogging on embeded server
 2007-05-30 22:29:15 +03:00
evgen@moonbone.local
85b6e3f00d Bug#28729: Field_enum wrongly reported an error while storing an empty string. 
ENUM fields internally store their values as integers and may use integer
values as indexes to their values. Invalid values are mapped to zero value.
When storing an empty string the ENUM field fails to find an appropriate value
and tries to convert the provided string to integer. The conversion also
fails and error is returned even if the thd->count_cuted_fields is set to
CHECK_FIELD_IGNORE. This makes the range optimizer wrongly decide that an
impossible range is present.

Now the Field_enum::store() returns error while storing an empty string only
if the thd->count_cuted_fields isn't set to CHECK_FIELD_IGNORE.
 2007-05-30 23:28:14 +04:00
evgen@moonbone.local
1fea153652 sp.result, analyse.result: 
Post merge fix.
 2007-05-30 20:25:16 +04:00
evgen@moonbone.local
75afe5cab5 Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-05-30 19:35:35 +04:00
df@pippilotta.erinye.com
dd9afd5d98 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-05-30 17:11:08 +02:00
df@pippilotta.erinye.com
3b4fca2a67 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-05-30 17:09:41 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
1ec47e4ef8 Changed to vertical output for rpl_row_until.test 2007-05-30 17:00:48 +02:00
lars/lthalmann@dl145k.mysql.com
5816dfe330 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-05-30 15:58:48 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
ac1d6a7f61 Masking out error that is not generated by the test (rpl_ndb_basic.test) itself 2007-05-30 15:56:05 +02:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
e87959a23a bug#22725 
the test is not supposed for row format. the include-guard is set.
 2007-05-30 16:14:55 +03:00
mhansson@dl145s.mysql.com
d20a1977b5 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/users/mhansson/mysql/autopush/my50-bug28250
 2007-05-30 14:43:59 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
b0692ac99c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b28436/b28436.5.1
 2007-05-30 17:13:59 +05:00
gluh@eagle.(none)
09a267852a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-05-30 17:09:16 +05:00
gluh@mysql.com/eagle.(none)
cdbdc4e745 backport of Bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL 2007-05-30 17:04:04 +05:00
gshchepa/uchum@gleb.loc
9f9d718561 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
 2007-05-30 15:46:23 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c98fa25956 Fix for bug #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump 
Problem: there is an ASSERT() in the Log_event::read_log_event() checking the integrity 
of the event's data that may fail.
Fix: move the assert's condition to an explicit check.
 2007-05-30 15:23:47 +05:00
lars/lthalmann@mysql.com/dl145k.mysql.com
a6cf35bb78 Added extra parenthesis to remove compiler warning 
Fixed test case rpl_incident.test (synchronize drop table, masked IO thread behaviour)
 2007-05-30 11:55:56 +02:00
gshchepa/uchum@gleb.loc
0362400f31 Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28716
 2007-05-30 14:34:52 +05:00
mhansson@dl145s.mysql.com
51de1c5708 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/users/mhansson/mysql/autopush/my51-bug28250
 2007-05-30 10:31:41 +02:00
gkodinov/kgeorge@magare.gmz
22c1bfbbc9 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28492-5.0-opt
 2007-05-30 11:23:39 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
03638e3aa3 bug#22725 
merge 5.0 with 5.1
 2007-05-30 11:18:55 +03:00
anozdrin/alik@ibm.
072ff4e3e0 Disable IM tests. 2007-05-30 12:06:07 +04:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
54772da05e Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
 2007-05-30 10:59:54 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
6c3921eb9a bug#22725 
test comments correction
 2007-05-30 10:56:18 +03:00
anozdrin/alik@ibm.
c0b3242ea5 Disable IM-tests. 2007-05-30 11:53:50 +04:00
bar@mysql.com/bar.myoffice.izhnet.ru
ebe4d9741f Bug#28600 Yen sign and overline ujis conversion change 
Problem: Unicode->UJIS followed incorrect conversion
rules for U+00A5 YEN SIGN and U+203E OVERLINE,
so these characters were converted to ujis 0x8E5C
and 0x8E7E accordingly.

This behaviour would be correct for a JIS-X-0201 based character set,
but this is wrong for UJIS, which is documented as x-eucjp-unicode-0.9,
and which is based on ASCII for the range U+0000..U+007F.

Fix:
removing JIS-X-0201 conversion rules, making UJIS ASCII compatible.
YEN SIGN and OVERLINE do not have corresponding UJIS characters anymore
and converted to 0x3F QUESTION MARK, throwing a warning in appropriative cases.

This patch also includes a test covering full UJIS->Unicode->UJIS mapping.
 2007-05-30 12:30:15 +05:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
6620493d19 Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
 2007-05-30 10:27:05 +03:00
gshchepa/uchum@gleb.loc
83983221f5 Fixed bug #28716. 
The result of the CHECK OPTION condition evaluation over an
updated record and records of merged tables was arbitrary and
dependant on the order of records in the merged tables during
the execution of SELECT statement.

The CHECK OPTION expression was evaluated over expired record
buffers (with arbitrary data in the fields).

Rowids of tables used in the CHECK OPTION expression were
added to temporary table rows. The multi_update::do_updates()
method was modified to restore necessary record buffers
before evaluation of the CHECK OPTION condition.
 2007-05-30 12:21:39 +05:00
gkodinov/kgeorge@magare.gmz
a109df803f Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28605-5.0-opt
 2007-05-30 10:02:22 +03:00