Commit graph

55802 commits

Author SHA1 Message Date
Magnus Svensson
acf0a1c32c WL#4189 Temporarily set parallel=1 by default 2008-11-14 10:22:44 +01:00
Magnus Svensson
19f7665a09 Merge 2008-11-14 10:21:23 +01:00
Magnus Svensson
d2773d34f5 WL#4189 Add full backward compatibility to mysql-test-run.pl
- Add copy of mtr v1 and make it possible to run it using MTR_VERSION=1
2008-11-14 09:45:32 +01: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
Vladislav Vaintroub
ea0efe4526 Bug #20430 mysqld.exe windows service stuck in "SERVICE_STOP_PENDING"
status

The problem appears to be a race condition, when service is being
stopped right after startup. We set the service status to SERVICE_RUNNING
way too early it cannot yet handle stop requests -  initialization has
not finished and  hEventShutdown  that signals server to stop is not yet
created. If somebody issues "net stop MySQL" at this time, MySQL is not
informed about the stop and continues to run as usual, while
NTService::ServiceMain() stucks forever waiting for mysql's "main" thread
to finish.

Solution is to remain in SERVICE_START_PENDING status until after server
initialization  is fully complete and only then change the status to
SERVICE_RUNNING. In  SERVICE_START_PENDING we do not accept service control
requests, i.e it is not possible to stop service in that time.
2008-11-14 02:01:41 +01: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
Sven Sandberg
78a3abeced BUG#38350: Many tests don't clean up after themselves on exit.
Problem: Many test cases don't clean up after themselves (fail
to drop tables or fail to reset variables). This implies that:
(1) check-testcase in the new mtr that currently lives in
5.1-rpl failed. (2) it may cause unexpected results in
subsequent tests.
Fix: make all tests clean up.
Also: cleaned away unnecessary output in rpl_packet.result
Also: fixed bug where rpl_log called RESET MASTER with a running
slave. This is not supposed to work.
Also: removed unnecessary code from rpl_stm_EE_err2 and made it
verify that an error occurred.
Also: removed unnecessary code from rpl_ndb_ctype_ucs2_def.
2008-11-13 20:19:00 +01: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
Andrei Elkin
2618337eb6 merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
2008-11-12 19:51:47 +02:00
Joerg Bruehe
ece22ac1b8 Upmerge merge changesets 5.0-build -> 5.1-build, no code changes. 2008-11-11 14:03:00 +01:00
Sergey Vojtovich
83f96dcf47 BUG#38842 - Fix for 25951 seems incorrect
With fix for bug 25951 index hints are ignored for fulltext
searches, as handling of fulltext indexes is different from
handling regular indexes. Meaning it is not possible to
implement true index hints support for fulltext indexes within
the scope of current fulltext architecture.

The problem is that prior to fix for bug 25951, some useful
index hints still could be given for boolean mode searches.

This patch implements special index hints support for fulltext
indexes with the following characteristics:
- all index hints are still ignored for NLQ mode searches -
  it cannot work without an index;
- for 5.1 and up index hints FOR ORDER BY and FOR GROUP BY are
  still ignored for fulltext indexes;
- boolean mode searches honor USE/FORCE/IGNORE INDEX hints;
- as opposed to index hints for regular indexes, index hints
  for fulltext BOOLEAN mode searches affect the usage of the
  index for the whole query.
2008-11-11 13:10:51 +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
Build Team
366adeab08 Added "Sun Microsystems, Inc." to copyright headers on files modified
since Oct 1st
2008-11-10 21:21:49 +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
Joerg Bruehe
a1bc904064 Merge main 5.1 -> 5.1-build 2008-11-10 20:32:45 +01:00
Joerg Bruehe
4f90ab4df5 Merge main 5.0 -> 5.0-build 2008-11-10 17:01:51 +01:00
Magnus Svensson
5fd1c9768a WL#4189 Use only one worker for --record 2008-11-10 16:10:49 +01:00
Magnus Svensson
4b739dcf45 Bug#40193 mtr --record is currently broken in 5.1-rpl and 6.0-rpl 2008-11-10 14:53:53 +01:00
Magnus Svensson
6a58dc5180 WL#4189 removed unused variables 2008-11-10 14:53:21 +01:00
Magnus Svensson
dafbde4979 Fix DBUG_PRINT 2008-11-10 14:52:51 +01:00
Build Team
827bae532b Added the default configure COMMUNITY_SERVER and ENABLED_PROFILING to
the Windows configuration file "include/config-win.h".
2008-11-09 03:14:35 +01:00
Joerg Bruehe
31144766b4 Merge second fix for bug#40546 to the 5.1.30 tree. 2008-11-07 20:08:37 +01:00
Joerg Bruehe
2e6a0cbc03 Upmerge the second fix for bug#40546 from 5.0 to 5.1
and fix a defect specific to 5.1 (wrong quoting).
2008-11-07 19:01:28 +01:00
Joerg Bruehe
c81061e458 "spec" file for RPM builds:
Fix yesterday's patch so that it also works for the last flag.
Still part of the fix for bug#40546.
2008-11-07 18:38:40 +01:00
Magnus Svensson
eb2d02fb5e Merge 2008-11-07 16:26:11 +01:00
Magnus Svensson
3fb892bf79 WL#4189 - fix for running from bin dist 2008-11-07 16:22:53 +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
kent.boortz@sun.com
a21f8a0e57 Back merges from 6.0.8
- Removed some copy/paste between debug and normal build in RPM spec
- Removed "mysql_upgrade_shell" from RPM build
- Removed use of "grep -q" in "configure.in", not portable
- Improved test to disable ABI check not to accidently run for icc

Other changes
- Added make file test targets 'test-bt-fast' and 'test-bt-debug-fast'
- Reenabled "jp" test suite run
2008-11-06 19:38:19 +01: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