diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-04-25 21:38:12 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-04-25 21:38:12 -0600 |
| commit | 034c11f3cdac8b2b39dd8593d1fbad5b92f98879 (patch) | |
| tree | f8e46975bbaed334eddc4cc2ab0c1b752a7b321d /sql/slave.cc | |
| parent | 5e414cd222b1d39eb49371ba28fb990a963017c5 (diff) | |
| download | mariadb-git-034c11f3cdac8b2b39dd8593d1fbad5b92f98879.tar.gz | |
manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index f1b9ea8476b..f89a56e2087 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -923,6 +923,7 @@ static int create_table_from_dump(THD* thd, MYSQL *mysql, const char* db, handler *file; ulonglong save_options; NET *net= &mysql->net; + const char *found_semicolon= NULL; DBUG_ENTER("create_table_from_dump"); packet_len= my_net_read(net); // read create table statement @@ -974,7 +975,7 @@ static int create_table_from_dump(THD* thd, MYSQL *mysql, const char* db, thd->db = (char*)db; DBUG_ASSERT(thd->db != 0); thd->db_length= strlen(thd->db); - mysql_parse(thd, thd->query, packet_len); // run create table + mysql_parse(thd, thd->query, packet_len, &found_semicolon); // run create table thd->db = save_db; // leave things the way the were before thd->db_length= save_db_length; thd->options = save_options; |