mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
86283 commits 2774 branches 343 tags 1.6 GiB
Commit graph

86283 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergey Vojtovich
9cbd53bfb2 Merge Spider updates. Fixes 
MDEV-4735 - Assertion `! is_set()' fails in Diagnostics_area::set_ok_status on
            attempt to create a temporary SPIDER table connecting to
            non-existing source
MDEV-4737 - Server crashes in spider_mysql_handler::append_match_against on
            SELECT .. MATCH .. AGAINST .. BOOLEAN MODE
MDEV-4738 - INSERT DELAYED on a SPIDER table doesn't produce
            ER_DELAYED_NOT_SUPPORTED, doesn't work like delayed, and doesn't
            honor lock_wait_timeout like normal INSERT
 2013-09-23 16:22:31 +04:00
Sergey Petrunya
d998a1635f MDEV-5045: Server crashes in QPF_query::print_explain with log_slow_verbosity='explain' 
- Don't print a plan when the statement didn't produce it
- Also, add first testcase. We can't check the EXPLAIN from the slow log itself, though.
 2013-09-20 17:45:24 +04:00
Sergei Golubchik
2fe0836eed 5.5.33a merge 2013-09-20 11:29:01 +02:00
Sergey Vojtovich
815c607dcf MDEV-4879 - Merge test cases for new CREATE TEMPORARY TABLE privilege model 
- merged test cases for MySQL bug#27480
- fixed that LOCK TABLES was unable to open temporary table
  (covered by grant2 test, merged appropriate code from 5.6)
- commented lines that cause server crash in merge test, reported
  MDEV-5042 (not relevant to bug#27480)
 2013-09-20 13:12:53 +04:00
Sergei Golubchik
8b5938a127 remove unused LEX::contains_plaintext_password 2013-09-21 16:44:49 +02:00
Sergei Golubchik
27c9ed11ff TokuDB now compiles and passes all tests as in 5.5 2013-09-21 10:16:06 +02:00
Sergei Golubchik
9af177042e 10.0-base merge. 
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
 2013-09-21 10:14:42 +02:00
Sergei Golubchik
28ec372744 5.5.33a 2013-09-19 22:24:59 +02:00
Sergei Golubchik
6e52631065 MDEV-4979 mysqld_safe section in my.cnf doesn't have mariadb equivalent 
read also [mariadb_safe] section.
modify the manpage accordingly (and remove a netware-specific option from it)
 2013-09-19 22:24:39 +02:00
Sergei Golubchik
93b7d00f00 MDEV-5035 debian package conflict libmariadbclient18 5.5.33+maria-1~wheezy vs. mariadb-server-5.3 5.3.12-mariadb122~wheezy 2013-09-19 20:19:17 +02:00
Sergei Golubchik
43f4e364f0 MDEV-5021 tokudb ft-index libraries are build with -DWITHOUT_TOKUDB=1 2013-09-19 20:19:10 +02:00
Sergei Golubchik
cd077ca839 MDEV-5026 cannot use system jemalloc 2013-09-19 20:19:00 +02:00
Sergei Golubchik
4232874772 fix debian builds. don't use WITH_MAX anymore 2013-09-19 11:58:44 +02:00
Sergey Petrunya
2add402891 MDEV-407: Print EXPLAIN [ANALYZE] in the slow query log 
- Initial implementation.
 2013-09-19 08:33:58 +04:00
Sergei Golubchik
275101c624 merge 2013-09-18 20:14:21 +02:00
Kentoku SHIBA
240e62b890 fix MDEV-4735 Assertion `! is_set()' fails in Diagnostics_area::set_ok_status on attempt to create a temporary SPIDER table connecting to non-existing source 2013-09-19 03:05:52 +09:00
Kentoku SHIBA
708a28ff79 fix MDEV-4738 INSERT DELAYED on a SPIDER table doesn't produce ER_DELAYED_NOT_SUPPORTED, doesn't work like delayed, and doesn't honor lock_wait_timeout like normal INSERT 2013-09-19 03:03:55 +09:00
Kentoku SHIBA
178e6cfb28 fix MDEV-4737 Server crashes in spider_mysql_handler::append_match_against on SELECT .. MATCH .. AGAINST .. BOOLEAN MODE 2013-09-19 03:01:32 +09:00
Sergei Golubchik
f89e6c442c MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB release 
Don't fail when an frm is inconsistent (legacy DB_TYPE_xxx code doesn't match the
engine name), use the engine name, ignore the legacy code.
 2013-09-18 17:25:10 +02:00
Sergei Golubchik
4ec2e9d7ed 5.5 merge and fixes for compiler/test errors 2013-09-18 13:07:31 +02:00
Sergei Golubchik
197bdbae4d fix upgrades when mariadb-galera-server-5.5 is installed 2013-09-18 10:30:23 +02:00
Sergey Vojtovich
a6add4ff43 MDEV-4883 - Not all host_cache tests have been merged 
Merged main.host_cache_size_functionality test.

Test had to be adjusted because MariaDB doesn't have
MySQL variables auto-tuning code.
 2013-09-18 11:17:16 +04:00
Sergei Golubchik
a5d7e70119 MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB release 
don't set TABLE_SHARE::keys before TABLE_SHARE::key_info is set,
otherwise an error might leave only the first property set and it will
confuse TABLE_SHARE::destroy()
 2013-09-18 09:09:27 +02:00
unknown
9dbeb9882f MDEV-4993:Impossible to free a dynamic column 
Fix of API of dynamic columns (it made uniform and real function used to free the string).
 2013-09-17 22:05:15 +03:00
Sergei Golubchik
68df7a0137 merge with 5.5-release 2013-09-17 20:44:34 +02:00
Sergei Golubchik
69324831a4 mariadb-tokudb-engine deb package is not architecture-independent 2013-09-17 17:07:45 +02:00
Sergey Vojtovich
ce0d5539ea Merge Spider updates. Fixes 
MDEV-4949 - Spider engine causes compilation errors if compiled without
            partitioning
 2013-09-17 19:03:39 +04:00
Sergey Vojtovich
45d3ada7c2 MDEV-4684 - Enhancement request: --init-command support for mysqlslap 
Added --init-command argument to mysqlslap: SQL Command to execute
when connecting to MySQL server. Will automatically be re-executed
when reconnecting.
 2013-09-17 18:51:14 +04:00
Sergey Petrunya
e2d1aaec82 Merge fix for MDEV-5037 into 5.5 2013-09-23 10:33:14 +04:00
unknown
28a8d40c22 Tokudb made compilig. 2013-09-23 12:17:18 +03:00
Vladislav Vaintroub
b0d98371b9 Update feedback plugin to recognize Windows 8.1 / Windows Server 2012 R2. 2013-09-20 14:37:30 +02:00
Sergey Petrunya
422c55a240 MDEV-5037: Server crash on a JOIN on a derived table with join_cache_level > 2 
- The crash was caused because the optimizer called handler->multi_range_read_info()
  on a derived temporary table.  That table has been created, but not opened yet.
  Because of that, handler::table was NULL, which caused crash.
  Fixed by changing DS-MRR methods to use handler::table_share instead. 
  handler::table_share is set in handler ctor, so this should be safe.
 2013-09-20 14:47:38 +04:00
Sergey Vojtovich
8e9cead365 Fixed tokudb with ccache build failure. 2013-09-17 17:37:03 +04:00
Kentoku SHIBA
6c76e5032a fix build errors 2013-09-17 22:08:07 +09:00
Sergey Petrunya
ae6e95c498 Code cleanup. 2013-09-17 16:03:40 +04:00
Sergey Petrunya
abf4a910f2 [SHOW] EXPLAIN UPDATE/DELETE 
- Make QPF structures store data members, not strings. 
  This is not fully possible, because table names (and hence 
  key names, etc) can be deleted, and we have to store strings.
 2013-09-17 15:01:34 +04:00
Sergey Vojtovich
f7f7f37fed Fixed jemalloc with ccache build failure. 2013-09-17 13:49:49 +04:00
Sergei Golubchik
6d06ccbe53 specify deb conflicts correctly 2013-09-16 21:21:15 +02:00
Kentoku SHIBA
d03890e5ee add debug logs. 2013-09-17 03:31:13 +09:00
Kentoku SHIBA
0b4a89a152 fix MDEV-4949 Spider engine causes compilation errors if compiled without partitioning 2013-09-17 03:30:03 +09:00
Kentoku SHIBA
dc01d230ed add some direct aggregate feature. 2013-09-17 03:22:54 +09:00
Kentoku SHIBA
e9d53a384c fix a case of different linked table name for mrr. 2013-09-17 03:19:55 +09:00
Kentoku SHIBA
74bea98ea5 fix mrr duplicate key 2013-09-17 03:17:26 +09:00
Kentoku SHIBA
6458e115a0 add spider_bka_mode=2 2013-09-17 03:14:36 +09:00
Sergey Vojtovich
d4f83cc40c MDEV-4911 - add KILL query id, and add query id information to processlist 
- issue proper error message if query id is not found
- do not allow kill query id 0
- fixed ps-protocol and embedded tests
 2013-09-16 18:14:46 +04:00
Alexander Barkov
940f554207 Merge from 5.3 
pending merges:
  Alexander Barkov 2013-09-16 backport from 10.0
 2013-09-16 16:05:53 +04:00
Alexander Barkov
779003e180 backport from 10.0 
mtr can crash occasionally.
This happens when mtr sends to a child mtr process (or vice-versa) a packet,
that gets truncated or, perhaps, split in two.
Then the other side cannot deserialize it and fails as above.
 2013-09-16 16:03:55 +04:00
Alexander Barkov
b20deca695 Merge from 5.3 2013-09-16 14:08:43 +04:00
Alexander Barkov
5464e904b6 MDEV-4861 TIME/DATETIME arithmetics does not preserve INTERVAL precision 
Adding tests only.

The problem was earlier fixed by 
MDEV-4724 Some temporal functions do not preserve microseconds
 2013-09-16 14:07:01 +04:00
Alexander Barkov
6a5f07ee87 Merge from 5.3 
pending merges:
  Alexander Barkov 2013-09-16 MDEV-4870 Wrong values of CASE, COALESCE, IF...
 2013-09-16 13:54:12 +04:00