Commit graph

86121 commits

Author SHA1 Message Date
unknown
c9f0792c29 Added 'const' to row_pack_length
(pre fts).
2013-09-20 17:15:33 +03:00
unknown
e5746665c9 merge 10.0-base -> 10.0 2013-09-26 21:20:15 +03:00
unknown
9d83468e78 merge 5.5 -> 10.0-base 2013-09-25 21:07:06 +03:00
Sergei Golubchik
828be0d9ba TokuuDB: add handlerton::discover_table_existence() method 2013-09-25 19:42:28 +02:00
Sergei Golubchik
20031c6273 Enable TokuDB online ALTER
sql/create_options.cc:
  an utility function to compare two filled-in engine_option structures
sql/sql_table.cc:
  * two keys are different if their option_struct's differ
    (for ALTER TABLE DROP key, ADD key)
  * engines doing inplace alter must see the new frm image
2013-09-25 19:42:22 +02:00
Sergei Golubchik
fd55306254 update ALTER ONLINE to mean ALTER LOCK=NONE, not ALTER ALGORITHM=INPLACE.
Fix test results accordingly.
2013-09-25 19:42:12 +02:00
Sergei Golubchik
dcc35b666a extract privilege tests from delete_returning.test into delete_returning_grant.test
that is not run for embedded server
2013-09-25 19:41:53 +02:00
Sergei Golubchik
1989ae9e10 fix TZ setting to be Windows-compatible 2013-09-25 19:41:41 +02:00
Sergei Golubchik
ed2c573451 update /etc/my.cnf.d/server.cnf to say 10.0, not 5.5 2013-09-25 19:41:28 +02:00
Sergei Golubchik
6574c45ecb bzr ignore 2013-09-25 19:41:04 +02:00
Sergei Golubchik
181b13d926 simplify CMakeLists.txt for cassandra/connect engines
now, if the dynamic plugin puts itself in a distinct component, then
* ${plugin}.cnf file is generated and installed automatically
* a separate RPM is generated automatically
* necessary FILELIST/PROVIDES/OBSOLETES/REQUIRES are filled in automatically
2013-09-25 19:32:14 +02:00
unknown
64d6d8334f merge 5.3 -> 5.5 2013-09-25 17:16:13 +03:00
unknown
ec7da1561e MDEV-5039: incorrect Item_func_regex::update_used_tables()
Other fix of maybe_null problem and revert of revno: 3608 "MDEV-3873 & MDEV-3876 & MDEV-3912 : Wrong result (extra rows) with ALL subquery from a MERGE view."
2013-09-25 15:30:13 +03:00
Vladislav Vaintroub
72dffd878e MDEV-5062 : disable jemalloc by default everywhere, except Linux and OSX.
Bundled jemalloc can only be on  Linux and OSX without problems.
  
On BSDs, build fails because make does not understand GNU extensions (also BSDs do not need  jemalloc, it is already system malloc).
On Solaris, build fails with compile error.
2013-09-24 19:52:51 +02:00
Vladislav Vaintroub
11fc6b49d9 MDEV-5053 - fix cyclic dependency when building with Ninja CMake generator 2013-09-23 23:33:18 +02:00
Michael Widenius
b722aae621 Allow unique prefix for command line options, like any GNU program. 2013-09-23 20:17:46 +03:00
Michael Widenius
5f0c91998a TokuDB fixes:
- Better error message when using huge pages
- Fixed link error
- Test suite should run even on system with huge pages

storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake:
  Fixed that linking works on systems that uses lib64
storage/tokudb/ft-index/portability/huge_page_detection.cc:
  Better error message
storage/tokudb/mysql-test/rpl/suite.pm:
  Test suite should run even on system with huge pages
storage/tokudb/mysql-test/tokudb/suite.pm:
  Test suite should run even on system with huge pages
2013-09-23 20:17:03 +03:00
Sergei Golubchik
aaa3ec4aca fix debian packaging (again).
we don't build innodb plugin in 10.0 yet
2013-09-21 20:23:51 +02:00
Alexander Barkov
232a07a9b6 A clean-up for the base64 functions.
SIZEOF_INT can never be 8. Removing the redundant #ifdef code.
2013-09-24 17:28:02 +04:00
Michael Widenius
9081c4dc6b Added information about the MariaDB foundation
Updated information in SHOW AUTHORS and SHOW CONTRIBUTORS
SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore.

CMakeLists.txt:
  Install TODO and CREDITS files
CREDITS:
  Information about the MariaDB foundation
README:
  Updated to include the MariaDB foundation
mysql-test/r/contributors.result:
  Updated contributors
mysql-test/r/show_check.result:
  SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore.
scripts/make_binary_distribution.sh:
  Added TODO and CREDITS
sql/authors.h:
  Updated list of active authors
sql/contributors.h:
  Updated list of active contributors and members of the MariaDB foundation
sql/sql_show.cc:
  Extend comment lengths
sql/sql_yacc.yy:
  SHOW AUTHORS and SHOW CONTRIBUTORS are not depricated anymore
2013-09-23 20:27:37 +03:00
Michael Widenius
26474cd204 Fixed issue where tokudb xz used lib64 in some cases, which caused a link failure 2013-09-23 20:25:14 +03:00
Alexander Barkov
e33582d20d Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6 2013-09-23 18:58:33 +04:00
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
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
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