Commit graph

57417 commits

Author SHA1 Message Date
Joerg Bruehe
173811aee6 Upmerge the fix of an error message typo
(in "scripts/make_win_bin_dist")
from 5.0 into 5.1
2009-04-14 21:53:00 +02:00
Joerg Bruehe
452eeec084 Just fix a silly typo in an error message ... 2009-04-14 21:46:56 +02:00
Joerg Bruehe
bb092109e1 Merge some merge changesets from 5.0 up into 5.1-build
(code changes have already been merged separately).

Use this occasion to fix the branch name in the configuration file.
2009-04-14 20:26:22 +02:00
Chad MILLER
978e8e06b0 Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. 2009-04-14 13:20:13 -04:00
Joerg Bruehe
050a0b98fa Merge main 5.0 -> 5.0-build 2009-04-14 18:56:02 +02:00
Sergey Glukhov
04ee3f2ffa Bug#41268 Help Text for \c is misleading in client command line interface(addon)
fixed message for 'help' command
2009-04-14 19:16:30 +05:00
Davi Arnaut
09d4c1da0f Bug#44164: TL_WRITE has no description in lock_descriptions[]
The problem was that new lock types were being added without a
corresponding description. Since the lock types (enum values)
are used as indices to the description array, the descriptions
could be shifted depending on the lock type. The solution is to
ensure that every lock type has a correspondent description.
2009-04-14 14:05:32 +02:00
Sergey Glukhov
c0db307e28 5.0-bugteam->5.1-bugteam merge 2009-04-14 19:17:44 +05:00
Tatiana A. Nurnberg
42094d3f40 auto-merge 2009-04-14 17:09:19 +02:00
Tatiana A. Nurnberg
4e2a7d366b auto-merge 2009-04-14 16:38:55 +02:00
Gleb Shchepa
9952fa7a36 Bug #42563: Message tells me to repair table though Storage
Engine doesn't allow me to.

In case of incompatible changes between old and new table
versions, the mysqlcheck program prints error messages like
this:
  error: Table upgrade required. Please do
         "REPAIR TABLE `table_name`" to fix it!

However, InnoDB doesn't support REPAIR TABLE query, so the
message is confusing.


Error message text has been changed to:

  Table upgrade required. Please do "REPAIR TABLE `table_name`"
  or dump/reload to fix it!"
2009-04-14 19:19:15 +05:00
Narayanan V
5592d206f8 Importing test cases for IBMDB2I
The current patch

-- Adds the ibmdb2i suite
-- related include(.inc) files
-- tests for Bug#44020 and Bug#44025
2009-04-14 16:32:55 +05:30
Joerg Bruehe
7628ca310d Merge a tool change needed for cluster ("CGE") builds
to achieve the correct package names ("scripts/make_binary_distribution.sh").
2009-04-14 12:29:59 +02:00
MySQL Build Team
c38338d761 Merge in missing changes from mysql-5.0.79-release 2009-04-13 21:06:24 +02:00
MySQL Build Team
fbbbf5f196 Merge in changes from mysql-5.0.79-release branch 2009-04-13 20:53:32 +02:00
karen.langford@sun.com
ae599fcd2c Raise version number after cloning 5.0.80 2009-04-13 19:50:28 +02:00
Sergey Glukhov
7ff5b7a936 Bug#43385 Cannot ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME when Views exist(addon)
mysql_rename_view can not rename view if database is not the same.
The fix is to add new argument 'new_db' to mysql_rename_view() and
allow rename with different databases
(only for ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME).
2009-04-13 18:09:10 +05:00
Narayanan V
6c08e3c2fb merging with mysql-5.1-bugteam 2009-04-13 17:05:40 +05:30
Narayanan V
d7026cb968 merging with mysql-5.1-bugteam tree 2009-04-13 16:51:24 +05:30
Narayanan V
93b132c5ee merging with mysql-5.1-bugteam tree 2009-04-13 16:26:21 +05:30
Joerg Bruehe
f318c6849b Merge the 5.1.31sp1 release back into the mainline.
True to our way of doing QSP versions, this doesn't include any new changes
but just backports of some important bug fixes that were also contained
in version 5.1.32.
2009-04-11 11:46:14 +02:00
Chad MILLER
538fdd3d4b Merge fix for bug 39559 and bugteam trunk. 2009-04-10 10:18:57 -04:00
Sergey Glukhov
5c5691e8ec Bug#43385 Cannot ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME when Views exist
allow 'rename view' for ALTER ...UPGRADE DATA DIRECTORY NAME command.
it's safe because a view has valid internal db&table names in this case.
2009-04-10 14:25:48 +05:00
Narayanan V
4a12ecf7d9 Bug#44025 Some schema names longer than 8 characters not supported by IBMDB2I
On IBM i 5.4, schemas with names that are longer 
than 8 characters and contain digits or an underscore
cannot contain IBMDB2I tables, even though this should
theoritically be possible if all alpha characters
are uppercase.

THe current patch fixes the IBMDB2I engine to
allow digits and the underscore(_) to be used in
schema names longer than 8 characters on IBM i 5.4.
2009-04-10 13:18:07 +05:30
Narayanan V
9887dd7a66 Bug#44022 CREATE TABLE sometimes fails silently for IBMDB2I engine
In some circumstances, when a table is created with
the IBMDB2I engine, the CREATE TABLE statement will
return successfully but the table will not exist.

The current patch addresses the above issue and causes
CREATE to fail and report and error to the user.
2009-04-10 13:01:15 +05:30
Narayanan V
39d9d106bf Bug#44020 Unicode Swedish collations not working with IBMDB2I
The utf8_swedish_ci and ucs2_swedish_ci
collations do not work with indexes on 
IBMDB2I tables.

The current patch adds the mapping for
ucs2_swedish collation and removes the 
ucs2_spanish2 mapping which is not
supported by any version of the operating
system.
2009-04-10 11:56:54 +05:30
Chad MILLER
aa449c1053 Bug#39559: dump of stored procedures / functions with C-style \
comment can't be read back

A change to the lexer in 5.1 caused slash-asterisk-bang-version
sections to be terminated early if there exists a slash-asterisk-
style comment inside it.  Nesting comments is usually illegal,
but we rely on versioned comment blocks in mysqldump, and the
contents of those sections must be allowed to have comments.

The problem was that when encountering open-comment tokens and
consuming -or- passing through the contents, the "in_comment"
state at the end was clobbered with the not-in-a-comment value,
regardless of whether we were in a comment before this or not.  

So, """/*!VER one /* two */ three */""" would lose its in-comment
state between "two" and "three".  Save the echo and in-comment
state, and restore it at the end of the comment if we consume a 
comment.
2009-04-09 22:18:18 -04:00
Davi Arnaut
064c1b2cac Bug#43706: libmysqld segfaults when re-intialised
Bug#44091: libmysqld gets stuck waiting on mutex on initialization

The problem was that libmysqld wasn't enforcing a certain
initialization and deinitialization order for the mysys
library. Another problem was that the global object used
for management of log event handlers (aka LOGGER) wasn't
being prepared for a possible reutilization.

What leads to the hang/crash reported is that a failure
to load the language file triggers a double call of the
cleanup functions, causing an already destroyed mutex to
be used.

The solution is enforce a order on the initialization and
deinitialization of the mysys library within the libmysqld
library and to ensure that the global LOGGER object reset
it's internal state during cleanup.
2009-04-09 12:25:25 -03:00
Andrei Elkin
ae758cbd52 Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY
Bug#319  if while a non-transactional slave is replicating a transaction possible problem

only testing related: addressing reviewers' comments.
2009-04-09 16:05:41 +03:00
Luis Soares
49ab049707 manual merge: 5.0-bugteam --> 5.1-bugteam
Note: empty changeset.
2009-04-09 12:30:44 +01:00
Luis Soares
dc3fad94b4 BUG#13684: SP: DROP PROCEDURE|FUNCTION IF EXISTS not binlogged if
routine does not exist 
      
There is an inconsistency with DROP DATABASE IF EXISTS, DROP TABLE IF
EXISTS and DROP VIEW IF EXISTS: those are binlogged even if the DB or
TABLE does not exist, whereas DROP PROCEDURE IF EXISTS does not. It
would be nice or at least consistent if DROP PROCEDURE/STATEMENT
worked the same too.
      
Fixed DROP PROCEDURE|FUNCTION IF EXISTS by adding a call to
mysql_bin_log.write in mysql_execute_command. Checked also if all 
documented "DROP (...) IF EXISTS" get binlogged.
      
NOTE: This is a 5.0 backport patch as requested by support.
2009-04-09 11:40:22 +01:00
Narayanan V
cec52793fb merging with mysql-5.1-bugteam 2009-04-09 16:04:28 +05:30
Sergey Glukhov
c9f068894d null merge 2009-04-09 14:58:23 +05:00
Sergey Glukhov
c86964205c null merge 2009-04-09 14:57:30 +05:00
Sergey Glukhov
7d8a970f6d auotmerge 2009-04-09 14:55:23 +05:00
Sergey Glukhov
c641d962b3 5.0-bugteam->5.1-bugteam merge 2009-04-09 14:38:50 +05:00
He Zhenxing
10234f23e6 Null merge the fix only for 5.0-bugteam 2009-04-09 17:24:36 +08:00
Sergey Glukhov
db992986fe Bug#43833 Simple INSERT crashes the server
The crash happens due to wrong 'digits' variable value(0),
'digits' can not be 0, so the fix is use 1 as min allowed value.
2009-04-09 14:19:31 +05:00
He Zhenxing
b6e8991cd1 Fix compile error on windows for BUG#37145 on 5.0-bugteam 2009-04-09 16:58:18 +08:00
Narayanan V
f9b33d2286 merging with mysql-5.1-bugteam tree 2009-04-09 14:04:34 +05:30
Narayanan V
9b1076b471 Bug#38848 myisam_use_mmap causes widespread myisam corruption on windows
Currently the memory map is being created
with a size that is greater than the size 
of the underlying datafile. This can cause
varying behaviour,

e.g. 

In windows the size of the datafile
is increased, while on linux it remains
the same.

This fix removes the increment margin to
the size that is used while creating the
memory map.
2009-04-09 13:48:23 +05:30
Anurag Shekhar
b745d02a03 merging with 5.0 bugteam tree 2009-04-09 13:36:47 +05:30
Anurag Shekhar
1f7efe4e1c merging with 5.0-bugteam tree. 2009-04-09 13:30:04 +05:30
He Zhenxing
6c239bb7cc Null merge from 5.0-bugteam 2009-04-09 15:47:06 +08:00
He Zhenxing
74a332d504 post fix compiling problem after push BUG#37145 to 5.0-bugteam 2009-04-09 15:42:59 +08:00
He Zhenxing
56230bd67d Auto merge 2009-04-09 14:31:09 +08:00
He Zhenxing
41361d8946 Post fix of BUG#37145
Binlog the CREATE EVENT unless the created event been successfully dropped

Modified Query_log_event constructor to make sure that error_code
is not set to ER_SERVER_SHUTDOWN or ER_QUERY_INTERRUPTED errors
when NOT_KILLED
2009-04-09 14:22:06 +08:00
He Zhenxing
72252108f7 auto merge from 5.0-bugteam 2009-04-09 07:58:57 +08:00
He Zhenxing
83d710e84f auto merge 2009-04-09 07:53:21 +08:00
He Zhenxing
435d6631aa Manually merge BUG#37145 to 5.1-bugteam 2009-04-09 07:42:51 +08:00