mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
89823 commits 2784 branches 343 tags 1.6 GiB
Commit graph

89823 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Bertrand
c65a9fb4c6 - Commit merged change 
removed:
  extra/yassl/certs/dsa512.der
  extra/yassl/certs/dsa512.pem
added:
  extra/yassl/certs/dsa1024.der
  extra/yassl/certs/dsa1024.pem
  mysql-test/r/ctype_cp932.result
  mysql-test/r/log_errchk.result
  mysql-test/r/show_bad_definer-5553.result
  mysql-test/suite/heap/btree_varchar_null.result
  mysql-test/suite/heap/btree_varchar_null.test
  mysql-test/suite/innodb/r/foreign-keys.result
  mysql-test/suite/innodb/t/foreign-keys.test
  mysql-test/t/ctype_cp932.test
  mysql-test/t/log_errchk.test
  mysql-test/t/show_bad_definer-5553.test
  storage/tokudb/mysql-test/rpl/disabled.def
  storage/tokudb/mysql-test/tokudb_mariadb/r/mdev6519.result
  storage/tokudb/mysql-test/tokudb_mariadb/t/mdev6519.test
modified:
  client/mysql.cc
  cmake/install_layout.cmake
  config.h.cmake
  debian/dist/Debian/control
  debian/dist/Ubuntu/control
  extra/yassl/README
  extra/yassl/certs/ca-cert.pem
  extra/yassl/certs/client-cert.der
  extra/yassl/certs/client-cert.pem
  extra/yassl/certs/client-key.der
  extra/yassl/certs/client-keyEnc.pem
  extra/yassl/certs/server-cert.pem
  extra/yassl/certs/server-keyEnc.pem
  extra/yassl/include/buffer.hpp
  extra/yassl/include/openssl/ssl.h
  extra/yassl/src/buffer.cpp
  extra/yassl/src/handshake.cpp
  extra/yassl/src/yassl_imp.cpp
  extra/yassl/src/yassl_int.cpp
  extra/yassl/taocrypt/include/asn.hpp
  extra/yassl/taocrypt/include/block.hpp
  extra/yassl/taocrypt/include/integer.hpp
  extra/yassl/taocrypt/include/pwdbased.hpp
  extra/yassl/taocrypt/include/runtime.hpp
  extra/yassl/taocrypt/include/sha.hpp
  extra/yassl/taocrypt/src/aes.cpp
  extra/yassl/taocrypt/src/algebra.cpp
  extra/yassl/taocrypt/src/arc4.cpp
  extra/yassl/taocrypt/src/asn.cpp
  extra/yassl/taocrypt/src/blowfish.cpp
  extra/yassl/taocrypt/src/des.cpp
  extra/yassl/taocrypt/src/integer.cpp
  extra/yassl/taocrypt/src/md5.cpp
  extra/yassl/taocrypt/src/misc.cpp
  extra/yassl/taocrypt/src/rabbit.cpp
  extra/yassl/taocrypt/src/random.cpp
  extra/yassl/taocrypt/src/ripemd.cpp
  extra/yassl/taocrypt/src/sha.cpp
  extra/yassl/taocrypt/src/twofish.cpp
  mysql-test/lib/My/Platform.pm
  mysql-test/r/selectivity_innodb.result
  mysql-test/r/type_newdecimal.result
  mysql-test/r/type_time.result
  mysql-test/t/selectivity_innodb.test
  mysql-test/t/type_newdecimal.test
  mysql-test/t/type_time.test
  packaging/rpm-oel/mysql.spec.in
  plugin/auth_socket/auth_socket.c
  plugin/handler_socket/handlersocket/database.cpp
  plugin/handler_socket/handlersocket/handlersocket.cpp
  plugin/handler_socket/handlersocket/hstcpsvr.cpp
  plugin/handler_socket/libhsclient/hstcpcli.cpp
  plugin/handler_socket/libhsclient/socket.cpp
  plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs
  plugin/metadata_lock_info/metadata_lock_info.cc
  plugin/server_audit/server_audit.c
  scripts/comp_sql.c
  scripts/mysql_system_tables_fix.sql
  sql-common/client.c
  sql/event_scheduler.cc
  sql/item.cc
  sql/log.cc
  sql/mysqld.cc
  sql/mysqld.h
  sql/opt_range.cc
  sql/sql_acl.cc
  sql/sql_cache.cc
  sql/sql_priv.h
  sql/sql_select.cc
  sql/sql_show.cc
  sql/sql_statistics.cc
  sql/sys_vars.cc
  storage/cassandra/ha_cassandra.cc
  storage/connect/inihandl.c
  storage/connect/libdoc.cpp
  storage/connect/mycat.cc
  storage/connect/tabxml.cpp
  storage/example/ha_example.cc
  storage/federatedx/ha_federatedx.cc
  storage/heap/hp_hash.c
  storage/innobase/api/api0misc.cc
  storage/mroonga/mrn_table.cpp
  storage/oqgraph/ha_oqgraph.cc
  storage/sequence/sequence.cc
  storage/sphinx/snippets_udf.cc
  storage/tokudb/CMakeLists.txt
  storage/tokudb/ft-index/ft/bndata.cc
  storage/tokudb/ft-index/ft/cachetable/cachetable.cc
  storage/tokudb/ft-index/ft/cachetable/checkpoint.cc
  storage/tokudb/ft-index/ft/cursor.cc
  storage/tokudb/ft-index/ft/ft-cachetable-wrappers.cc
  storage/tokudb/ft-index/ft/ft-flusher.cc
  storage/tokudb/ft-index/ft/ft-hot-flusher.cc
  storage/tokudb/ft-index/ft/ft-ops.cc
  storage/tokudb/ft-index/ft/ft-test-helpers.cc
  storage/tokudb/ft-index/ft/ft-verify.cc
  storage/tokudb/ft-index/ft/ft.cc
  storage/tokudb/ft-index/ft/le-cursor.cc
  storage/tokudb/ft-index/ft/loader/dbufio.cc
  storage/tokudb/ft-index/ft/loader/loader.cc
  storage/tokudb/ft-index/ft/loader/pqueue.cc
  storage/tokudb/ft-index/ft/logger/log_upgrade.cc
  storage/tokudb/ft-index/ft/logger/logcursor.cc
  storage/tokudb/ft-index/ft/logger/logfilemgr.cc
  storage/tokudb/ft-index/ft/logger/logformat.cc
  storage/tokudb/ft-index/ft/logger/logger.cc
  storage/tokudb/ft-index/ft/logger/recover.cc
  storage/tokudb/ft-index/ft/node.cc
  storage/tokudb/ft-index/ft/pivotkeys.cc
  storage/tokudb/ft-index/ft/serialize/block_table.cc
  storage/tokudb/ft-index/ft/serialize/compress.cc
  storage/tokudb/ft-index/ft/serialize/ft-node-deserialize.cc
  storage/tokudb/ft-index/ft/serialize/ft-serialize.cc
  storage/tokudb/ft-index/ft/serialize/ft_node-serialize.cc
  storage/tokudb/ft-index/ft/serialize/sub_block.cc
  storage/tokudb/ft-index/ft/txn/roll.cc
  storage/tokudb/ft-index/ft/txn/rollback-apply.cc
  storage/tokudb/ft-index/ft/txn/rollback-ct-callbacks.cc
  storage/tokudb/ft-index/ft/txn/rollback.cc
  storage/tokudb/ft-index/ft/txn/rollback_log_node_cache.cc
  storage/tokudb/ft-index/ft/txn/txn.cc
  storage/tokudb/ft-index/ft/txn/txn_child_manager.cc
  storage/tokudb/ft-index/ft/txn/txn_manager.cc
  storage/tokudb/ft-index/ft/ule.cc
  storage/tokudb/ft-index/src/errors.cc
  storage/tokudb/ft-index/src/indexer-undo-do.cc
  storage/tokudb/ft-index/src/indexer.cc
  storage/tokudb/ft-index/src/loader.cc
  storage/tokudb/ft-index/src/ydb.cc
  storage/tokudb/ft-index/src/ydb_cursor.cc
  storage/tokudb/ft-index/src/ydb_db.cc
  storage/tokudb/ft-index/src/ydb_env_func.cc
  storage/tokudb/ft-index/src/ydb_row_lock.cc
  storage/tokudb/ft-index/src/ydb_txn.cc
  storage/tokudb/ft-index/src/ydb_write.cc
  storage/tokudb/ft-index/tools/ftverify.cc
  storage/tokudb/ft-index/tools/tdb_logprint.cc
  storage/tokudb/ft-index/tools/tokuftdump.cc
  storage/tokudb/ha_tokudb.cc
  storage/tokudb/mysql-test/tokudb/disabled.def
  storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
  storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test
  storage/xtradb/api/api0misc.cc
  storage/xtradb/buf/buf0buf.cc
  strings/ctype-mb.c
  strings/decimal.c
  support-files/mysql.spec.sh
  tests/async_queries.c
  unittest/sql/my_apc-t.cc
 2014-10-14 17:52:20 +02:00
Olivier Bertrand
0a913e20d2 - Add Sergei fix to enable loading OEM table libs 
modified:
  storage/connect/ha_connect.cc
  storage/connect/reldef.cpp
 2014-10-14 16:42:22 +02:00
Sergey Petrunya
b261ec393a MDEV-6484: Assertion `tab->ref.use_count' failed on query with joins, constant table, multi-part key 
- test_if_skip_sort_order()/create_ref_for_key() may change table 
  access from EQ_REF(index1) to REF(index2). 
- Doing so doesn't make much sense from optimization POV, but since 
  they are doing it, they should update tab->read_record.unlock_row
  accordingly.
 2014-10-14 15:11:06 +04:00
Rich Prohaska
860f00b8a6 Merge branch 'master' into releases/tokudb-7.5 2014-10-13 11:04:37 -04:00
Rich Prohaska
9925e658f4 Merge branch 'master' of github.com:Tokutek/tokudb-engine 2014-10-13 11:01:51 -04:00
Rich Prohaska
2412e51043 DB-739 add test cases 2014-10-13 11:01:39 -04:00
Rich Prohaska
434e309600 update README for tokudb 7.5.0 2014-10-13 09:56:30 -04:00
Alexander Barkov
ec3e6cc88b Merge 10.0-connect -> 10.0 2014-10-13 12:31:55 +04:00
Olivier Bertrand
b10fa87b15 - Remove one gcc warning 
modified:
  storage/connect/tabodbc.cpp
 2014-10-12 15:46:31 +02:00
Rich Prohaska
254d71b52d Merge branch 'master' into releases/tokudb-7.5 2014-10-12 07:49:53 -04:00
Olivier Bertrand
50fc9b3b19 - Fix null handling for date columns (see MDEV-6744) 
modified:
  storage/connect/ha_connect.cc
  storage/connect/plgdbutl.cpp
  storage/connect/value.cpp
  storage/connect/value.h
 2014-10-12 12:05:05 +02:00
Rich Prohaska
0007845780 FT-602 give test_insert_unique enough time to run with valgrind on mork 2014-10-11 16:56:21 -04:00
Sergei Golubchik
911ed9379f merge 2014-10-11 12:52:55 +02:00
Sergei Golubchik
a7a60f6f33 compilation failure: ha_cassandra 2014-10-11 09:09:18 +02:00
Sergey Petrunya
1b960d9fd6 MDEV-6519: Assertion `join->best_read < double(...)' failed after adding a key to a TokuDB table... 
- calculate_cond_selectivity_for_table() should handle the case
  where index statistics is not available (zeros are returned 
  in rec_per_key)
 2014-10-10 23:52:47 +04:00
John Esmet
ad51396067 FT-602 Check for a nondeleted entry in the target le instead of the 
leftmost le (oops!). Also strengthen our unit test for coverage.
 2014-10-10 15:34:04 -04:00
Sergei Golubchik
ba85a008e4 merge 2014-10-10 20:59:06 +02:00
Olivier Bertrand
7531f22a68 - Fix a regression error from regarding Header as Boolean from some table types. 
Was added to ha_connect::GetBooleanOption (otherwise ignored)
modified:
  storage/connect/ha_connect.cc
 2014-10-10 13:27:52 +02:00
Alexander Barkov
33f1ac66ad Merge 10.0-connect -> 10.0 2014-10-10 13:18:03 +04:00
Alexander Barkov
e2b895ec7b Merge 10.0-mroonga -> 10.0 2014-10-10 13:16:41 +04:00
Olivier Bertrand
5821b8eb02 - in CheckCond change strcat to strncat to avoid the case of non zero 
terminated string.
modified:
  storage/connect/ha_connect.cc

- The Accept and Header Boolean variables were wrongly retrieved using
  GetIntInfo instead of GetBoolInfo causing some setting to ignored.
modified:
  storage/connect/tabdos.cpp
  storage/connect/tabdos.h
  storage/connect/tabfmt.cpp

- Fix date truncated because their Value class was not using their field length.
modified:
  storage/connect/ha_connect.cc
 2014-10-09 17:23:37 +02:00
Sergei Golubchik
1b75bed00f 5.5.40+ merge 2014-10-09 10:30:11 +02:00
Sergey Vojtovich
1efee0379e Fixed mroonga build failure on Power8: define generic gcc version of 
GRN_SET_64BIT.
 2014-10-09 12:25:45 +04:00
Rich Prohaska
44f3cddfdb DB-736 fix tokudb IS table errors 2014-10-08 12:01:23 -04:00
Rich Prohaska
b8c3131f10 DB-735 use thd_killed 2014-10-08 12:01:06 -04:00
Sergei Golubchik
b2d71434ed compilation fix for perl-Net-HandlerSocket 2014-10-08 15:21:48 +02:00
Sergey Vojtovich
6f762cdd6c Backport from 10.0: 
revno: 4301
committer: Alexey Botchkov <holyfoot@askmonty.org>
branch nick: 10exp
timestamp: Tue 2014-07-22 15:28:15 +0500
message:
  gis-precise.test fixed to work on Power8.
------------------------------------------------------------
revno: 4295
committer: Alexey Botchkov <holyfoot@askmonty.org>
branch nick: 10exp
timestamp: Mon 2014-07-21 13:07:48 +0500
message:
  gis-precise test fixed to pass on Power8.
 2014-10-08 18:10:31 +04:00
Rich Prohaska
de3cd3e182 DB-736 fix tokudb IS table errors 2014-10-08 08:39:40 -04:00
Sergei Golubchik
dbda20caff remove mariadb.pc file again, it cannot be added in a GA version 2014-10-08 09:35:00 +02:00
Sergei Golubchik
9329467e79 don't run privilege checking tests in embedded 2014-10-08 09:24:41 +02:00
Sergei Golubchik
104771de9a decimal: *correct* implementation of ROUND_UP at last 2014-10-08 00:46:10 +02:00
Sergei Golubchik
c1a4f0c5ab include mariadb.pc in debian builds 2014-10-08 00:45:56 +02:00
Sergei Golubchik
d3677c872f jemalloc compatibility 2014-10-08 00:45:41 +02:00
Sergei Golubchik
7e6d4bba0c XtraDB 5.5.40-36.1 2014-10-08 00:44:37 +02:00
Leif Walsh
a11909473d changed to ANNOTATE_IGNORE_{READS,WRITES}_{BEGIN,END} 
DRD seems to prefer those annotations to
DRD_IGNORE_VAR/DRD_STOP_IGNORING_VAR.

Helgrind is stupid, and VALGRIND_HG_{DIS,EN}ABLE_CHECKING pairs
bizarrely "reclaim" the memory location for the current thread when
re-enabling checking.  So they probably aren't completely suitable for
our purposes, but Helgrind provides no facility for doing what we want
because it just wants to watch the world burn.  So we add a couple of
Helgrind suppressions in addition.

Also, added a cute RAII wrapper for reading a variable in a racy way.
Writing can be done the same way if we only want to appease DRD, but
because Helgrind does things on a memory location-basis and not a
thread-basis, things get a little tricky.
 2014-10-07 16:07:49 -04:00
Sergei Golubchik
ef7d950e04 percona-server-5.5.40-36.1 2014-10-07 21:41:48 +02:00
Rich Prohaska
02cd38d84d Merge commit '3bf25268d1db81a92a157fdbf81916c28a676202' into releases/tokudb-7.5 2014-10-07 14:46:43 -04:00
Rich Prohaska
a24711022f Merge commit '1e3bc86b0901c0005551442b89d3a8d392b2ce6d' into releases/tokudb-7.5 2014-10-07 14:46:27 -04:00
Leif Walsh
bd415e73ed fixed version check inequality 2014-10-07 14:21:22 -04:00
Leif Walsh
d258ae30dd fixed cmake for versions without generator expressions (hopefully) 2014-10-07 13:57:43 -04:00
unknown
63ca157c92 MDEV-6781: bug with query cache when using views 
The data base lenth passed to invalidator fixed
 2014-10-07 19:38:45 +02:00
Rich Prohaska
6e982517be Merge branch 'ft600' into releases/tokudb-7.5 2014-10-07 10:26:36 -04:00
Rich Prohaska
b599259005 Merge branch 'ft600' 2014-10-07 10:25:52 -04:00
Sergei Golubchik
e73e1e7c7a packaging issues: 
* skip debian 44_scripts__mysql_config__libs.dpatch it does not apply anymore
  (and anyway it would not work for a static library)
* fix the path for install(mariadb.pc)
 2014-10-07 16:21:53 +02:00
Sergei Golubchik
fc58ba6c76 MDEV-5553 A view or procedure with a non existing definer can block "SHOW TABLE STATUS" with an unclear error message 
Don't double-check privileges for a column in the GROUP BY that refers to
the same column in SELECT clause. Privileges were already checked for SELECT clause.
 2014-10-07 11:55:39 +02:00
Sergei Golubchik
e5bc21af37 MDEV-4813 Replication fails on updating a MEMORY table with an index using btree 
skip NULL VARCHAR key parts like it's done elsewhere
 2014-10-07 10:54:14 +02:00
Sergei Golubchik
d2e808025a fixes for decimal type 2014-10-07 10:53:43 +02:00
Sergei Golubchik
7989c62bc0 post-merge fixes 2014-10-07 10:53:06 +02:00
Leif Walsh
9b24022104 fixed cmake policy CMP0022: 
either use all-plain or all-keyword style of target_link_libraries
 2014-10-06 16:39:10 -04:00
Leif Walsh
4fba582251 fixed some valgrind sanity tests 2014-10-06 16:23:13 -04:00