Commit graph

85813 commits

Author SHA1 Message Date
Jan Lindström
150e88e8c9 Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. 2014-04-16 12:13:43 +03:00
Alexey Botchkov
142c20eda9 MDEV-4856 SQL_ERROR_LOG shows 1146 errors which didnt appear in mysql client.
The fill_schema_table() function used to call get_table_share() for a table name in WHERE
    then clear the error list. That way plugins receive the superfluous error notification if it
    happens in it. Also the problem was that error handler didn't prevent the suppressed
    error message from logging anyway as the logging happens in THD::raise_condition
    before the handler call.
    Trigger_error_handler is remade into Warnings_only_error_handler, so it stores the error
    message in all cases in the thd->stmt_da.
    Then later the stored error is raised.
2014-04-15 20:41:08 +05:00
Alexey Botchkov
708ba733da MDEV-5138 Numerous test failures in "mtr --ps --embedded".
If a prepared statement calls an stored procedure,
     the thd->server_status out of the SP goes up
     to the PS and then to the client. So that the
     client gets the SERVER_STATUS_CURSOR_EXISTS status
     if the SP uses a cursor. Which makes the embedded
     server fail.
     Fixed by saving/restoring the upper-level server_status
     in sp_head::execute().
2014-04-15 18:17:47 +05:00
Alexey Botchkov
9d32b8b2aa MDEV-5138 Numerous test failures in "mtr --ps --embedded".
Thread can be disconnected internally for example after COMMIT statements.
     So we should check this for the statement execution.
2014-04-15 18:16:47 +05:00
Alexey Botchkov
8a6a95a111 MDEV-5138 Numerous test failures in "mtr --ps --embedded".
mysqltest in the 'embedded-server' mode runs queries in a separate thread,
    but it didn't do so for the prepared statements - they were run in the main thread.
    That leads to inconsistencies.
    When a test sets SESSION 'dbug' variable like
            SET SESSION debug_dbug="+d,warn_during_ha_commit_trans";
    it is run as a plain query in that separate thread, so the main thread remains unaffected.
    After that the prepared statement run in the main thread doesn't produce expected 'dbug' errors,
    so the test fails.
    To fix that I made prepared statement to be run in that special thread along with the plain queries.
    That makes the environment consistent.
2014-04-15 18:12:25 +05:00
Alexey Botchkov
365960a068 MDEV-5138 Numerous test failures in "mtr --ps --embedded".
As Davi added code like
          sav_protocol= thd->protocol
          thd->protocol= &thd->protocol_binary
          ...
          thd->protocol= sav_protocol
  the fucntions like emb_store_querycache_result() cannot determine
  the used protocol testing thd->protocol == &thd->protocol_binary.
  Fixed by additional check thd->command == COM_STMT_EXECUTE.
2014-04-15 18:09:58 +05:00
Alexey Botchkov
7d1033115a MDEV-5138 Numerous test failures in "mtr --ps --embedded".
The function Protocol::net_store_data(a, b, CHARSET_A, CHARSET_B) should
        be adapted to be working in the embedded server as it's done
        with the Protocol::net_store_data(a, b).
        That new function renamed as net_store_data_cs, so we can make it
        virtual.
2014-04-15 18:08:33 +05:00
unknown
05722f06b2 MDEV-5991: crash in Item_field::used_tables
Units of subqueroes from excluded expressions should be excluded from select_lex/select_unit tree.
2014-04-15 13:20:26 +03:00
Sergei Golubchik
d1d64015cf don't install mysql-test/var and cmake internal files 2014-04-14 19:50:55 +02:00
Sergei Golubchik
19c0e32497 typo in FederatedX. HA_READ_AFTER_KEY is not a valid index flag. 2014-04-14 09:54:42 +02:00
Sergei Golubchik
a53d794fa7 mtr: don't use --mysqld= options when issuing "mysqld --help"
(and don't append --user=root for --help now, when mysqld has a fix for that)
2014-04-13 14:58:55 +02:00
Sergei Golubchik
a0ea7ffade fix the test for 32-bit 2014-04-11 11:42:51 +02:00
Sergei Golubchik
27a26acb1c MDEV-5700 Cannot SHOW CREATE VIEW if underlying tabels are ALTERed 2014-04-10 15:07:34 +02:00
Sergei Golubchik
2eaaeaeaa2 MDEV-5625 Debian package mariadb-client-5.5 lacks dependency on libterm-readkey-perl 2014-04-10 13:10:33 +02:00
Sergei Golubchik
81e6327e49 MDEV-5068 import file from init script 2014-04-10 10:34:28 +02:00
Sergei Golubchik
32b3c9f35d Make THDVAR_INT variables to be signed in SELECT in SHOW 2014-04-09 14:28:07 +02:00
Sergei Golubchik
ab157e4556 MDEV-5152 mysql_config includes -lprobes_mysql but mo such library installed
when converting /a/full/path/to/a/file.ext to -lfile ignore all files
with non-library extenstions.
2014-04-08 16:27:40 +02:00
Sergei Golubchik
f5823b793d MDEV-6004 MariaDB init script fails to start (missing dependency on MariaDB-client in server RPM) 2014-04-08 09:58:33 +02:00
Sergei Golubchik
2d464b6eb7 line endings 2014-04-08 08:46:33 +02:00
Sergei Golubchik
5f0c98c17b MDEV-5743 Server crashes in mysql_alter_table on an attempt to add a primary key to InnoDB table 2014-04-07 21:53:19 +02:00
Sergei Golubchik
e82a82eef8 MDEV-6022 Patch 44_scripts__mysql_config__libs.dpatch is inapplicable, deb package creation fails 2014-04-07 20:52:04 +02:00
Sergei Golubchik
64b9b65eb5 MDEV-5986 MariaDB upgrade on CentOS 6 fails due to sed error
typo in the rpm server prein scriptlet
2014-04-07 20:41:28 +02:00
unknown
be785cd85c Merge MDEV-6067 from 5.3 to 5.5. 2014-04-11 10:46:11 +02:00
unknown
65f80d4052 Merge MDEV-6067 from 5.2 to 5.3. 2014-04-11 09:38:55 +02:00
unknown
a1ae8f9ba8 MDEV-6067: Partitioned table DML sometimes binlogged without XID event
Add test case.
2014-04-11 09:03:53 +02:00
unknown
68bad3c7c0 MDEV-6067: Partitioned table DML sometimes binlogged without XID event
Revert the old patch revid:monty@askmonty.org-20100325133339-7mkel6valai0b4lb

This patch caused the InnoDB part of the transaction to not be marked
read-write in some cases, which messes up XA commit (and likely other
stuff as well).
2014-04-11 08:39:48 +02:00
Elena Stepanova
16d90e5aff MDEV-6068 Upgrade removes all changes to 'mysql' database
mysql_upgrade overrode some of the custom changes made to system tables
in order to increase user name length. 
Make ALTER statements involving the affected columns take into account
length changes, as per https://mariadb.com/kb/en/create-user/#user-names
2014-04-11 00:19:17 +04:00
Elena Stepanova
0566c34afd MDEV-6016 Packaging error with cmake 2.8.12 and greater
Avoid CPack complaints when a pdb file is missing for a static library
(patch from Vladislav Vaintroub)
2014-04-03 21:58:56 +04:00
Sergei Golubchik
cb67dcb618 mysql-5.5.37 selective merge 2014-03-27 22:26:58 +01:00
Sergei Golubchik
44002a34e6 MDEV-5955 Server crashes in handler::ha_external_lock or assertion `m_lock_type == 2' fails in handler::ha_close on disconnect with a locked temporary table
first unlock locked tables, then close and remove temporary
2014-03-26 19:56:23 +01:00
Michael Widenius
ded448d1d0 MDEV-5905: Creating tmp. memory table kills the server
The reason was that a couple of variables that hold number of rows that was used to calculate buffers was uint and caused an overflow.

Fixed by changing variables that could hold number of rows from uint to ulong and also added a cast for this test.

include/heap.h:
  Reorder to get better alignment. Changed variables that could hold number of rows from uint to ulong
mysql-test/suite/heap/heap.result:
  Added test case
mysql-test/suite/heap/heap.test:
  Added test case
mysql-test/suite/plugins/t/server_audit.test:
  Added sleep as we want to have disconnect logged before we try a new connect
storage/heap/ha_heap.cc:
  Changed variables that could hold number of rows from uint to ulong
  Limit number of rows to 4G  (as most of the variables that holds rows are ulong anyway)
  reset records_changed when key_stat_version is changed to not cause increments for every row changed
storage/heap/ha_heap.h:
  changed records_changed to ulong as this can get big
storage/heap/hp_create.c:
  Changed variables that could hold number of rows from uint to ulong
  Added cast (fixed the original bug)
storage/heap/hp_delete.c:
  Changed variables that could hold number of rows from uint to ulong
storage/heap/hp_open.c:
  Removed not needed cast
storage/heap/hp_write.c:
  Changed variables that could hold number of rows from uint to ulong
support-files/compiler_warnings.supp:
  Removed extra : from supression
2014-03-26 21:58:27 +02:00
Sergei Golubchik
99316b51b6 compilation failure with BUILD/compile-amd64-valgrind-max 2014-03-26 08:24:19 +01:00
Sergei Golubchik
413113dad6 move file->position() down, to make sure it's executed only when
previous file->index_next (or other file->... index access method)
succeeded
2014-03-25 22:41:18 +01:00
Sergei Golubchik
cb0a661cd7 don't put libmysqlclient symbols extra-used on debian
in the libmysqlclient_16 version node.
2014-03-25 17:34:45 +01:00
Sergei Golubchik
21a17536c6 5.3 merge 2014-03-25 11:09:12 +01:00
Sergei Golubchik
434bbc34ad MDEV-5913 Windows: 10.0 crashes on shutdown
add pthread_mutex_destroy(&THR_LOCK_dbug); that was apparently
forgotten since the very first MySQL version
2014-03-24 20:02:08 +01:00
Sergei Golubchik
bd4e7dac59 mysqltest bug: reset --replace command after every
error message (because error messages use replacements)
2014-03-24 20:02:00 +01:00
Sergei Golubchik
c11c64e972 MDEV-5822 TokuDB fails to compile without partition storage engine 2014-03-24 20:01:55 +01:00
Sergei Golubchik
c18fb72e71 tokudb: make compression=TOKUDB_ZLIB the default (instead of TOKUDB_UNCOMPRESSED)
for new tables
2014-03-24 20:01:50 +01:00
Sergei Golubchik
097566d61c rpl tests: move "include/master-slave.inc" down to be after all possible
checks that can skip the test
2014-03-24 20:01:45 +01:00
Sergei Golubchik
01b1eef23e MDEV-5831 Upgrade from MariaDB 5.5.36 via yum fails
Allow "rpm -q --whatprovides mysql-server" to return more than one row.
(all rows should be identical though)

support-files/rpm/server-prein.sh:
  don't use "head -1" or "uniq" to avoid introducing new dependencies.
  "sed" is already used in this script.
2014-03-24 20:01:37 +01:00
Alexander Barkov
63d0918807 MDEV-5783 Assertion `0' failed in make_sortkey(SORTPARAM*, uchar*, uchar*) on ORDER BY HEX( UNCOMPRESSED_LENGTH( pk ) ) 2014-03-23 16:02:56 +04:00
unknown
2eb920b262 Fix to make it compiling with valgrind. 2014-03-21 12:23:09 +02:00
Nirbhay Choubey
983366e0ee MDEV#5903 mariadb-galera tree builds too many rpm packages
Modified the components list to make sure that only server
package gets generated.
2014-03-20 18:33:23 -04:00
Sergei Golubchik
31bf348449 MDEV-5773 symbol list_add, version libmysqlclient_18 not defined in file libmysqlclient.so.18 with link time reference
MDEV-5763 libmyodbc.so: undefined symbol: int2str
MDEV-5739 Symbol missing in libmysqlclient.so.18 (make_scrambled_password)

pam_mysql and especially myodbc need tons of internal symbols on Debian, argh!
2014-03-19 10:03:34 +01:00
Sergei Golubchik
9950c5c7ba MDEV-5892 Centos startup script is broken
Don't try to be smart about --socket.
Assume that if user has set up a non-standard location for a socket,
she did it consistently for both a server and clients
(otherwise most clients won't work anyway).
2014-03-19 10:02:41 +01:00
Alexey Botchkov
0c84a47c97 MDEV-5862 server_audit test fails in buildbot on Mac (labrador).
The RTLD_DEFAULT value on Labrador machine is not NULL,
        so the dlsym() commands in the server_audit just fail
        to bind the necessary functions.
        Fixed by using RTLD_DEFAULT explicitly.
2014-03-23 18:44:48 +04:00
Sergei Golubchik
0f6505456b merge 2014-03-18 18:29:07 +01:00
Michael Widenius
7b57dcb463 Fixed buildbot issues
mysql-test/suite/rpl/t/rpl_000011-slave.opt:
  Renamed test case as it's slave that needs to restarted
support-files/compiler_warnings.supp:
  Fixed bad characters in suppression
2014-03-18 16:26:02 +02:00
Michael Widenius
1127d56735 Fixed some buildbot failures
mysql-test/suite/rpl/t/rpl_000011-master.opt:
  Added master.opt file to ensure that other tests don't interfere with rpl_000011
plugin/server_audit/server_audit.c:
  Fixed compiler error on solaris
support-files/compiler_warnings.supp:
  Ignore warning from xtradb
2014-03-18 10:26:50 +02:00