lp:~otto/maria/maria-fix-spelling-5.5
- Get this branch:
- bzr branch lp:~otto/maria/maria-fix-spelling-5.5
Branch merges
- Sergei Golubchik: Pending requested
-
Diff: 574 lines (+51/-51)39 files modifiedinclude/mysql_com.h (+1/-1)
libmysql/errmsg.c (+1/-1)
man/mysql-test-run.pl.1 (+1/-1)
mysql-test/extra/rpl_tests/rpl_ddl.test (+2/-2)
mysql-test/extra/rpl_tests/rpl_row_basic.test (+2/-2)
mysql-test/include/wait_until_count_sessions.inc (+1/-1)
mysql-test/mysql-test-run.pl (+1/-1)
mysql-test/r/mysqld--help.result (+1/-1)
mysql-test/r/ps.result (+3/-3)
mysql-test/r/subselect_sj.result (+2/-2)
mysql-test/r/subselect_sj_jcl6.result (+2/-2)
mysql-test/suite/funcs_1/views/func_view.inc (+1/-1)
mysql-test/suite/funcs_1/views/views_master.inc (+1/-1)
mysql-test/suite/rpl/t/rpl_ddl.test (+2/-2)
mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test (+1/-1)
mysql-test/t/ps.test (+3/-3)
mysql-test/t/subselect_sj.test (+2/-2)
sql/handler.h (+1/-1)
sql/log_event.cc (+1/-1)
sql/log_event.h (+1/-1)
sql/password.c (+2/-2)
sql/rpl_utility.cc (+1/-1)
sql/slave.cc (+1/-1)
sql/sql_connect.cc (+1/-1)
sql/sql_prepare.cc (+1/-1)
sql/sql_select.cc (+2/-2)
sql/sys_vars.cc (+1/-1)
sql/tztime.cc (+1/-1)
storage/maria/ma_rnext.c (+1/-1)
storage/myisam/mi_rnext.c (+1/-1)
storage/ndb/include/ndbapi/NdbEventOperation.hpp (+1/-1)
storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs (+1/-1)
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp (+1/-1)
storage/ndb/src/mgmsrv/MgmtSrvr.hpp (+1/-1)
storage/ndb/test/ndbapi/testDict.cpp (+1/-1)
storage/ndb/test/odbc/client/SQLColAttributeTest.cpp (+1/-1)
storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp (+1/-1)
storage/tokudb/ft-index/ft/ft-flusher.cc (+1/-1)
storage/xtradb/fil/fil0fil.c (+1/-1)
Branch information
Recent revisions
- 4159. By Otto Kekäläinen
-
Fixed executable bits for scripts that should have, and data files that should not have
- 4155. By Alexey Botchkov
-
MDEV-6124 Audit plugin fails with the Percona-Server 5.6.
Some lines of code in file_logger.c were lost while moving to the
general MariaDB tree. Adding them. - 4154. By Alexey Botchkov
-
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. - 4153. By Alexey Botchkov
-
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(). - 4152. By Alexey Botchkov
-
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. - 4151. By Alexey Botchkov
-
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. - 4150. By Alexey Botchkov
-
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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:maria