Commit graph

163968 commits

Author SHA1 Message Date
Sergei Golubchik
5c309012c4 increase the version 2015-01-29 21:10:45 +01:00
Sergei Golubchik
27439ee6ea 5.5 merge 2015-01-29 18:26:07 +01:00
Sergei Golubchik
5f63c9c067 recreate expired certificates for SSL tests
added a script to regenerate certificates easily in the future (2035!)
restored server8k-key.pem to actually be 8K key, as it was supposed to
2015-01-29 14:34:31 +01:00
Sergei Golubchik
1e227b8f2c clarify the comment and trivial cleanups 2015-01-29 12:12:29 +01:00
unknown
9033aa02dc MDEV-6128:[PATCH] mysqlcheck wrongly escapes '.' in table names
Backport from mysql 5.7. The patch reviewed, test added.
2015-01-28 11:49:55 +01:00
Olivier Bertrand
9a2dc7dfed - Repair the errors due to the PRXCOL Init function that must be called
with 2 parameters. (previously the second one was optional)
modified:
  storage/connect/tabpivot.cpp
  storage/connect/tabpivot.h
  storage/connect/tabtbl.cpp
  storage/connect/tabxcl.cpp
2015-01-28 00:19:39 +01:00
Olivier Bertrand
ee5a4c8b33 - Begin eliminating on Linux OverloadedVirtual warnings.
However some tests failed. Going to windows to try tracing them.
modified:
  storage/connect/CMakeLists.txt
  storage/connect/array.h
  storage/connect/json.h
  storage/connect/tabdos.h
  storage/connect/tabjson.h
  storage/connect/taboccur.cpp
  storage/connect/tabpivot.h
  storage/connect/tabutil.h
  storage/connect/tabxcl.h
  storage/connect/valblk.h
  storage/connect/xindex.h
2015-01-27 19:18:51 +01:00
Olivier Bertrand
e7802bff0e - Fix a bug causing the connection string of a partition table not being
edited with the partition name when it was specified in the OPTION_LIST.
modified:
  storage/connect/ha_connect.cc
2015-01-27 12:50:50 +01:00
Kentoku SHIBA
162446a621 Merge from trunk 2015-01-27 10:46:41 +09:00
Sergey Petrunya
fb71449b10 MDEV-5719: Wrong result with GROUP BY and LEFT OUTER JOIN
Merged revision 5224 from mysql-5.6 and added a test case.
..
revno: 5224
committer: Sergey Glukhov <sergey.glukhov@oracle.com>
branch nick: mysql-5.6
timestamp: Wed 2013-06-19 14:24:08 +0400
message:
    Bug#16620047 INCORRECT QUERY RESULT (AFTER SERVER UPGRADE)
2015-01-25 16:16:25 +01:00
Olivier Bertrand
5b460c6403 - Protect AllocateValue against a null sp.
modified:
  storage/connect/value.cpp
2015-01-24 12:17:03 +01:00
Olivier Bertrand
7ebd3f6fed - Commit merged files (just changing some ending CRLF to LF)
modified:
  storage/connect/json.cpp
  storage/connect/xobject.cpp
2015-01-24 11:54:12 +01:00
Olivier Bertrand
dbf690b5d1 - Fix correctly MDEV-7498. The problem was not in AllocateValue but in
the constructor of TYPVAL<PSZ> The new strg was widely uninitialised
  just by setting a terminated null char. Now the whole string is zero'ed.
  In Tabjson JSONCOL::ParseJpath, the original code was restored. 
modified:
  storage/connect/tabjson.cpp
  storage/connect/value.cpp
2015-01-24 11:46:18 +01:00
Sergei Golubchik
267fc6f2b7 Master_info_index assumed that file descriptor can never be 0 2015-01-24 09:37:58 +01:00
Michael Widenius
45ff0d6277 Ignore some tokudb executables 2015-01-29 15:14:09 +02:00
Michael Widenius
b83f692565 MDEV-6668: Server crashes in check_view_single_update on concurrent DDL/DML flow with views and triggers
Call mysql_derived_reinit() if we are reusing view.
This is needed as during a previous error condition the view may not have been reset

sql/sql_derived.cc:
  More DBUG_PRINT
  Always reset merged_for_insert (no reason to not do that)
sql/sql_derived.h:
  Added prototype
sql/sql_insert.cc:
  More DBUG_PRINT
  Added DBUG_ASSERT
sql/sql_view.cc:
  Call mysql_derived_reinit() if we are reusing view.
  This is needed as during a previous error condition the view may not have been reset
sql/table.cc:
  More DBUG_PRINT
2015-01-29 15:12:32 +02:00
Olivier Bertrand
a87bb05a7e - Change some line endings from CRLF to LF
modified:
  storage/connect/json.cpp
  storage/connect/xobject.cpp
2015-01-23 23:14:34 +01:00
Olivier Bertrand
2cd36ad7d0 - This to fix MDEV-7498. All changes made to AllocateValue to be sure that
the sp and p variable be initialised failed. Not understanding what causes
  this valgrind warning, I finally changed the way Mulval is allocated just
  to avoid it. This is a BAD solution as it does not really fix the problem
  but just hide it. This will have to be re-considered.
modified:
  storage/connect/tabjson.cpp
  storage/connect/value.cpp
2015-01-23 21:54:29 +01:00
Olivier Bertrand
dc091a2935 - Fix MDEV-7489 (in add_field)
modified:
  storage/connect/ha_connect.cc

- Fix MDEV-7494 (adding Insert_quoted in the STRING class)
modified:
  storage/connect/tabmysql.cpp
  storage/connect/xobject.cpp
  storage/connect/xobject.h

- Fix MDEV-7498 in value.cpp (AllocateValue)
modified:
  storage/connect/value.cpp

- Handle backslash in Json serialize + uchar + typo.
modified:
  storage/connect/json.cpp
  storage/connect/tabjson.cpp
2015-01-23 17:54:53 +01:00
Sergei Golubchik
d1c4ff2b2c win32-debug build failure 2015-01-23 14:17:38 +01:00
Kristian Nielsen
c287873795 MDEV-7352: main.kill_processlist-6619 fails sporadically in buildbot
After fix of MDEV-6728, the KILL signal is reset at the start of query
execution. This means that in this test case, we need to wait for the
to-be-killed query to have started; otherwise the kill signal can be lost,
causing the test case to fail.
2015-01-23 13:56:46 +01:00
Sergei Golubchik
b07081338b 5.5 merge 2015-01-23 09:36:03 +01:00
Sergei Golubchik
cb9c116a50 update tokudb version after merge 2015-01-23 09:13:21 +01:00
Kristian Nielsen
c23c00136a MDEV-7491: Occasional test failure in innodb.group_commit_crash_no_optimize_thread
The test case deliberately crashes the server. If this crash happens in the
middle of a page write, InnoDB crash recovery recovers the page from the
doublewrite buffer, writing a message to the error log that is flagged as a
test failure by mysql-test-run. So add a suppression for this.
2015-01-22 16:11:03 +01:00
Rich Prohaska
d8493f40ef Merge branch 'master' into releases/tokudb-7.5 2015-01-22 07:21:52 -05:00
Rich Prohaska
1abb2286fa Merge branch 'db801' 2015-01-22 07:21:17 -05:00
Sergei Golubchik
f2be9c0fea after merge. innodb/xtradb to work on Windows 2015-01-22 08:58:13 +01:00
Rich Prohaska
c30c109302 Merge branch 'master' into releases/tokudb-7.5 2015-01-21 17:36:04 -05:00
Rich Prohaska
64480bbe80 DB-802 make.mysql.bash should extract and use the tokudb version as the git tag. there was a broken RE 2015-01-21 17:35:50 -05:00
Rich Prohaska
7c78945c87 DB-801 test case for a tokudb update that should fail but succeeds 2015-01-21 15:55:31 -05:00
Sergei Golubchik
6e8e081a6f connect merge 2015-01-21 14:58:41 +01:00
Sergei Golubchik
b0a8e07357 P_S 5.6.22 2015-01-21 14:53:40 +01:00
Sergei Golubchik
78e131d493 XtraDB 5.6.22-71.0 2015-01-21 14:34:58 +01:00
Sergei Golubchik
476a8660e6 InnoDB 5.6.22 2015-01-21 14:33:39 +01:00
Sergei Golubchik
ff55d900fb after-merge fixes 2015-01-21 14:02:26 +01:00
Sergei Golubchik
d9c01e4b4a 5.5 merge 2015-01-21 12:03:02 +01:00
Olivier Bertrand
e576772383 - Last revision was to add the JSON table type. This one adds a sort
on the multiple table result to obtain the same result on Windows
  and Linux (because files can be retrieved in a different order)
modified:
  storage/connect/mysql-test/connect/r/json.result
  storage/connect/mysql-test/connect/t/json.test
2015-01-20 11:26:03 +01:00
Olivier Bertrand
8fc6956430 - Fix compile errors and warnings of LINUX G++
added:
  storage/connect/json.cpp
  storage/connect/json.h
  storage/connect/mysql-test/connect/r/json.result
  storage/connect/mysql-test/connect/std_data/biblio.jsn
  storage/connect/mysql-test/connect/std_data/expense.jsn
  storage/connect/mysql-test/connect/std_data/mulexp3.jsn
  storage/connect/mysql-test/connect/std_data/mulexp4.jsn
  storage/connect/mysql-test/connect/std_data/mulexp5.jsn
  storage/connect/mysql-test/connect/t/json.test
  storage/connect/tabjson.cpp
  storage/connect/tabjson.h
modified:
  storage/connect/CMakeLists.txt
  storage/connect/engmsg.h
  storage/connect/filamtxt.h
  storage/connect/ha_connect.cc
  storage/connect/msgid.h
  storage/connect/mycat.cc
  storage/connect/plgdbsem.h
  storage/connect/tabdos.cpp
  storage/connect/value.cpp
  storage/connect/value.h
2015-01-20 01:21:56 +01:00
Olivier Bertrand
2d2e110bce - Adding the JSON table type
added:
  storage/connect/json.cpp
  storage/connect/json.h
  storage/connect/mysql-test/connect/r/json.result
  storage/connect/mysql-test/connect/std_data/biblio.jsn
  storage/connect/mysql-test/connect/std_data/expense.jsn
  storage/connect/mysql-test/connect/std_data/mulexp3.jsn
  storage/connect/mysql-test/connect/std_data/mulexp4.jsn
  storage/connect/mysql-test/connect/std_data/mulexp5.jsn
  storage/connect/mysql-test/connect/t/json.test
  storage/connect/tabjson.cpp
  storage/connect/tabjson.h
modified:
  storage/connect/CMakeLists.txt
  storage/connect/engmsg.h
  storage/connect/filamtxt.h
  storage/connect/ha_connect.cc
  storage/connect/msgid.h
  storage/connect/mycat.cc
  storage/connect/plgdbsem.h
  storage/connect/tabdos.cpp
  storage/connect/value.cpp
  storage/connect/value.h
2015-01-19 18:55:25 +01:00
Sergei Golubchik
8bc712e481 MDEV-6671 mysql_server_end breaks OpenSSL 2015-01-19 17:31:59 +01:00
Sergei Golubchik
3212aaa995 MDEV-6220 mysqldump will not backup database with --flush-logs parameter and log_error my.cnf parameter defined
some checks were "if [ -n "$err_log" ]", others were "if [ $want_syslog -eq 0 ]",
so when both are set, error log file was only partially initialized.
To avoid this ambiguity we reset want_syslog when error log file is used.
2015-01-19 17:18:24 +01:00
Sergei Golubchik
a18eb833cd MDEV-7226 sql-bench test-table-elimination does not execute 2015-01-19 16:41:37 +01:00
Sergei Golubchik
d854a254b8 remove incorrect asserts in innodb/xtradb. 0 is a valid file handle value. 2015-01-19 16:30:32 +01:00
Sergei Golubchik
595cf636fd MDEV-7475 Wrong implementation of checking PLUGIN_VAR_SET condition
correct the check for PLUGIN_VAR_STR
2015-01-19 16:29:18 +01:00
Sergei Golubchik
5d0d6cb129 MDEV-7294 MTR does not use /dev/shm with a out-of-source build
mtr internally does the following:
1. $default_vardir=....
2. $opt_vardir=$default_vardir unless $opt_vardir;
3. $opt_vardir=realpath $opt_vardir unless IS_WINDOWS
4. if ($opt_vardir eq $default_vardir) { .... use /dev/shm ... }

thus we have to realpath $default_datadir too, otherwise
the comparison logic might be broken
2015-01-19 16:28:58 +01:00
Sergei Golubchik
919443f7a5 MDEV-5679 MariaDB holds stdin open after startup as mysqld 2015-01-19 16:11:48 +01:00
Rich Prohaska
b54a7af40d Merge branch 'master' into releases/tokudb-7.5 2015-01-19 10:04:34 -05:00
Rich Prohaska
e7f48475d9 DB-798 add the tokudb_rpl_check_readonly variable for RFR 2015-01-19 09:45:41 -05:00
Sergei Golubchik
510ca9b697 MDEV-7402 'reset master' hangs, waits for signalled COND_xid_list
Using a boolean flag for 'there is a RESET MASTER in progress' doesn't
work very well for multiple concurrent RESET MASTER statements.
Changed to a counter.
2015-01-19 14:32:28 +01:00
Sergei Golubchik
73ebabd2ee MDEV-7299 Assertion `m_status == DA_ERROR || m_status == DA_OK' fails on concurrent execution of DDL, queries from I_S, and KILL QUERY
Fix MDL to report an error when a wait was killed, but preserve
the old documented behavior of GET_LOCK() where killing it is not an error.

Also remove race conditions in main.create_or_replace test
2015-01-19 14:19:14 +01:00