diff options
author | Monty <monty@mariadb.org> | 2018-01-07 18:03:44 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2018-01-30 21:33:55 +0200 |
commit | a7e352b54ddfaf91c92951d605cb02a4ffd2676b (patch) | |
tree | dc76f140342938ed2a0fe0e005100402762d5308 /sql/wsrep_binlog.cc | |
parent | 921c5e931452301a09c84c53ffe35b81e6a1c71a (diff) | |
download | mariadb-git-a7e352b54ddfaf91c92951d605cb02a4ffd2676b.tar.gz |
Changed database, tablename and alias to be LEX_CSTRING
This was done in, among other things:
- thd->db and thd->db_length
- TABLE_LIST tablename, db, alias and schema_name
- Audit plugin database name
- lex->db
- All db and table names in Alter_table_ctx
- st_select_lex db
Other things:
- Changed a lot of functions to take const LEX_CSTRING* as argument
for db, table_name and alias. See init_one_table() as an example.
- Changed some function arguments from LEX_CSTRING to const LEX_CSTRING
- Changed some lists from LEX_STRING to LEX_CSTRING
- threads_mysql.result changed because process list_db wasn't always
correctly updated
- New append_identifier() function that takes LEX_CSTRING* as arguments
- Added new element tmp_buff to Alter_table_ctx to separate temp name
handling from temporary space
- Ensure we store the length after my_casedn_str() of table/db names
- Removed not used version of rename_table_in_stat_tables()
- Changed Natural_join_column::table_name and db_name() to never return
NULL (used for print)
- thd->get_db() now returns db as a printable string (thd->db.str or "")
Diffstat (limited to 'sql/wsrep_binlog.cc')
-rw-r--r-- | sql/wsrep_binlog.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc index bddbbb95f4d..4efd6703d03 100644 --- a/sql/wsrep_binlog.cc +++ b/sql/wsrep_binlog.cc @@ -31,13 +31,13 @@ int wsrep_write_cache_buf(IO_CACHE *cache, uchar **buf, size_t *buf_len) { *buf= NULL; *buf_len= 0; - my_off_t const saved_pos(my_b_tell(cache)); + DBUG_ENTER("wsrep_write_cache_buf"); if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0)) { WSREP_ERROR("failed to initialize io-cache"); - return ER_ERROR_ON_WRITE; + DBUG_RETURN(ER_ERROR_ON_WRITE); } uint length = my_b_bytes_in_cache(cache); @@ -86,7 +86,7 @@ int wsrep_write_cache_buf(IO_CACHE *cache, uchar **buf, size_t *buf_len) goto cleanup; } - return 0; + DBUG_RETURN(0); error: if (reinit_io_cache(cache, WRITE_CACHE, saved_pos, 0, 0)) @@ -97,7 +97,7 @@ cleanup: my_free(*buf); *buf= NULL; *buf_len= 0; - return ER_ERROR_ON_WRITE; + DBUG_RETURN(ER_ERROR_ON_WRITE); } #define STACK_SIZE 4096 /* 4K - for buffer preallocated on the stack: @@ -121,6 +121,7 @@ wsrep_append_data(wsrep_t* const wsrep, struct wsrep_buf const buff = { data, len }; wsrep_status_t const rc(wsrep->append_data(wsrep, ws, &buff, 1, WSREP_DATA_ORDERED, true)); + DBUG_DUMP("buff", (uchar*) data, len); if (rc != WSREP_OK) { WSREP_WARN("append_data() returned %d", rc); @@ -144,11 +145,12 @@ static int wsrep_write_cache_once(wsrep_t* const wsrep, size_t* const len) { my_off_t const saved_pos(my_b_tell(cache)); + DBUG_ENTER("wsrep_write_cache_once"); if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0)) { WSREP_ERROR("failed to initialize io-cache"); - return ER_ERROR_ON_WRITE; + DBUG_RETURN(ER_ERROR_ON_WRITE); } int err(WSREP_OK); @@ -230,7 +232,7 @@ cleanup: } my_free(heap_buf); - return err; + DBUG_RETURN(err); } /* @@ -247,11 +249,12 @@ static int wsrep_write_cache_inc(wsrep_t* const wsrep, size_t* const len) { my_off_t const saved_pos(my_b_tell(cache)); + DBUG_ENTER("wsrep_write_cache_inc"); if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0)) { WSREP_ERROR("failed to initialize io-cache"); - return WSREP_TRX_ERROR; + DBUG_RETURN(WSREP_TRX_ERROR); } int err(WSREP_OK); @@ -295,7 +298,7 @@ cleanup: WSREP_ERROR("failed to reinitialize io-cache"); } - return err; + DBUG_RETURN(err); } /* |