1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Commit Graph

26958 Commits

Author SHA1 Message Date
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
rafal@quant.(none)
80e419b34d BUG#21123 (Slave fails to reconnect on update_slave_list):
Fixing comments and adding error message if slave fails to register
 on master.
2007-05-31 10:17:16 +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
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
malff/marcsql@weblab.(none)
b2d394787e Build warning cleanup 2007-05-30 17:46:28 -06: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
kent@kent-amd64.(none)
05c5139854 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
2007-05-30 22:18:45 +02:00
kent@kent-amd64.(none)
a1f0ff4bb4 Merge mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
2007-05-30 22:15:13 +02:00
kent@mysql.com/kent-amd64.(none)
b217a9e898 Makefile.am, configure.in:
Added --with-mysqld-libs configure flag
2007-05-30 22:11:53 +02: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
kaa@polly.local
d30872b4b2 Got rid of log_01[], because we don't really need it. Division and log_10[] can always be used instead, which is also a more precise way.
This is for bug #28121.
2007-05-30 22:47:52 +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
thek@adventure.(none)
c2e2d0bfa0 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-05-30 17:34:27 +02:00
thek@adventure.(none)
d505eac7e9 Merge adventure.(none):/home/thek/Development/cpp/bug24988/my51-bug24988
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-05-30 17:17:46 +02: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
anozdrin/alik@ibm.
de9f159c60 1. Fix memory leak.
2. Use multibyte-safe constant.
2007-05-30 16:24:21 +04: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
7f63aab2e0 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 16:41:16 +05:00
gshchepa/uchum@gleb.loc
64ff9e4d6f sql_update.cc:
Fixed bug #28716: additional patch to eliminate compilation
  error under Windows.
2007-05-30 16:39:25 +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
1f12c44b91 Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug27044_slave_dup2unique
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-30 11:22:07 +03: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
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
gkodinov/kgeorge@magare.gmz
a5b04a3ba9 Bug #28492: subselect returns LONG in >5.0.24a and LONGLONG in <=5.0.24a
Integer values with 10 digits may or may not fit into an int column 
(e.g. 2147483647 vs 6147483647).
Thus when creating a temp table column for such an int we must
use bigint instead.
Fixed to use bigint.
Also subsituted a "magic number" with a named constant.
2007-05-30 09:55:38 +03:00
ramil/ram@ramil.myoffice.izhnet.ru
6f480c78cd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b28631/b28631.5.1
2007-05-30 08:24:47 +05:00
malff/marcsql@weblab.(none)
8c27ed9e42 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-05-29 14:53:21 -06:00
malff/marcsql@weblab.(none)
e8fec66e9e Manual merge 2007-05-29 14:52:17 -06:00
evgen@moonbone.local
268fdf5db3 Bug#28450: The Item_date_add_interval in select list may fail the field
type assertion.

The bug was introduced by the patch for bug #16377.
The "+ INTERVAL" (Item_date_add_interval) function detects its result type
by the type of its first argument. But in some cases it returns STRING
as the result type. This happens when, for example, the first argument is a 
DATE represented as string. All this makes the get_datetime_value()
function misinterpret such result and return wrong DATE/DATETIME value.
To avoid such cases in the fix for #16377 the code that detects correct result
field type on the first execution was added to the
Item_date_add_interval::get_date() function. Due to this the result
field type of the Item_date_add_interval item stored by the send_fields()
function differs from item's result field type at the moment when
the item is actually sent. It causes an assertion failure.

Now the get_datetime_value() detects that the DATE value is returned by
some item not only by checking the result field type but also by comparing
the returned value with the 100000000L constant - any DATE value should be
less than this value.
Removed result field type adjusting code from the
Item_date_add_interval::get_date() function.
2007-05-30 00:33:12 +04:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
dcd8098f94 bug#22725
merge with 5.0
2007-05-29 22:17:09 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
1537484087 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-29 21:21:13 +03:00
sergefp@mysql.com
ddc5957eeb Added comment for ha_statistics::records 2007-05-29 21:31:45 +04:00
anozdrin/alik@ibm.
7d02017cb6 Refactoring patch:
1. Refactor sp_show_create_function() and sp_show_create_procedure()
  into show_create_routine().
2. Code cleanup: eliminate proxy functions.
2007-05-29 21:22:33 +04:00
malff/marcsql@weblab.(none)
cb4316e35d Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-05-29 10:52:07 -06:00
mats@kindahl-laptop.dnsalias.net
a979a6c51d WL#3303 (RBR: Engine-controlled logging format):
Moving code to check storage engine capabilities to after tables
are locked.  Moving code to cache table flags so that table flags
are read from the storage engine at the beginning of the statement
in addition to when the storage engine is opened.

To handle CREATE-SELECT, the decision function is called after the
table is created and it is called with all tables that are in the select
part of the statement as well as the newly created table.
2007-05-29 17:13:17 +02:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
f7c3285f2e Bug#27044 replicated with unique field ndb table allows duplkey inserts
The bug in that slave version of a table with unique field still was
able to execute INSERT query as replace whereas it's impossible on master.

The reason of this artifact is wrong usage of ndb->extra:s.

Fixed with resetting flags at do_after.
There is open issue with symmetrical resetting
   table->file->extra(HA_EXTRA_NO_IGNORE_NO_KEY)
which i had to hand to bug#27077.
The test for the current bug was committed in a cset for bug#27320.
2007-05-29 16:36:05 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
3b93001c25 Bug#22725 Replication outages from ER_SERVER_SHUTDOWN (1053) set in replication events
Refining the tests since pb revealed the older version's fragality - the error from SF() due to killed
may be different on different env:s.
DBUG_ASSERT instead of assert.
2007-05-29 16:27:55 +03:00
kaa@polly.local
985d5e90df Merge polly.local:/home/kaa/src/maint/bug24611/my51-bug24611
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-29 17:21:04 +04:00
kaa@polly.local
cc5d3d2e5b Merge polly.local:/home/kaa/src/maint/bug24611/my50-bug24611
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-05-29 17:16:23 +04:00
kaa@polly.local
76c21eaecd Merge polly.local:/home/kaa/src/maint/bug24611/my50-bug24611
into  polly.local:/home/kaa/src/maint/bug24611/my51-bug24611
2007-05-29 17:11:03 +04:00
gkodinov/kgeorge@macbook.gmz
fe03f6bbe0 Bug #27531: 5.1 part of the fix
- Renamed "Using join cache" to "Using join buffer".
- "Using join buffer" is now printed on the last
  table that "reads" from the join buffer cache.
2007-05-29 15:58:18 +03:00