At file:///Users/hakan/work/monty_program/maria-debug/ ------------------------------------------------------------ revno: 2731 revision-id: hakan@askmonty.org-20090916013015-dxg5v4z85koq7aw1 parent: knielsen@knielsen-hq.org-20090907131358-6bq1e3qfcgi30hu8 committer: Hakan Kuecuekyilmaz <hakan@askmonty.org> branch nick: maria-debug timestamp: Wed 2009-09-16 03:30:15 +0200 message: Fix for     mysqlslap: setting --engine does not get replicated     http://bugs.mysql.com/bug.php?id=46967 and     mysqlslap: specifying --engine and --create does not     work with --engine=<storage_engine>:<option>     https://bugs.launchpad.net/maria/+bug/429773 Problems were that an --engine=<storage_engine> was translated to a "set storage_engine = <storage_engine>", wich is _not_ replicated. A --engine=<storage_engine>:<option> was not always properly parsed and in some cases crashed. Fixed by eliminating "set storage_engine = ..." and adding proper DDL generation. Initialized an unitialized buffer to prevent crashes and fixed to use proper pointer for in case of --engine=<storage_engine>:<option> being the last element in list of --engines. Also cleaned up code for better readability. Q: Should MySQL's replication actually replicate a    "set storage_engine = ..." command or not? A: No it should not. It is documented here: http://dev.mysql.com/doc/refman/5.1/en/replication-features-variables.html  ...   "The storage_engine system variable is not replicated, which is a good thing for replication between different storage engines." ... Before the patch, mysqlslap was behaving this way: +-------------------------------+--------+-------------+ |                               | single | replication | +-------------------------------+--------+-------------+ | Before patch                                         | +-------------------------------+--------+-------------+ | --engine[1]                                          | +-----+-------------------------+--------+-------------+ | 1.1 | eng1                    |  OK    |   Not OK    | | 1.2 | eng1,eng2               |  OK    |   Not OK    | | 1.3 | eng1,eng2,eng3          |  OK    |   Not OK    | | 1.4 | memory:option           |  OK    |   Not OK    | | 1.5 | memory:option,eng1      |  OK    |   Not OK    | | 1.6 | eng1,memory:option      | Not OK |   Not OK    | | 1.7 | memory:option,eng1,eng2 | Crash  |   Not OK    | | 1.8 | eng1,memory:option,eng2 |  OK    |   Not OK    | | 1.9 | eng1,eng2,memory:option | Not OK |   Not OK    | +-----+-------------------------+--------+-------------+ +-------------------------------+--------+-------------+ | --create --engine[2]                                 | +-----+-------------------------+--------+-------------+ | 2.1 | eng1                    |  OK    |   Not OK    | | 2.2 | eng1,eng2               |  OK    |   Not OK    | | 2.3 | eng1,eng2,eng3          |  OK    |   Not OK    | | 2.4 | memory:option           | Not OK |   Not OK    | | 2.5 | memory:option,eng1      | Not OK |   Not OK    | | 2.6 | eng1,memory:option      | Not OK |   Not OK    | | 2.7 | memory:option,eng1,eng2 | Crash  |   Not OK    | | 2.8 | eng1,memory:option,eng2 | Not OK |   Not OK    | | 2.9 | eng1,eng2,memory:option | Not OK |   Not OK    | +-----+-------------------------+--------+-------------+ After my final patch, mysqlslap now runs like this: +-------------------------------+--------+-------------+ |                               | single | replication | +-------------------------------+--------+-------------+ | After third patch                                    | +-------------------------------+--------+-------------+ | --engine[1]                                          | +-----+-------------------------+--------+-------------+ | 1.1 | eng1                    |  OK    |  OK         | | 1.2 | eng1,eng2               |  OK    |  OK         | | 1.3 | eng1,eng2,eng3          |  OK    |  OK         | | 1.4 | memory:option           |  OK    |  OK         | | 1.5 | memory:option,eng1      |  OK    |  OK         | | 1.6 | eng1,memory:option      |  OK    |  OK         | | 1.7 | memory:option,eng1,eng2 |  OK    |  OK         | | 1.8 | eng1,memory:option,eng2 |  OK    |  OK         | | 1.9 | eng1,eng2,memory:option |  OK    |  OK         | +-----+-------------------------+--------+-------------+ +-------------------------------+--------+-------------+ | --create --engine[2]                                 | +-----+-------------------------+--------+-------------+ | 2.1 | eng1                    |  OK    |  OK         | | 2.2 | eng1,eng2               |  OK    |  OK         | | 2.3 | eng1,eng2,eng3          |  OK    |  OK         | | 2.4 | memory:option           |  OK    |  OK         | | 2.5 | memory:option,eng1      |  OK    |  OK         | | 2.6 | eng1,memory:option      |  OK    |  OK         | | 2.7 | memory:option,eng1,eng2 |  OK    |  OK         | | 2.8 | eng1,memory:option,eng2 |  OK    |  OK         | | 2.9 | eng1,eng2,memory:option |  OK    |  OK         | +-----+-------------------------+--------+-------------+ ... ..... ... .. === modified file 'client/mysqlslap.c' --- a/client/mysqlslap.c 2009-04-25 10:05:32 +0000 +++ b/client/mysqlslap.c 2009-09-16 01:30:15 +0000 @@ -423,6 +423,8 @@ stats *sptr; conclusions conclusion; unsigned long long client_limit; + DYNAMIC_STRING table_string; + statement *ddl_with_engine; head_sptr= (stats *)my_malloc(sizeof(stats) * iterations, MYF(MY_ZEROFILL|MY_FAE|MY_WME)); @@ -448,8 +450,41 @@ /* First we create */ if (create_statements) - create_schema(mysql, create_schema_string, create_statements, eptr); - + { + /* + In case of user supplied DDL and engine, we add the engine + type to the DDL here. + */ + if (create_string && eptr) + { + init_dynamic_string(&table_string, "", 1024, 1024); + + dynstr_append(&table_string, create_statements->string); + dynstr_append(&table_string, " Engine = "); + dynstr_append(&table_string, eptr->string); + + if (eptr->option) + { + dynstr_append(&table_string, " "); + dynstr_append(&table_string, eptr->option); + } + + ddl_with_engine= (statement *) my_malloc(sizeof(statement), + MYF(MY_ZEROFILL|MY_FAE|MY_WME)); + ddl_with_engine->string= (char *) my_malloc(table_string.length + 1, + MYF(MY_ZEROFILL|MY_FAE|MY_WME)); + ddl_with_engine->length= table_string.length + 1; + ddl_with_engine->type= create_statements->type; + strmov(ddl_with_engine->string, table_string.str); + ddl_with_engine->next= create_statements->next; + + dynstr_free(&table_string); + + create_schema(mysql, create_schema_string, ddl_with_engine, eptr); + } + else + create_schema(mysql, create_schema_string, create_statements, eptr); + } /* If we generated GUID we need to build a list of them from creation that we can later use. @@ -588,7 +623,9 @@ "Detach (close and reopen) connections after X number of requests.", (uchar**) &detach_rate, (uchar**) &detach_rate, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"engine", 'e', "Storage engine to use for creating the table.", + {"engine", 'e', "Comma separated list of storage engines to use for creating the table." + "The test is run for each engine. You can also specify an option to an engine" + "delimited by `:', like memory:max_row=2300", (uchar**) &default_engine, (uchar**) &default_engine, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"host", 'h', "Connect to host.", (uchar**) &host, (uchar**) &host, 0, GET_STR, @@ -958,6 +995,7 @@ ptr->type= UPDATE_TYPE_REQUIRES_PREFIX ; else ptr->type= UPDATE_TYPE; + strmov(ptr->string, update_string.str); dynstr_free(&update_string); DBUG_RETURN(ptr); @@ -973,8 +1011,8 @@ static statement * build_insert_string(void) { - char buf[HUGE_STRING_LENGTH]; - unsigned int col_count; + char buf[HUGE_STRING_LENGTH]; + unsigned int col_count; statement *ptr; DYNAMIC_STRING insert_string; DBUG_ENTER("build_insert_string"); @@ -1064,8 +1102,8 @@ static statement * build_select_string(my_bool key) { - char buf[HUGE_STRING_LENGTH]; - unsigned int col_count; + char buf[HUGE_STRING_LENGTH]; + unsigned int col_count; statement *ptr; static DYNAMIC_STRING query_string; DBUG_ENTER("build_select_string"); @@ -1117,6 +1155,7 @@ ptr->type= SELECT_TYPE_REQUIRES_PREFIX; else ptr->type= SELECT_TYPE; + strmov(ptr->string, query_string.str); dynstr_free(&query_string); DBUG_RETURN(ptr); @@ -1175,8 +1214,6 @@ exit(1); } - - if (auto_generate_sql && num_of_query && auto_actual_queries) { fprintf(stderr, @@ -1217,6 +1254,7 @@ num_int_cols= atoi(str->string); if (str->option) num_int_cols_index= atoi(str->option); + option_cleanup(str); } @@ -1229,6 +1267,7 @@ num_char_cols_index= atoi(str->option); else num_char_cols_index= 0; + option_cleanup(str); } @@ -1463,6 +1502,7 @@ if (tty_password) opt_password= get_tty_password(NullS); + DBUG_RETURN(0); } @@ -1477,6 +1517,7 @@ if (verbose >= 3) printf("%.*s;\n", len, query); + return mysql_real_query(mysql, query, len); } @@ -1592,18 +1633,6 @@ } } - if (engine_stmt) - { - len= snprintf(query, HUGE_STRING_LENGTH, "set storage_engine=`%s`", - engine_stmt->string); - if (run_query(mysql, query, len)) - { - fprintf(stderr,"%s: Cannot set default engine: %s\n", my_progname, - mysql_error(mysql)); - exit(1); - } - } - count= 0; after_create= stmt; @@ -1617,8 +1646,21 @@ { char buffer[HUGE_STRING_LENGTH]; - snprintf(buffer, HUGE_STRING_LENGTH, "%s %s", ptr->string, - engine_stmt->option); + snprintf(buffer, HUGE_STRING_LENGTH, "%s Engine = %s %s", + ptr->string, engine_stmt->string, engine_stmt->option); + if (run_query(mysql, buffer, strlen(buffer))) + { + fprintf(stderr,"%s: Cannot run query %.*s ERROR : %s\n", + my_progname, (uint)ptr->length, ptr->string, mysql_error(mysql)); + exit(1); + } + } + else if (engine_stmt && engine_stmt->string && ptr->type == CREATE_TABLE_TYPE) + { + char buffer[HUGE_STRING_LENGTH]; + + snprintf(buffer, HUGE_STRING_LENGTH, "%s Engine = %s", + ptr->string, engine_stmt->string); if (run_query(mysql, buffer, strlen(buffer))) { fprintf(stderr,"%s: Cannot run query %.*s ERROR : %s\n", @@ -1652,6 +1694,7 @@ { char query[HUGE_STRING_LENGTH]; int len; + DBUG_ENTER("drop_schema"); len= snprintf(query, HUGE_STRING_LENGTH, "DROP SCHEMA IF EXISTS `%s`", db); @@ -1940,17 +1983,22 @@ uint count= 0; /* We know that there is always one */ for (tmp= *sptr= (option_string *)my_malloc(sizeof(option_string), - MYF(MY_ZEROFILL|MY_FAE|MY_WME)); + MYF(MY_ZEROFILL|MY_FAE|MY_WME)); (retstr= strchr(ptr, delm)); tmp->next= (option_string *)my_malloc(sizeof(option_string), - MYF(MY_ZEROFILL|MY_FAE|MY_WME)), + MYF(MY_ZEROFILL|MY_FAE|MY_WME)), tmp= tmp->next) { - char buffer[HUGE_STRING_LENGTH]; + char buffer[HUGE_STRING_LENGTH]= ""; char *buffer_ptr; count++; strncpy(buffer, ptr, (size_t)(retstr - ptr)); + /* + Handle --engine=memory:max_row=200 cases, or more general speaking + --engine=<storage_engine>:<options>. --engine=<storage_engine:option + will be translated to Engine = storage_engine option + */ if ((buffer_ptr= strchr(buffer, ':'))) { char *option_ptr; @@ -1971,13 +2019,15 @@ tmp->length= (size_t)(retstr - ptr); } + /* Skip delimiter delm */ ptr+= retstr - ptr + 1; if (isspace(*ptr)) ptr++; + count++; } - if (ptr != origin+length) + if (ptr != origin + length) { char *origin_ptr; @@ -1986,7 +2036,7 @@ char *option_ptr; tmp->length= (size_t)(origin_ptr - ptr); - tmp->string= my_strndup(origin, tmp->length, MYF(MY_FAE)); + tmp->string= my_strndup(ptr, tmp->length, MYF(MY_FAE)); option_ptr= (char *)ptr + 1 + tmp->length; @@ -2036,7 +2086,7 @@ if (ptr != script+length) { tmp->string= my_strndup(ptr, (uint)((script + length) - ptr), - MYF(MY_FAE)); + MYF(MY_FAE)); tmp->length= (size_t)((script + length) - ptr); count++; } @@ -2094,6 +2144,7 @@ { char buffer[HUGE_STRING_LENGTH]; const char *ptr= auto_generate_sql_type ? auto_generate_sql_type : "query"; + snprintf(buffer, HUGE_STRING_LENGTH, "%s,%s,%ld.%03ld,%ld.%03ld,%ld.%03ld,%d,%llu\n", con->engine ? con->engine : "", /* Storage engine we ran against */