Commit 966e113a authored by unknown's avatar unknown

Fix for BUG#30123: mysqldump is unable to work with old servers.

New server (as of 5.1.21) provides new features:
  - SHOW CREATE TRIGGER;
  - character set information for SHOW TRIGGERS and SHOW CREATE
    EVENT | FUNCTION | PROCEDURE statements.
Mysqldump uses these features to generate proper dump.

The bug happened when new mysqldump was used to dump older servers.
The problem was that 5.1.21 new features are not available, so
mysqldump exited with error code or just crashed.

The fix is to detect if mysqldump has ben run against older server
and don't use new 5.1.21 functionality in this case. Certainly,
the dump generated for the older server suffers from the character
set problems fixed by BUG#16291 and the like.


client/mysqldump.c:
  Don't use new server features if they are not available.
parent 38af61e9
...@@ -1227,6 +1227,125 @@ static int switch_character_set_results(MYSQL *mysql, const char *cs_name) ...@@ -1227,6 +1227,125 @@ static int switch_character_set_results(MYSQL *mysql, const char *cs_name)
return mysql_real_query(mysql, query_buffer, query_length); return mysql_real_query(mysql, query_buffer, query_length);
} }
/**
Rewrite CREATE TRIGGER statement, enclosing DEFINER clause in
version-specific comment.
This function parses the CREATE TRIGGER statement and encloses
DEFINER-clause in version-specific comment:
input query: CREATE DEFINER=a@b TRIGGER ...
rewritten query: CREATE * / / *!50017 DEFINER=a@b * / / *!50003 TRIGGER ...
@note This function will go away when WL#3995 is implemented.
@param[in] trigger_def_str CREATE TRIGGER statement string.
@param[in] trigger_def_length length of the trigger_def_str.
@return pointer to the new allocated query string.
*/
static char *cover_definer_clause_in_trigger(const char *trigger_def_str,
uint trigger_def_length)
{
char *query_str= NULL;
char *definer_begin= my_case_str(trigger_def_str, trigger_def_length,
C_STRING_WITH_LEN(" DEFINER"));
char *definer_end;
if (!definer_begin)
return NULL;
definer_end= my_case_str(definer_begin, strlen(definer_begin),
C_STRING_WITH_LEN(" TRIGGER"));
if (definer_end)
{
char *query_str_tail;
/*
Allocate memory for new query string: original string
from SHOW statement and version-specific comments.
*/
query_str= alloc_query_str(trigger_def_length + 23);
query_str_tail= strnmov(query_str,
trigger_def_str,
definer_begin - trigger_def_str);
query_str_tail= strmov(query_str_tail,
"*/ /*!50017");
query_str_tail= strnmov(query_str_tail,
definer_begin,
definer_end - definer_begin);
query_str_tail= strxmov(query_str_tail,
"*/ /*!50003",
definer_end,
NullS);
}
return query_str;
}
/**
Rewrite CREATE FUNCTION or CREATE PROCEDURE statement, enclosing DEFINER
clause in version-specific comment.
This function parses the CREATE FUNCTION | PROCEDURE statement and
encloses DEFINER-clause in version-specific comment:
input query: CREATE DEFINER=a@b FUNCTION ...
rewritten query: CREATE * / / *!50020 DEFINER=a@b * / / *!50003 FUNCTION ...
@note This function will go away when WL#3995 is implemented.
@param[in] def_str CREATE FUNCTION|PROCEDURE statement string.
@param[in] def_length length of the def_str.
@return pointer to the new allocated query string.
*/
static char *cover_definer_clause_in_sp(const char *def_str,
uint def_str_length)
{
char *query_str= NULL;
char *definer_begin= my_case_str(def_str, def_str_length,
C_STRING_WITH_LEN(" DEFINER"));
char *definer_end;
if (!definer_begin)
return NULL;
definer_end= my_case_str(definer_begin, strlen(definer_begin),
C_STRING_WITH_LEN(" PROCEDURE"));
if (!definer_end)
{
definer_end= my_case_str(definer_begin, strlen(definer_begin),
C_STRING_WITH_LEN(" FUNCTION"));
}
if (definer_end)
{
char *query_str_tail;
/*
Allocate memory for new query string: original string
from SHOW statement and version-specific comments.
*/
query_str= alloc_query_str(def_str_length + 23);
query_str_tail= strnmov(query_str, def_str, definer_begin - def_str);
query_str_tail= strmov(query_str_tail, "*/ /*!50020");
query_str_tail= strnmov(query_str_tail, definer_begin,
definer_end - definer_begin);
query_str_tail= strxmov(query_str_tail, "*/ /*!50003",
definer_end, NullS);
}
return query_str;
}
/* /*
Open a new .sql file to dump the table or view into Open a new .sql file to dump the table or view into
...@@ -1766,8 +1885,10 @@ static uint dump_events_for_db(char *db) ...@@ -1766,8 +1885,10 @@ static uint dump_events_for_db(char *db)
fprintf(sql_file, "DELIMITER %s\n", delimiter); fprintf(sql_file, "DELIMITER %s\n", delimiter);
if (switch_db_collation(sql_file, db_name_buff, delimiter, db_cl_name, if (mysql_num_fields(event_res) >= 7)
row[6], &db_cl_altered)) {
if (switch_db_collation(sql_file, db_name_buff, delimiter,
db_cl_name, row[6], &db_cl_altered))
{ {
DBUG_RETURN(1); DBUG_RETURN(1);
} }
...@@ -1776,6 +1897,24 @@ static uint dump_events_for_db(char *db) ...@@ -1776,6 +1897,24 @@ static uint dump_events_for_db(char *db)
row[4], /* character_set_client */ row[4], /* character_set_client */
row[4], /* character_set_results */ row[4], /* character_set_results */
row[5]); /* collation_connection */ row[5]); /* collation_connection */
}
else
{
/*
mysqldump is being run against the server, that does not
provide character set information in SHOW CREATE
statements.
NOTE: the dump may be incorrect, since character set
information is required in order to restore event properly.
*/
fprintf(sql_file,
"--\n"
"-- WARNING: old server version. "
"The following dump may be incomplete.\n"
"--\n");
}
switch_sql_mode(sql_file, delimiter, row[1]); switch_sql_mode(sql_file, delimiter, row[1]);
...@@ -1788,6 +1927,9 @@ static uint dump_events_for_db(char *db) ...@@ -1788,6 +1927,9 @@ static uint dump_events_for_db(char *db)
restore_time_zone(sql_file, delimiter); restore_time_zone(sql_file, delimiter);
restore_sql_mode(sql_file, delimiter); restore_sql_mode(sql_file, delimiter);
if (mysql_num_fields(event_res) >= 7)
{
restore_cs_variables(sql_file, delimiter); restore_cs_variables(sql_file, delimiter);
if (db_cl_altered) if (db_cl_altered)
...@@ -1797,6 +1939,7 @@ static uint dump_events_for_db(char *db) ...@@ -1797,6 +1939,7 @@ static uint dump_events_for_db(char *db)
DBUG_RETURN(1); DBUG_RETURN(1);
} }
} }
}
} /* end of event printing */ } /* end of event printing */
mysql_free_result(event_res); mysql_free_result(event_res);
...@@ -1929,64 +2072,14 @@ static uint dump_routines_for_db(char *db) ...@@ -1929,64 +2072,14 @@ static uint dump_routines_for_db(char *db)
} }
else if (strlen(row[2])) else if (strlen(row[2]))
{ {
char *query_str= NULL;
char *definer_begin;
if (opt_drop) if (opt_drop)
fprintf(sql_file, "/*!50003 DROP %s IF EXISTS %s */;\n", fprintf(sql_file, "/*!50003 DROP %s IF EXISTS %s */;\n",
routine_type[i], routine_name); routine_type[i], routine_name);
/* char *query_str= cover_definer_clause_in_sp(row[2], strlen(row[2]));
Cover DEFINER-clause in version-specific comments.
TODO: this is definitely a BAD IDEA to parse SHOW CREATE output.
However, we can not use INFORMATION_SCHEMA instead:
1. INFORMATION_SCHEMA provides data in UTF8, but here we
need data in the original character set;
2. INFORMATION_SCHEMA does not provide information about
routine parameters now.
*/
definer_begin= my_case_str(row[2], strlen(row[2]),
C_STRING_WITH_LEN(" DEFINER"));
if (definer_begin)
{
char *definer_end= my_case_str(definer_begin,
strlen(definer_begin),
C_STRING_WITH_LEN(" PROCEDURE"));
if (!definer_end) if (mysql_num_fields(routine_res) >= 6)
{
definer_end= my_case_str(definer_begin, strlen(definer_begin),
C_STRING_WITH_LEN(" FUNCTION"));
}
if (definer_end)
{ {
char *query_str_tail;
/*
Allocate memory for new query string: original string
from SHOW statement and version-specific comments.
*/
query_str= alloc_query_str(strlen(row[2]) + 23);
query_str_tail= strnmov(query_str, row[2],
definer_begin - row[2]);
query_str_tail= strmov(query_str_tail, "*/ /*!50020");
query_str_tail= strnmov(query_str_tail, definer_begin,
definer_end - definer_begin);
query_str_tail= strxmov(query_str_tail, "*/ /*!50003",
definer_end, NullS);
}
}
/*
we need to change sql_mode only for the CREATE
PROCEDURE/FUNCTION otherwise we may need to re-quote routine_name
*/
if (switch_db_collation(sql_file, db_name_buff, ";", if (switch_db_collation(sql_file, db_name_buff, ";",
db_cl_name, row[5], &db_cl_altered)) db_cl_name, row[5], &db_cl_altered))
{ {
...@@ -1997,6 +2090,26 @@ static uint dump_routines_for_db(char *db) ...@@ -1997,6 +2090,26 @@ static uint dump_routines_for_db(char *db)
row[3], /* character_set_client */ row[3], /* character_set_client */
row[3], /* character_set_results */ row[3], /* character_set_results */
row[4]); /* collation_connection */ row[4]); /* collation_connection */
}
else
{
/*
mysqldump is being run against the server, that does not
provide character set information in SHOW CREATE
statements.
NOTE: the dump may be incorrect, since character set
information is required in order to restore stored
procedure/function properly.
*/
fprintf(sql_file,
"--\n"
"-- WARNING: old server version. "
"The following dump may be incomplete.\n"
"--\n");
}
switch_sql_mode(sql_file, ";", row[1]); switch_sql_mode(sql_file, ";", row[1]);
...@@ -2007,6 +2120,9 @@ static uint dump_routines_for_db(char *db) ...@@ -2007,6 +2120,9 @@ static uint dump_routines_for_db(char *db)
(const char *) (query_str != NULL ? query_str : row[2])); (const char *) (query_str != NULL ? query_str : row[2]));
restore_sql_mode(sql_file, ";"); restore_sql_mode(sql_file, ";");
if (mysql_num_fields(routine_res) > 3)
{
restore_cs_variables(sql_file, ";"); restore_cs_variables(sql_file, ";");
if (db_cl_altered) if (db_cl_altered)
...@@ -2014,6 +2130,7 @@ static uint dump_routines_for_db(char *db) ...@@ -2014,6 +2130,7 @@ static uint dump_routines_for_db(char *db)
if (restore_db_collation(sql_file, db_name_buff, ";", db_cl_name)) if (restore_db_collation(sql_file, db_name_buff, ";", db_cl_name))
DBUG_RETURN(1); DBUG_RETURN(1);
} }
}
my_free(query_str, MYF(MY_ALLOW_ZERO_PTR)); my_free(query_str, MYF(MY_ALLOW_ZERO_PTR));
} }
...@@ -2551,121 +2668,95 @@ continue_xml: ...@@ -2551,121 +2668,95 @@ continue_xml:
DBUG_RETURN((uint) num_fields); DBUG_RETURN((uint) num_fields);
} /* get_table_structure */ } /* get_table_structure */
static void dump_trigger_old(MYSQL_RES *show_triggers_rs,
/* MYSQL_ROW *show_trigger_row,
const char *table_name)
dump_triggers_for_table
Dumps the triggers given a table/db name. This should be called after
the tables have been dumped in case a trigger depends on the existence
of a table
*/
static void dump_triggers_for_table(char *table, char *db_name)
{ {
char *result_table;
char name_buff[NAME_LEN*4+3], table_buff[NAME_LEN*2+3];
char query_buff[QUERY_LENGTH];
uint old_opt_compatible_mode=opt_compatible_mode;
FILE *sql_file= md_result_file; FILE *sql_file= md_result_file;
MYSQL_RES *result;
MYSQL_ROW row;
char db_cl_name[MY_CS_NAME_SIZE];
int db_cl_altered;
DBUG_ENTER("dump_triggers_for_table");
DBUG_PRINT("enter", ("db: %s, table: %s", db_name, table));
/* Do not use ANSI_QUOTES on triggers in dump */ char quoted_table_name_buf[NAME_LEN * 2 + 3];
opt_compatible_mode&= ~MASK_ANSI_QUOTES; char *quoted_table_name= quote_name(table_name, quoted_table_name_buf, 1);
result_table= quote_name(table, table_buff, 1);
my_snprintf(query_buff, sizeof(query_buff), char name_buff[NAME_LEN * 4 + 3];
"SHOW TRIGGERS LIKE %s",
quote_for_like(table, name_buff));
if (mysql_query_with_error_report(mysql, &result, query_buff))
{
if (path)
my_fclose(sql_file, MYF(MY_WME));
DBUG_VOID_RETURN;
}
/* Get database collation. */ DBUG_ENTER("dump_trigger_old");
if (fetch_db_collation(db_name, db_cl_name, sizeof (db_cl_name))) fprintf(sql_file,
DBUG_VOID_RETURN; "--\n"
"-- WARNING: old server version. "
"The following dump may be incomplete.\n"
"--\n");
if (switch_character_set_results(mysql, "binary")) if (opt_compact)
DBUG_VOID_RETURN; fprintf(sql_file, "/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;\n");
/* Dump triggers. */ fprintf(sql_file,
"DELIMITER ;;\n"
"/*!50003 SET SESSION SQL_MODE=\"%s\" */;;\n"
"/*!50003 CREATE */ ",
(*show_trigger_row)[6]);
while ((row= mysql_fetch_row(result))) if (mysql_num_fields(show_triggers_rs) > 7)
{ {
MYSQL_RES *res2; /*
mysqldump can be run against the server, that does not support
definer in triggers (there is no DEFINER column in SHOW TRIGGERS
output). So, we should check if we have this column before
accessing it.
*/
my_snprintf(query_buff, sizeof (query_buff), uint user_name_len;
"SHOW CREATE TRIGGER %s", char user_name_str[USERNAME_LENGTH + 1];
quote_name(row[0], name_buff, TRUE)); char quoted_user_name_str[USERNAME_LENGTH * 2 + 3];
uint host_name_len;
char host_name_str[HOSTNAME_LENGTH + 1];
char quoted_host_name_str[HOSTNAME_LENGTH * 2 + 3];
if (mysql_query_with_error_report(mysql, &res2, query_buff)) parse_user((*show_trigger_row)[7],
{ strlen((*show_trigger_row)[7]),
if (path) user_name_str, &user_name_len,
my_fclose(sql_file, MYF(MY_WME)); host_name_str, &host_name_len);
maybe_exit(EX_MYSQLERR);
DBUG_VOID_RETURN; fprintf(sql_file,
"/*!50017 DEFINER=%s@%s */ ",
quote_name(user_name_str, quoted_user_name_str, FALSE),
quote_name(host_name_str, quoted_host_name_str, FALSE));
} }
while ((row= mysql_fetch_row(res2))) fprintf(sql_file,
{ "/*!50003 TRIGGER %s %s %s ON %s FOR EACH ROW%s%s */;;\n"
char *query_str= NULL; "DELIMITER ;\n",
char *definer_begin; quote_name((*show_trigger_row)[0], name_buff, 0), /* Trigger */
(*show_trigger_row)[4], /* Timing */
(*show_trigger_row)[1], /* Event */
quoted_table_name,
(strchr(" \t\n\r", *((*show_trigger_row)[3]))) ? "" : " ",
(*show_trigger_row)[3] /* Statement */);
/* if (opt_compact)
Cover DEFINER-clause in version-specific comments. fprintf(sql_file, "/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;\n");
TODO: this is definitely a BAD IDEA to parse SHOW CREATE output.
However, we can not use INFORMATION_SCHEMA instead:
1. INFORMATION_SCHEMA provides data in UTF8, but here we
need data in the original character set;
2. INFORMATION_SCHEMA does not provide information about
routine parameters now.
*/
definer_begin= my_case_str(row[2], strlen(row[2]), DBUG_VOID_RETURN;
C_STRING_WITH_LEN(" DEFINER")); }
if (definer_begin) static int dump_trigger(MYSQL_RES *show_create_trigger_rs,
{ const char *db_name,
char *definer_end= my_case_str(definer_begin, strlen(definer_begin), const char *db_cl_name)
C_STRING_WITH_LEN(" TRIGGER")); {
FILE *sql_file= md_result_file;
MYSQL_ROW row;
int db_cl_altered;
if (definer_end) DBUG_ENTER("dump_trigger");
{
char *query_str_tail;
/* while ((row= mysql_fetch_row(show_create_trigger_rs)))
Allocate memory for new query string: original string {
from SHOW statement and version-specific comments. char *query_str= cover_definer_clause_in_trigger(row[2], strlen(row[2]));
*/
query_str= alloc_query_str(strlen(row[2]) + 23);
query_str_tail= strnmov(query_str, row[2],
definer_begin - row[2]);
query_str_tail= strmov(query_str_tail, "*/ /*!50017");
query_str_tail= strnmov(query_str_tail, definer_begin,
definer_end - definer_begin);
query_str_tail= strxmov(query_str_tail, "*/ /*!50003",
definer_end, NullS);
}
}
if (switch_db_collation(sql_file, db_name, ";", if (switch_db_collation(sql_file, db_name, ";",
db_cl_name, row[5], &db_cl_altered)) db_cl_name, row[5], &db_cl_altered))
DBUG_VOID_RETURN; DBUG_RETURN(TRUE);
switch_cs_variables(sql_file, ";", switch_cs_variables(sql_file, ";",
row[3], /* character_set_client */ row[3], /* character_set_client */
...@@ -2686,18 +2777,103 @@ static void dump_triggers_for_table(char *table, char *db_name) ...@@ -2686,18 +2777,103 @@ static void dump_triggers_for_table(char *table, char *db_name)
if (db_cl_altered) if (db_cl_altered)
{ {
if (restore_db_collation(sql_file, db_name, ";", db_cl_name)) if (restore_db_collation(sql_file, db_name, ";", db_cl_name))
DBUG_VOID_RETURN; DBUG_RETURN(TRUE);
} }
my_free(query_str, MYF(MY_ALLOW_ZERO_PTR)); my_free(query_str, MYF(MY_ALLOW_ZERO_PTR));
} }
mysql_free_result(res2);
DBUG_RETURN(FALSE);
}
/**
Dump the triggers for a given table.
This should be called after the tables have been dumped in case a trigger
depends on the existence of a table.
@param[in] table_name
@param[in] db_name
@return Error status.
@retval TRUE error has occurred.
@retval FALSE operation succeed.
*/
static int dump_triggers_for_table(char *table_name, char *db_name)
{
FILE *sql_file= md_result_file;
char name_buff[NAME_LEN*4+3];
char query_buff[QUERY_LENGTH];
uint old_opt_compatible_mode= opt_compatible_mode;
MYSQL_RES *show_triggers_rs;
MYSQL_ROW row;
char db_cl_name[MY_CS_NAME_SIZE];
DBUG_ENTER("dump_triggers_for_table");
DBUG_PRINT("enter", ("db: %s, table_name: %s", db_name, table_name));
/* Do not use ANSI_QUOTES on triggers in dump */
opt_compatible_mode&= ~MASK_ANSI_QUOTES;
/* Get database collation. */
if (fetch_db_collation(db_name, db_cl_name, sizeof (db_cl_name)))
DBUG_RETURN(TRUE);
/* Get list of triggers. */
my_snprintf(query_buff, sizeof(query_buff),
"SHOW TRIGGERS LIKE %s",
quote_for_like(table_name, name_buff));
if (mysql_query_with_error_report(mysql, &show_triggers_rs, query_buff))
DBUG_RETURN(TRUE);
if (mysql_num_rows(show_triggers_rs))
fprintf(sql_file, "\n");
/* Dump triggers. */
while ((row= mysql_fetch_row(show_triggers_rs)))
{
my_snprintf(query_buff, sizeof (query_buff),
"SHOW CREATE TRIGGER %s",
quote_name(row[0], name_buff, TRUE));
if (mysql_query(mysql, query_buff))
{
/*
mysqldump is being run against old server, that does not support
SHOW CREATE TRIGGER statement. We should use SHOW TRIGGERS output.
NOTE: the dump may be incorrect, as old SHOW TRIGGERS does not
provide all the necessary information to restore trigger properly.
*/
dump_trigger_old(show_triggers_rs, &row, table_name);
}
else
{
MYSQL_RES *show_create_trigger_rs= mysql_store_result(mysql);
if (!show_create_trigger_rs ||
dump_trigger(show_create_trigger_rs, db_name, db_cl_name))
{
DBUG_RETURN(TRUE);
} }
mysql_free_result(result); mysql_free_result(show_create_trigger_rs);
}
if (switch_character_set_results(mysql, default_charset)) }
DBUG_VOID_RETURN;
if (mysql_num_rows(show_triggers_rs))
fprintf(sql_file, "\n");
mysql_free_result(show_triggers_rs);
/* /*
make sure to set back opt_compatible mode to make sure to set back opt_compatible mode to
...@@ -2705,7 +2881,7 @@ static void dump_triggers_for_table(char *table, char *db_name) ...@@ -2705,7 +2881,7 @@ static void dump_triggers_for_table(char *table, char *db_name)
*/ */
opt_compatible_mode=old_opt_compatible_mode; opt_compatible_mode=old_opt_compatible_mode;
DBUG_VOID_RETURN; DBUG_RETURN(FALSE);
} }
static void add_load_option(DYNAMIC_STRING *str, const char *option, static void add_load_option(DYNAMIC_STRING *str, const char *option,
...@@ -3775,7 +3951,14 @@ static int dump_all_tables_in_db(char *database) ...@@ -3775,7 +3951,14 @@ static int dump_all_tables_in_db(char *database)
order_by= 0; order_by= 0;
if (opt_dump_triggers && ! opt_xml && if (opt_dump_triggers && ! opt_xml &&
mysql_get_server_version(mysql) >= 50009) mysql_get_server_version(mysql) >= 50009)
dump_triggers_for_table(table, database); {
if (dump_triggers_for_table(table, database))
{
if (path)
my_fclose(md_result_file, MYF(MY_WME));
maybe_exit(EX_MYSQLERR);
}
}
} }
} }
if (opt_events && !opt_xml && if (opt_events && !opt_xml &&
...@@ -3985,7 +4168,14 @@ static int dump_selected_tables(char *db, char **table_names, int tables) ...@@ -3985,7 +4168,14 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
dump_table(*pos, db); dump_table(*pos, db);
if (opt_dump_triggers && if (opt_dump_triggers &&
mysql_get_server_version(mysql) >= 50009) mysql_get_server_version(mysql) >= 50009)
dump_triggers_for_table(*pos, db); {
if (dump_triggers_for_table(*pos, db))
{
if (path)
my_fclose(md_result_file, MYF(MY_WME));
maybe_exit(EX_MYSQLERR);
}
}
} }
/* Dump each selected view */ /* Dump each selected view */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment