Commit graph

59782 commits

Author SHA1 Message Date
Alexander Nozdrin
5098a2bc69 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-16 12:57:26 +03:00
Alexander Nozdrin
2389aee456 Auto-merge from mysql-next-mr. 2009-12-16 12:53:00 +03:00
Alexander Nozdrin
a7073e53a4 Auto-merge from mysql-trunk. 2009-12-16 12:52:37 +03:00
Alexander Nozdrin
b3d9906907 Update version in mysql-next-mr.
According to new numbering scheme mysql-next-mr does not have
its own version. Some version placeholder is used instead.

It's been agreed that 5.5.99 will be used as a placeholder.
2009-12-16 11:32:31 +03:00
Alexander Nozdrin
642f075569 Auto-merge from mysql-trunk. 2009-12-16 11:25:21 +03:00
Alexander Nozdrin
2ae8acc294 Remove .cvsignore files (attempt #2). 2009-12-16 11:24:30 +03:00
Mattias Jonsson
f3ff6e7788 merge 2009-12-16 08:46:47 +01:00
Mattias Jonsson
2cb6f123b6 post push patch of bug#49369 updating test by removing
select of platform dependend variable.
2009-12-16 08:45:25 +01:00
Mattias Jonsson
3e4afe7dbd merge 2009-12-15 23:50:30 +01:00
Mattias Jonsson
a39a91112e merge (and including the fix for bug#48939 since that was not included in mysql-trunk-bugfixing). 2009-12-15 23:47:04 +01:00
Alexander Nozdrin
5bbdda5ebe Null-merge from mysql-trunk-bugfixing (backporting revisions). 2009-12-15 23:47:08 +03:00
Alexander Nozdrin
0b1a15e9a7 Backporing patch for Bug#48351 (Inconsistent library names for semisync plugin)
from mysql-next-mr-bugfixing to mysql-trunk-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: zhenxing.he@sun.com-20091127084945-wng7gakygduv3q8k
committer: He Zhenxing <zhenxing.he@sun.com>
branch nick: 5.1-rep-semisync
timestamp: Fri 2009-11-27 16:49:45 +0800
message:
  Bug#48351 Inconsistent library names for semisync plugin
  
  The semisync plugin library names on Unix like systems were prefixed with
  'lib', which did not follow the conventions.
  
  Fix the problem by removing the 'lib' prefix on Unix systems.
------------------------------------------------------------
2009-12-15 23:40:20 +03:00
Alexander Nozdrin
7688c7369c Backporting a patch for Bug#49170 (Inconsistent placement of semisync
plugin prevents it from getting tested) from mysql-next-mr-bugfixing
to mysql-trunk-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: zhenxing.he@sun.com-20091204014339-2m06r42vajhm9vke
committer: He Zhenxing <zhenxing.he@sun.com>
branch nick: 5.1-rep-semisync
timestamp: Fri 2009-12-04 09:43:39 +0800
message:
  Bug#49170 Inconsistent placement of semisync plugin prevents it from getting tested
  
  Add $basedir/lib/plugin to the search paths for semisync plugins.
------------------------------------------------------------
2009-12-15 23:23:01 +03:00
Alexander Nozdrin
25f365f610 Backporting patch for Bug#47756
from mysql-next-mr-bugfixing into mysql-trunk-bugfixing.

NOTE: the "utf8_phone_ci" collation does not exist in mysql-trunk yet,
so another collation with 2-byte collation ID is used: "utf8_test_ci".

This patch will be null-merged to mysql-next-mr-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: bar@mysql.com-20091207121153-hs3bqbmr0719ws21
committer: Alexander Barkov <bar@mysql.com>
branch nick: mysql-next-mr.b47756
timestamp: Mon 2009-12-07 16:11:53 +0400
message:
  Bug#47756 Setting 2byte collation ID with 'set names' crashes the server
  
  The problem is not actually related to 2byte collation IDs.
  The same crash happens if you change the collation ID in
  mysql-test/str_data/Index.xml to a value smaller than 256.
  
  Crash happened in SQL parser, because the "ident_map" and "state_map"
  arrays were not initialized in loadable utf8 collations.
  
  Fix: adding proper initialization of the "ident_map" and "state_map"
  members for loadable utf8 collations.
------------------------------------------------------------
2009-12-15 23:20:53 +03:00
Alexander Nozdrin
efaa28abb4 Post-merge fix. 2009-12-15 10:31:49 +03:00
Alexander Nozdrin
83aa3cf4e3 Post-merge fix (binlog_unsafe). 2009-12-15 10:25:46 +03:00
Evgeny Potemkin
5466618420 Post-merge fix. 2009-12-14 17:17:41 +03:00
Alexander Nozdrin
bc2d4e620a Manual merge from mysql-trunk-merge.
Conflicts:
  - extra/comp_err.c
  - mysql-test/collections/default.experimental
  - mysql-test/r/archive.result
  - mysql-test/r/select.result
  - mysql-test/suite/binlog/r/binlog_unsafe.result
  - mysql-test/suite/binlog/t/binlog_unsafe.test
  - mysql-test/suite/rpl/t/disabled.def
  - mysql-test/t/archive.test
  - mysql-test/t/select.test
  - sql/item.cc
  - sql/item.h
  - sql/item_timefunc.cc
  - sql/sql_base.cc
  - sql/sql_delete.cc
  - sql/sql_load.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
  - storage/innobase/handler/ha_innodb.cc
  - vio/vio.c
2009-12-12 23:38:59 +03:00
Alexander Nozdrin
69cfd5c8ec Manual merge from mysql-trunk.
Conflicts:
  - client/mysqltest.cc
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/t/disabled.def
  - sql/mysqld.cc
  - sql/opt_range.cc
  - sql/sp.cc
  - sql/sql_acl.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
2009-12-11 12:39:38 +03:00
Horst.Hunger
b3eb974ac7 Fix for bug#46117: This test is replaced by plugin.test also containing a CRESTE TABLE on example db. Example DB only exists as plugin. 2009-12-11 09:30:17 +01:00
Alexander Nozdrin
713ed2d243 Auto-merge (empty) from mysql-5.1. 2009-12-11 10:01:27 +03:00
Alexander Nozdrin
963e7fc7b6 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-11 09:24:29 +03:00
Alexander Nozdrin
12e505fd9e Auto-merge from mysql-next-mr. 2009-12-11 09:21:34 +03:00
Alexander Nozdrin
bd1f8f5bfa Auto-merge from mysql-trunk. 2009-12-11 09:20:49 +03:00
Alexander Nozdrin
b097816d69 Auto-merge from mysql-trunk. 2009-12-11 09:20:33 +03:00
Alexander Nozdrin
2757eab544 Remove BitKeeper dir and .cvsignore. 2009-12-11 09:19:51 +03:00
Alexander Nozdrin
cfce3d0eb1 Auto-merge (empty) from mysql-next-mr. 2009-12-11 09:03:38 +03:00
Alexander Nozdrin
43f1f37cfc Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-11 09:02:32 +03:00
Alexander Nozdrin
0631ce8dd8 Auto-merge (empty) from mysql-next-mr. 2009-12-11 09:01:18 +03:00
Alexander Nozdrin
633536871c Auto-merge (empty) from mysql-trunk. 2009-12-11 09:00:57 +03:00
Alexander Nozdrin
de06a06afa Auto-merge (empty) from mysql-trunk. 2009-12-11 08:56:28 +03:00
Alexander Nozdrin
bbea46f1f0 Auto-merge from mysql-next-mr-bugfixing. 2009-12-11 08:54:53 +03:00
Alexander Nozdrin
b8aace9485 Auto-merge from mysql-trunk-bugfixing. 2009-12-11 08:54:36 +03:00
Alexander Nozdrin
3a33af89d8 Auto-merge from mysql-next-mr-bugfixing. 2009-12-10 22:27:28 +03:00
Alexander Nozdrin
28bc3aa791 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-10 17:48:40 +03:00
Alexander Nozdrin
fcbbac8b37 Auto-merge (empty) from mysql-trunk. 2009-12-10 17:45:22 +03:00
Alexander Nozdrin
324e1a9dbc Auto-merge from mysql-next-mr. 2009-12-10 17:44:36 +03:00
Sergey Vojtovich
31c1efdb32 After merge fix: pthread_mutext_[un]lock -> mysql_mutex_[un]lock. 2009-12-10 13:19:06 +04:00
Sergey Vojtovich
a806fd134d Merge mysql-next-mr to mysql-next-mr-svoj. 2009-12-09 15:03:34 +04:00
Sergey Vojtovich
1e2abc8f29 An addition to backport of
WL#3951 - MyISAM: Additional Error Logs for Data Corruption
Fixed partition_repair_myisam.test.
2009-12-09 11:33:28 +04:00
Magne Mahre
c24ef7e929 Bug#35589 SET PASSWORD caused a crash
Bug#35591 FLUSH PRIVILEGES caused a crash

A race condition on the privilege hash tables (proc_priv_hash
and func_priv_hash) caused one thread to try to delete elements
that had already been deleted by another thread.

The bug was caused by reading and saving the pointers to 
the hash tables outside mutex protection.  This led to an
inconsistency where a thread copied a pointer to a hash,
another thread did the same, the first thread then deleted
the hash, and the second then crashed when it in turn tried to
delete the deleted hash.

The fix is to ensure that operations on the shared hash structures
happens under mutex protection (moving the locking up a little)
2009-12-08 13:19:38 +01:00
V Narayanan
1e224eb257 merging with mysql-next-mr-svoj 2009-12-08 17:22:59 +05:30
sunanda.menon@sun.com
d6e7402d42 Null-merge from mysql-5.1.40sp1-release 2009-12-08 10:26:11 +01:00
V Narayanan
44a3c5cb93 merging with mysql-next-mr-svoj 2009-12-08 12:38:50 +05:30
Alexander Nozdrin
fd433cfb96 Auto-merge from mysql-next-mr. 2009-12-08 09:55:52 +03:00
He Zhenxing
a92c6c1bfd Auto merge 2009-12-07 21:30:24 +08:00
Sergey Vojtovich
fb1cfa1265 WL#2511 - Add a new table to the Information Schema for TABLESPACE's
Implemented a new INFORMATION_SCHEMA table, which is intended to
provide information about tablespaces.
2009-12-07 16:22:51 +04:00
Alexander Barkov
487e176b20 Bug#47756 Setting 2byte collation ID with 'set names' crashes the server
The problem is not actually related to 2byte collation IDs.
The same crash happens if you change the collation ID in
mysql-test/str_data/Index.xml to a value smaller than 256.

Crash happened in SQL parser, because the "ident_map" and "state_map"
arrays were not initialized in loadable utf8 collations.

Fix: adding proper initialization of the "ident_map" and "state_map"
members for loadable utf8 collations.
2009-12-07 16:11:53 +04:00
Alexander Nozdrin
17fa6edf12 Auto-merge from mysql-next-mr. 2009-12-07 09:08:40 +03:00
He Zhenxing
e8b261508e Merge from trunk-bugfixing 2009-12-05 10:46:29 +08:00