Commit graph

55165 commits

Author SHA1 Message Date
Alexey Botchkov
d5f4fcb6c8 merging 2008-11-18 13:52:03 +04:00
Alexey Botchkov
58701cae11 Bug#34517 SHOW GLOBAL STATUS does not work properly in embedded server.
GLOBAL STATUS is calculated by studying the list of threads. In the
        embedded server threads were not linked to the internal list, so the
        calculation always returns 0. Fixed by 'linking' the embedded-server
        threads to the same list

per-file comments:
  libmysqld/lib_sql.cc
Bug#34517 SHOW GLOBAL STATUS does not work properly in embedded server.
    Add newly created 'threads' to the internal thread list.
    Remove them from the list as they're freed.

  mysql-test/r/information_schema.result
Bug#34517 SHOW GLOBAL STATUS does not work properly in embedded server.
    test result

  mysql-test/t/information_schema.test
Bug#34517 SHOW GLOBAL STATUS does not work properly in embedded server.
    test case added
2008-11-17 20:06:03 +04:00
Alexey Botchkov
ef3600b80b merging 2008-11-17 19:43:10 +04:00
Alexey Botchkov
56dc6b2ecd Bug#31616 div_precision_increment description looks wrong
Item_func_div didn't calculate the precision of the result properly.
  The result of 5/0.0001 is 5000 so we have to add decimals of the divisor
  to the planned precision.

per-file comments:
  mysql-test/r/type_newdecimal.result
Bug#31616 div_precision_increment description looks wrong
    test result fixed

  mysql-test/t/type_newdecimal.test
Bug#31616 div_precision_increment description looks wrong
    test case

  sql/item_func.cc
Bug#31616 div_precision_increment description looks wrong
    precision must be increased with args[1]->decimals parameter
2008-11-17 19:41:09 +04:00
Mattias Jonsson
93f88cb908 merge 2008-11-15 00:26:48 +01:00
Mattias Jonsson
c0240bca20 Bug#40595: Non-matching rows not released with READ-COMMITTED on tables
with partitions

Pre push fix, optimized replace_regex, to cut 2 seconds
from test time.
2008-11-14 23:51:17 +01:00
Gleb Shchepa
fa430818c3 manual merge 5.0-bugteam --> 5.1-bugteam (bug 40021)
sql_view.cc: required_view_parameters has been decreased by 2 
(not by 1) because its value was incorrect: 16 instead of 15
(minor performance issue).
2008-11-14 21:37:27 +04:00
Gleb Shchepa
b82094a0f8 Bug #40021: Renaming view fails, archived .frm for view is
missing after downgrade

Obsolete arc/ directory and view .frm file backup support
has been removed by the patch for bug 17823. However, that
bugfix caused a problem with "live downgrades" of the
server: if we rename some view 4 times under 5.1.29/5.0.72
and then try to rename it under 5.1.28/5.0.70 on the same
database, the server fails with a error:

  query 'RENAME TABLE ... TO ...' failed: 6: Error on
  delete of '....frm-0001' (Errcode: 2)

Also .frm file of that view may be lost (renamed to .frm~).

The server failed because it tried to rename latest 3
backup .frm files renaming the view: the server used an
integer value of the "revision" field of .frm file to
extract those file names. After the fix for bug 17823 those
files were not created/maintained any more, however the
"revision" field was incremented as usual. So, the server
failed renaming non existent files.

This fix solves the problem by removing the support for
"revision" .frm file field:
1. New server silently ignores existent "revision" fields
   in old .frm files and never write it down;
2. Old server assumes, that missing "revision" field in new
   .frm files means default value of 0.
3. Accordingly to the fix for bug 17823 the new server
   drops arc/ directory on alter/rename view, so after
   "live downgrade" old server begins maintenance of the
   arc/ directory from scratch without conflicts with .frm
   files.
2008-11-14 21:25:57 +04:00
Ramil Kalimullin
de1fe9054f Auto-merge 2008-11-14 13:48:01 +04:00
Tatiana A. Nurnberg
b3de270125 auto-merge 2008-11-14 09:11:34 +01:00
Ramil Kalimullin
ee3594b2d7 Test case for bug #34774: key prefix on text field in federated
tables can cause server to crash!

The bug will be fixed by patch for #34779: "crash in checksum table
on federated tables with blobs containing nulls"

Only a test case commited.
2008-11-14 11:42:29 +04:00
Ramil Kalimullin
e0d5a6c15f Fix for bug#37527: mysqlcheck fails to report entire database
when InnoDB frm file corruption

Problem: mysqlcheck runs 'SHOW FULL TABLE' queries to get table lists.
The query may fail for some reasons (e.g. null .frm file) then
mysqlcheck doesn't process the database tables.

Fix: try to run 'SHOW TABLES' if 'SHOW FULL TABLES' failed.
2008-11-14 11:40:46 +04:00
Patrick Crews
78566e48f4 merge 5.0 -> 5.1 2008-11-13 16:10:52 -05:00
Patrick Crews
f88fd3feb7 Bug#40645 Test main.federated_innodb does not always clean up after itself
Reordered include files so that no mess will be left if this test is run without InnoDB
Previously, this test would leave a database named 'federated' in such a case and would
cause tests that examined existing databases to fail.
2008-11-13 16:01:01 -05:00
Sergey Glukhov
2e4f86af69 5.0-bugteam->5.1-bugteam automerge(bug#39541) 2008-11-13 17:09:22 +04:00
Sergey Glukhov
90548bc697 Bug#39541 CHECK TABLE on information_schema myisam tables produces error
issue 'The storage engine for the table doesn't support check' note for I_S tables
2008-11-13 17:06:48 +04:00
Sergey Glukhov
6c0b87f55e Bug#38909 CREATE_OPTIONS in information_schema produces wrong results
table->partition_info is unitialized when we open frm file only.
The fix is check share->partition_info_len which is set on
frm opening stage.
2008-11-13 16:11:51 +04:00
Sergey Glukhov
3fa2673f19 Bug#39955 SELECT on INFORMATION_SCHEMA.GLOBAL_VARIABLES takes too long
VARIABLE_VALUE field is decreased to 1024 symbols.
(affected I_S tables: GLOBAL_VARIABLES, SESSION_VARIABLES,
 GLOBAL_STATUS, SESSION_STATUS).
The only variable which can be longer than 1024 is
init_connect. The variable will be truncated with warning.
Additional fix:
Added where condition filter which speed up queries which
have where condition with expressions which use VARIABLE_NAME
field.
2008-11-13 16:09:11 +04:00
Sergey Glukhov
45deeca2dd Bug#35789 wrong datatypes for collation and charset columns in EVENTS, ROUTINES, TRIGGERS
changed 'charset', 'collation' field length from 64 to MY_CS_NAME_SIZE(32)
in tables:
SCHEMATA, TABLES, COLUMNS, CHARACTER_SETS,
COLLATIONS, COLLATION_CHARACTER_SET_APPLICABILITY
2008-11-13 13:50:20 +04:00
Sergey Glukhov
2322356d67 Bug#36035 I_S.TABLES.UPDATE_TIME not being set on INSERT for Windows
added FLUSH TABLES after INSERT because UPDATE_TIME is updated with delay
on Win.
2008-11-13 12:38:30 +04:00
Tatiana A. Nurnberg
8a774dcc68 Bug#34025: mysql_config is not returning -ldl lib flag needed when using embedded server
mysql_config did not output -ldl (or equivalent) when needed for --libmysqld-libs,
so its output could be insufficient to build an application using the embedded
server.

LIBDL was already set in configure; it's now propagated all the way into the
relevant mysql_config scripts.
2008-11-10 22:12:15 +01:00
Vladislav Vaintroub
d346054cb7 merge fix for 36279 2008-11-10 21:38:45 +01:00
Vladislav Vaintroub
d60da1c2a7 Bug#36279 - mysql built with Visual Studio 2005 does not display
japanese characters.

Fix - removed obsolvete setlocale from my_init.c . In MBCS 
environments it caused unwanted character-to-byte translations
in fputc()  in client code and wrong output as result.
2008-11-10 21:18:04 +01:00
Mattias Jonsson
a891c0e8f4 Bug#40595: Non-matching rows not released with READ-COMMITTED
on tables with partitions

Problem was that the handler function try_semi_consistent_read
was not propagated to the innodb handler.

Solution was to implement that function in the partitioning
handler.
2008-11-10 21:13:24 +01:00
Matthias Leich
0d2cbe95f6 Merge 2008-11-07 15:19:27 +01:00
Kristofer Pettersson
85067c83cc Automerge 2008-11-07 14:52:43 +01:00
Kristofer Pettersson
95007f5e38 Bug#38883 thd_security_context is not thread safe, crashes?
Innodb monitor could cause a server crash because of invalid access to a
shared variable in a concurrent environment.
                  
This patch adds a guard to protect against crashes but not against
inconsistent values because of performance reasons.
2008-11-07 13:12:56 +01:00
Georgi Kodinov
f309f847e4 merged 5.0-bugteam -> 5.1-bugteam 2008-11-06 21:00:51 +02:00
Georgi Kodinov
0a677bfbcb merged 5.1-main -> 5.1-bugteam 2008-11-06 20:59:47 +02:00
Georgi Kodinov
94ac4f703b merged 5.0-main -> 5.0-bugteam 2008-11-06 20:57:47 +02:00
Matthias Leich
ddf21d6f9d Remove files which were created during an upmerge
where it was forgotten to remove them.
2008-11-06 18:51:00 +01:00
kent.boortz@sun.com
b8b5e156ea Raise version number after cloning 5.1.30 2008-11-06 18:21:02 +01:00
Andrei Elkin
c1612bbf0f bug#38230
refining the regression test to avoid explicit innodb engine in create.
2008-11-06 19:10:09 +02:00
Joerg Bruehe
54a47dcb30 Merge current 5.0 main tree and fix for bug#40546 2008-11-06 17:42:04 +01:00
Joerg Bruehe
cca511f035 Merge main 5.1 and the 5.1 version of the fix for bug#40546 2008-11-06 17:30:33 +01:00
Joerg Bruehe
fb7e23eb44 Bug #40546 Debug server in RPM is built with compiler optimization
Prevent this by modifying CFLAGS and CXXFLAGS.

Upmerge from 5.0, modified according to the different spec file structure.
2008-11-06 17:09:14 +01:00
Joerg Bruehe
e7fe288054 Bug #40546 Debug server in RPM is built with compiler optimization
Prevent this by modifying CFLAGS and CXXFLAGS.
2008-11-06 16:24:58 +01:00
Georgi Kodinov
e12b692e51 merged 5.1-bugteam -> merge-5.1-bugteam 2008-11-06 16:24:59 +02:00
Georgi Kodinov
90bc97a583 merged 5.1 main -> 5.1-bugteam 2008-11-06 16:18:25 +02:00
Mattias Jonsson
d0a5d0a9c3 post push fix, removing dbug_print due to compiler warning 2008-11-06 13:47:41 +01:00
Georgi Kodinov
64660afef0 merge 5.0-bugteam -> 5.1-bugteam 2008-11-06 12:58:54 +02:00
Georgi Kodinov
f29a569a31 merged 5.0-main -> 5.0-bugteam 2008-11-06 12:54:52 +02:00
Sven Sandberg
e66ea9eb09 BUG#36625: Please remove the rpl_probe and rpl_parse features from the server
Problem 1: BUG#36625: rpl_redirect doesn't do anything useful. It tests an
obsolete feature that was never fully implemented.
Fix 1: Remove rpl_redirect.
Problem 2: rpl_innodb_bug28430 and rpl_flushlog_loop are disabled despite the
bugs for which they were disabled have been fixed.
Fix 2: Re-enable rpl_innodb_bug28430 and rpl_flushlog_loop.
2008-11-06 11:00:55 +01:00
Mattias Jonsson
534a421b7f merge 2008-11-06 07:29:07 +01:00
Mattias Jonsson
d675e7b05e merge and pre push fix for test of bug#37719 2008-11-05 22:26:39 +01:00
Evgeny Potemkin
009d5097c9 Merged fix for the bug#37870. 2008-11-05 23:46:24 +03:00
Mattias Jonsson
bb727f0328 merge 2008-11-05 21:13:54 +01:00
Mattias Jonsson
f2f556cfc7 merge 2008-11-05 20:44:19 +01:00
Evgeny Potemkin
d0c490e5e8 Bug#37870: Usage of uninitialized value caused failed assertion.
The convert_constant_item function converts a constant to integer using
field for condition like 'field = a_constant'. In some cases the
convert_constant_item is called for a subquery when outer select is already
being executed, so convert_constant_item saves field's value to prevent its
corruption. For EXPLAIN and at the prepare phase field's value isn't
initialized yet, thus when convert_constant_item tries to restore saved
value it fails assertion.

Now the convert_constant_item doesn't save/restore field's value if it's
haven't been read yet. Outer constant values are always saved.
2008-11-05 18:40:23 +03:00
Mattias Jonsson
6c77b36d92 merge 2008-11-05 15:58:35 +01:00