diff options
| author | unknown <sanja@askmonty.org> | 2009-12-08 23:47:54 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2009-12-08 23:47:54 +0200 |
| commit | 08e4635fbabb4a4bea3a9b44057a2cd9b12d580f (patch) | |
| tree | 9de56c7859229fc3e173370d434fb24e1a367a1d /sql/sql_partition.cc | |
| parent | e4e1ae0d13da399d53bd91df791b149f3eae796b (diff) | |
| parent | 27f4f67bd2f35bf710f1a4e4ddde0e42738a195d (diff) | |
| download | mariadb-git-08e4635fbabb4a4bea3a9b44057a2cd9b12d580f.tar.gz | |
merge 5.1-> 5.2
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 0a15cac2cca..076ff96ca88 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4078,7 +4078,7 @@ static int fast_end_partition(THD *thd, ulonglong copied, if ((!is_empty) && (!written_bin_log) && (!thd->lex->no_write_to_binlog)) - write_bin_log(thd, FALSE, thd->query, thd->query_length); + write_bin_log(thd, FALSE, thd->query(), thd->query_length()); my_snprintf(tmp_name, sizeof(tmp_name), ER(ER_INSERT_INFO), (ulong) (copied + deleted), @@ -6236,7 +6236,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, ERROR_INJECT_CRASH("crash_drop_partition_5") || ((!thd->lex->no_write_to_binlog) && (write_bin_log(thd, FALSE, - thd->query, thd->query_length), FALSE)) || + thd->query(), thd->query_length()), FALSE)) || ERROR_INJECT_CRASH("crash_drop_partition_6") || ((frm_install= TRUE), FALSE) || mysql_write_frm(lpt, WFRM_INSTALL_SHADOW) || @@ -6303,7 +6303,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, ERROR_INJECT_CRASH("crash_add_partition_5") || ((!thd->lex->no_write_to_binlog) && (write_bin_log(thd, FALSE, - thd->query, thd->query_length), FALSE)) || + thd->query(), thd->query_length()), FALSE)) || ERROR_INJECT_CRASH("crash_add_partition_6") || write_log_rename_frm(lpt) || (not_completed= FALSE) || @@ -6393,7 +6393,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, ERROR_INJECT_CRASH("crash_change_partition_6") || ((!thd->lex->no_write_to_binlog) && (write_bin_log(thd, FALSE, - thd->query, thd->query_length), FALSE)) || + thd->query(), thd->query_length()), FALSE)) || ERROR_INJECT_CRASH("crash_change_partition_7") || mysql_write_frm(lpt, WFRM_INSTALL_SHADOW) || ERROR_INJECT_CRASH("crash_change_partition_8") || @@ -7210,4 +7210,3 @@ void create_subpartition_name(char *out, const char *in1, "#SP#", transl_subpart_name, "#REN#", NullS); } #endif - |