mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
174187 commits 2778 branches 343 tags 1.6 GiB
Commit graph

17553 commits

Author SHA1 Message Date
Sergei Golubchik
736f821c42 Merge branch 'connect/10.1' into 10.1 2016-06-28 22:12:50 +02:00
Sergei Golubchik
3361aee591 Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
Sergei Golubchik
6dfe3fb2bb remove incorrect .gitattributes 2016-06-28 10:23:24 +02:00
Alexey Botchkov
09d902d84b MDEV-9618 solaris sparc build fails on 10.1. 
Compiler on Sparc is strict about the 'const' modifiers
    in function declarations and definitions. Meaning
    they should be exactly same.
 2016-06-27 18:02:28 +04:00
Alexander Barkov
652e799a38 MDEV-8502 DECIMAL accepts out of range DEFAULT values 
MDEV-10277 Redundant NOTE when inserting '0.00001 ' into a DECIMAL(2,1) column
 2016-06-27 15:14:07 +04:00
Sergey Vojtovich
9fc102b37e Fixed testcase check failure after db938.test 2016-06-23 12:44:28 +04:00
Jan Lindström
26de9061e8 Merge following commit from 5.5: 
commit ef92aaf9ec
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date:   Wed Jun 22 22:37:28 2016 +0300

    MDEV-10083: Orphan ibd file when playing with foreign keys

    Analysis: row_drop_table_for_mysql did not allow dropping
    referenced table even in case when actual creating of the
    referenced table was not successfull if foreign_key_checks=1.

    Fix: Allow dropping referenced table even if foreign_key_checks=1
    if actual table create returned error.
 2016-06-23 07:42:40 +03:00
Sergei Golubchik
e167806196 compilation failures 
windows: use GetProcAddress() to access internal server data structures
rhel5: CONNECT-JDBC requires at least Java 1.6
 2016-06-22 16:12:50 +02:00
Dimitri John Ledkov
26bf066d56 MDEV-9479: Enable OQGRAPH Engine to compile with Boost-1.60+ 
This used to be a compile failure. The defined structure isn't required
in the later versions of boost.

Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
 2016-06-22 16:41:38 +03:00
Sergei Golubchik
f9b5acfb0c Merge branch 'bb-10.0-serg' into 10.0 2016-06-22 10:54:19 +02:00
Sergei Golubchik
87da7670bd Fixed for failures in buildbot: TokuDB 
disable unstable tokudb tests,
(old change that was lost in a merge)
 2016-06-22 10:41:38 +02:00
Sergei Golubchik
a10fd659aa Fixed for failures in buildbot: Replication 
1. remove unnecessary rpl-tokudb combination file.
2. fix rpl_ignore_table to cleanup properly (not leave test
   grants in memory)
3. check_temp_dir() is supposed to set the error in stmt_da - do
   it even when called multiple times, this fixes a crash when
   rpl.rpl_slave_load_tmpdir_not_exist is run twice.
 2016-06-22 10:40:43 +02:00
Sergei Golubchik
805703fa8e Fixed for failures in buildbot: Windows 
fix constants to stay 64-bit instead of being truncated by VS.
this fixes a hang on startup.
 2016-06-22 10:40:28 +02:00
Sergei Golubchik
25f1a7ae69 revert part of 69f1a32 
in particular, revert changes to the spider (avoid diverging from
  the upstream if possible)
 2016-06-22 10:23:11 +02:00
Vladislav Vaintroub
69f1a3215e Replace dynamic loading of mysqld.exe data for plugins, replace with MYSQL_PLUGIN_IMPORT 2016-06-21 19:20:11 +02:00
Sergei Golubchik
c84a40bf8f Merge branch 'connect/10.0' into 10.0 2016-06-21 15:57:20 +02:00
Sergei Golubchik
a69f4c783d Merge branch 'bb-10.0-serg' into 10.0 2016-06-21 15:55:37 +02:00
Sergei Golubchik
b3f4cf7c13 Merge branch 'merge-xtradb-5.6' into 0.0 2016-06-21 15:27:09 +02:00
Sergey Vojtovich
8255781d9b MDEV-10258 - Valgrind warnings in buildbot after a set of mroonga tests 
Fixed memory leak when mroonga fails to open index files.
Memory leak was detected by valgrind when running
mroonga/storage.repair_table_no_index_file.
 2016-06-21 17:04:57 +04:00
Sergey Vojtovich
15313216bf MDEV-9993 - connect.json_udf_bin valgrind warnings 
"result" may be uninitialized when json_set_item() is called directly.
 2016-06-21 17:04:57 +04:00
Sergei Golubchik
a79d46c3a4 Merge branch 'merge-innodb-5.6' into 10.0 2016-06-21 14:58:19 +02:00
Sergei Golubchik
720e04ff67 5.6.31 2016-06-21 14:21:03 +02:00
Sergei Golubchik
b42664e85e 5.6.30-76.3 2016-06-21 14:20:09 +02:00
Sergei Golubchik
c081c978a2 Merge branch '5.5' into bb-10.0 2016-06-21 14:11:02 +02:00
Jan Lindström
fa10a65dc2 MDEV-9356: innodb.innodb_bug53290 fails (crashes) on sol10-64 in buildbot 
Analysis: In storage/innobase/row/row0merge.cc InnoDB calls
thd_progress_init, thd_progress_report and thd_progress_end
functions. These seem to cause crash on solaris 10 64-bit.

Fix: Disable progress reporting on UNIV_SOLARIS until the
actual issue causing the crash is fixed. The actual bug
is not on InnoDB code base.
 2016-06-21 12:43:46 +03:00
Olivier Bertrand
7e64b07968 - Add column pattern and table type argument to catalog tables 
modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h
  modified:   storage/connect/odbccat.h
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/tabjdbc.cpp
  modified:   storage/connect/tabjdbc.h
  modified:   storage/connect/tabodbc.cpp
  modified:   storage/connect/tabodbc.h

- Avoid longjump in AllocCatInfo functions
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h
  modified:   storage/connect/odbconn.cpp

- Change GetColumns error return value from 0 to -1
  modified:   storage/connect/JdbcInterface.class
  modified:   storage/connect/JdbcInterface.java
 2016-06-20 16:37:57 +02:00
Olivier Bertrand
7992dae6eb Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1 2016-06-20 16:12:19 +02:00
Olivier Bertrand
f2dded9bac Merge branch '10.0' of https://github.com/MariaDB/server into 10.0 2016-06-20 15:26:05 +02:00
Vicențiu Ciorbaru
7ff86b4991 MDEV-10247 TokuDB assertion error when building with DEBUG 
Fix the assertion failure by setting the struct to 0. This can not be
done using a macro due to different definitions of mutexes on various
OS-es.
Afterwards we call toku_mutex_init and completely initialize the locks.
 2016-06-17 14:59:17 +03:00
Vicențiu Ciorbaru
12ae840375 Fix typo bug that cause myisam repair to fail 
We need to return TRUE if got_error == 1, not error, which is
initialized to FALSE.
 2016-06-16 22:04:24 +03:00
Vicențiu Ciorbaru
7ab7abdb51 Fix compilation failure when compiling with std=c90 
Change variable declaration to be before any other statements.
 2016-06-16 18:52:46 +03:00
Vladislav Vaintroub
b644661e5d MDEV-9256 : Crashes on Windows x64 with aria_pagecache_buffer_size > 4GB 
Fixed wrong calculation of buffer sizes. ulong datatype was used wrongly,
as were the casts to ulong. Buffer sizes should be of type size_t,
not ulong, or bad things happen on 64 bit Windows.

This patch changes pagecache struct to use size_t/ssize_t
where long/ulong were previously used. Also, removed several casts.
 2016-06-14 22:31:39 +02:00
Vicențiu Ciorbaru
34a104ba0c MDEV-10229: TokuDB fails to build with CLang 
Structure initialization must feature all members present within the
struct.
 2016-06-14 19:17:29 +03:00
Vicențiu Ciorbaru
1bf25092cb MDEV-10162: Update repair testcase 2016-06-14 19:17:29 +03:00
Vicențiu Ciorbaru
2b47832a2d Fixed compilation failure using clang 
Both aria and myisam storage engines feature a logic path in
thr_find_all_keys that leads to undefined behaviour by bypassing the
initialization code of variables after my_thread_init().

By refactoring the nested logic into a separate function, this problem
is resolved.
 2016-06-14 19:17:29 +03:00
Vicențiu Ciorbaru
6a34ba3130 [Code cleanup] Refactor duplicate code within myisam and maria sort.cc 2016-06-14 19:17:29 +03:00
Sergei Golubchik
260699e91b Merge branch 'merge-xtradb-5.5' into 5.5 2016-06-14 13:59:41 +02:00
Sergei Golubchik
f54dcf1e87 5.5.49-37.9 2016-06-14 12:38:47 +02:00
Olivier Bertrand
0a96c9c4aa - Possibly fix MDEV-10179 Reset remote tables when re-opening 
modified:   storage/connect/tabtbl.cpp

- Add trace and make m_Stmt conditional
  modified:   storage/connect/myconn.cpp
  modified:   storage/connect/myconn.h

- Protect trace from null string (for Linux)
  modified:   storage/connect/tabcol.cpp

- Record error changes
  modified:   storage/connect/mysql-test/connect/r/jdbc_new.result

- Typo
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jsonudf.cpp
 2016-06-13 14:28:02 +02:00
Olivier Bertrand
74009534a1 - Possibly fix MDEV-10179 Reset remote tables when re-opening 
modified:   storage/connect/tabtbl.cpp

- Add trace and make m_Stmt conditional
  modified:   storage/connect/myconn.cpp
  modified:   storage/connect/myconn.h

- Protect trace from null string (for Linux)
  modified:   storage/connect/tabcol.cpp

- Record error changes
  modified:   storage/connect/mysql-test/connect/r/jdbc_new.result

- Typo
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jsonudf.cpp
 2016-06-13 12:58:24 +02:00
Sergei Golubchik
ecdf46daed Merge branch '10.0-tokudb-merge' into 10.0 2016-06-11 22:56:48 +02:00
Sergei Golubchik
02043d7c53 MDEV-9128 Compiling on IBM System Z fails 
restore the fix f31a89191f that was lost in a merge
 2016-06-11 22:48:41 +02:00
Sergei Golubchik
22d7860d78 fix tokudb tests after the merge 2016-06-11 22:47:30 +02:00
Sergei Golubchik
dde558f262 Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-merge 2016-06-11 01:06:09 +02:00
Sergei Golubchik
ca95cc603b Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-merge 
5.6.28-76.1
 2016-06-10 20:48:59 +02:00
Sergey Vojtovich
87007dc2f7 MDEV-9994 - Aria service threads are not "joined" 
Aria service threads are created "joinable", but they're not "joined" on
completion. This causes memory leaks around thread local storage.

Fixed by joining service thread. Simplified relevant code and cleaned up
relevant valgrind suppressions.
 2016-06-10 22:07:49 +04:00
Sergei Golubchik
f853a99a4f 5.6.30-76.3 2016-06-10 19:47:58 +02:00
Jan Lindström
0f252702b1 MDEV-7139: Sporadic failure in innodb.innodb_corrupt_bit on P8 
Use direct persistent index corruption set on InnoDB dictionary
for this test. Do not allow creating new indexes if one of the
existing indexes is already marked as corrupted.
 2016-06-08 08:40:10 +03:00
Olivier Bertrand
a9ac3506d2 git90.msg + git91.msg 2016-06-02 23:36:19 +02:00
Olivier Bertrand
613680a041 - Fix MDEV-10111 Reconize unsigned integers when creating tables via srcdef 
modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/myconn.cpp

- Fix MDEV-10136 crash on SELECT jsonget_string(NULL, 'a')
  modified:   storage/connect/jsonudf.cpp

- Assert longjmp initialized when suballocating
  modified:   storage/connect/plugutil.c

- Avoid crash in MakeRecord when table->vcol_set isnull (trace > 1)
  modified:   storage/connect/ha_connect.cc
 2016-06-02 22:11:08 +02:00