mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
59801 commits 2793 branches 343 tags 1.7 GiB
Commit graph

59801 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjorn Munch
b40dd1e592 Merge from next-mr 2009-12-16 12:14:14 +01: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
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
Alexander Nozdrin
713ed2d243 Auto-merge (empty) from mysql-5.1. 2009-12-11 10:01:27 +03:00
Alexander Nozdrin
bd1f8f5bfa Auto-merge from mysql-trunk. 2009-12-11 09:20:49 +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
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
He Zhenxing
cbafed1cae Auto merge from 5.1-rep-semisync 2009-12-05 10:28:53 +08:00
Marc Alff
57fd11788e WL#2360 Performance schema 
Part II, engines instrumentation
 2009-12-04 18:26:15 -07:00
Alexander Nozdrin
3df1cf6cb1 Manual merge from mysql-5.1. 2009-12-04 16:26:03 +03:00
Alexander Nozdrin
ba38e6014f Auto-merge from mysql-next-mr. 2009-12-04 15:39:09 +03:00
Alexey Kopytov
616a09ed09 Disable the test case innodb-autonic.test until BUG#49267 is fixed 
Add the test to disabled list and remove from the experimental list.
 2009-12-04 13:54:43 +03:00
Gleb Shchepa
fff48e52c1 manual merge mysql-5.1-bugteam --> mysql-trunk-merge 2009-12-04 14:20:18 +04:00
He Zhenxing
6a213f3a60 Postfix after merge patch for Bug#49020 2009-12-04 17:54:11 +08:00
He Zhenxing
a4bd241536 Auto merge fixes for Bug#49020 2009-12-04 16:05:35 +08:00
He Zhenxing
b17c1a7961 Auto merge postfix of Bug#49020 2009-12-04 13:46:06 +08:00
He Zhenxing
eaf517bc7d Post fix for previous patch of Bug#49020 
Added back n_frees, use 'clear' instead of 'free' since memory is
not freed here.
 2009-12-04 13:43:38 +08:00
He Zhenxing
ab157a0470 Auto Merge fix for Bug#49170 2009-12-04 10:05:43 +08:00
He Zhenxing
7954a1717b Auto merge fix for Bug#49020 2009-12-04 10:04:14 +08:00
He Zhenxing
16ec25c0a8 Bug#49020 Semi-sync master crashed with free_pool == NULL, assertion `free_pool_' 
Before this patch, semisync assumed transactions running in parallel
can not be larger than max_connections, but this is not true when
the event scheduler is executing events, and cause semisync run out
of preallocated transaction nodes.

Fix the problem by allocating transaction nodes dynamically.

This patch also fixed a possible deadlock when running UNINSTALL
PLUGIN rpl_semi_sync_master and updating in parallel. Fixed by
releasing the internal Delegate lock before unlock the plugins.
 2009-12-04 09:46:33 +08:00
He Zhenxing
4ea0296e43 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-04 09:43:39 +08:00
Alexey Kopytov
3bf0fdd74c Null merge from mysql-5.1-bugteam to mysql-trunk-merge. 2009-12-03 23:49:30 +03:00
Alexey Kopytov
cf70d90a4d Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2009-12-03 23:46:06 +03:00
Alexey Kopytov
7f4479915e Automerge from mysql-5.1-bugteam to mysql-trunk-merge. 2009-12-03 18:18:29 +03:00