- developers - lists.mariadb.org

[Maria-developers] Rev 2732: Gcov support improvements in file:///home/psergey/dev/maria-5.1/
by Sergey Petrunya 18 Sep '09

18 Sep '09

At file:///home/psergey/dev/maria-5.1/ ------------------------------------------------------------ revno: 2732 revision-id: psergey(a)askmonty.org-20090918011529-3d7glu6ot7n0xqc9 parent: igor(a)mysql.com-20090909181131-6jb3y48zxnz42zyb committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1 timestamp: Fri 2009-09-18 05:15:29 +0400 message: Gcov support improvements - address review feedback (cleaner perl code) === modified file 'mysql-test/lib/mtr_gcov.pl' --- a/mysql-test/lib/mtr_gcov.pl 2009-08-25 15:02:55 +0000 +++ b/mysql-test/lib/mtr_gcov.pl 2009-09-18 01:15:29 +0000 @@ -64,7 +64,8 @@ $dir_reported= 1; } system("$gcov $f 2>>$start_dir/$gcov_err >>$start_dir/$gcov_msg"); - system("perl $basedir/mysql-test/lib/process-purecov-annotations.pl $f.gcov"); + system("perl", "$basedir/mysql-test/lib/process-purecov-annotations.pl", "$f.gcov"); + } chdir($start_dir); } === modified file 'mysql-test/lib/process-purecov-annotations.pl' --- a/mysql-test/lib/process-purecov-annotations.pl 2009-08-25 15:02:55 +0000 +++ b/mysql-test/lib/process-purecov-annotations.pl 2009-09-18 01:15:29 +0000 @@ -47,7 +47,7 @@ # my @arr= split(/:/, $line); if ($skipping || $line =~ /purecov: *(inspected|deadcode)/ || - $arr[2] =~ m/^{ */) + $arr[2] =~ m/^{ *$/) { # Change '####' to '-'. $arr[0] =~ s/#####/ -/g; @@ -57,8 +57,7 @@ } close(IN); close(OUT); - system("cat $out_file_name > $in_file_name"); - system("rm $out_file_name"); + system("mv", "-f", $out_file_name, $in_file_name); }

1 0

[Maria-developers] Rev 2746: Fix mysql-test-run on windows: in file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/
by Sergey Petrunya 18 Sep '09

18 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/ ------------------------------------------------------------ revno: 2746 revision-id: psergey(a)askmonty.org-20090917001350-pyxja2suxylxhez1 parent: psergey(a)askmonty.org-20090916190503-kgckwua1roxhonsy committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd4 timestamp: Thu 2009-09-17 04:13:50 +0400 message: Fix mysql-test-run on windows: - Make it not to add '--console' when '--log-error' option is present === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-15 10:46:35 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-09-17 00:13:50 +0000 @@ -4433,7 +4433,9 @@ if (IS_WINDOWS) { # Trick the server to send output to stderr, with --console - mtr_add_arg($args, "--console"); + if (!(join(' ', @$args) =~ /--log-error/)) { + mtr_add_arg($args, "--console"); + } } if ( $opt_gdb || $opt_manual_gdb ) @@ -5056,7 +5058,9 @@ if (IS_WINDOWS) { # Trick the server to send output to stderr, with --console - mtr_add_arg($args, "--server-arg=--console"); + if (!(join(' ', @$args) =~ /--log-error/)) { + mtr_add_arg($args, "--server-arg=--console"); + } } }

2 2

[Maria-developers] Rev 2750: A change of direction for fix 10 csets ago: in file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/
by Sergey Petrunya 18 Sep '09

18 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/ ------------------------------------------------------------ revno: 2750 revision-id: psergey(a)askmonty.org-20090918010443-56tli4pjvy9gb4cs parent: psergey(a)askmonty.org-20090918005527-k589m56f8q89zwol committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd4 timestamp: Fri 2009-09-18 05:04:43 +0400 message: A change of direction for fix 10 csets ago: - When the table is created with an attribute that is not supported by the storage engine, the attribute ought to be still kept. === modified file 'mysql-test/r/myisam.result' --- a/mysql-test/r/myisam.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/myisam.result 2009-09-18 01:04:43 +0000 @@ -2234,7 +2234,7 @@ t1 CREATE TABLE `t1` ( `n` int(11) NOT NULL, `c` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 TRANSACTIONAL=1 drop table t1; CREATE TABLE t1 (line LINESTRING NOT NULL) engine=myisam; INSERT INTO t1 VALUES (GeomFromText("POINT(0 0)")); === modified file 'mysql-test/suite/maria/r/maria3.result' --- a/mysql-test/suite/maria/r/maria3.result 2009-09-16 18:25:18 +0000 +++ b/mysql-test/suite/maria/r/maria3.result 2009-09-18 01:04:43 +0000 @@ -518,7 +518,7 @@ t1 CREATE TABLE `t1` ( `n` int(11) NOT NULL, `c` char(1) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 +) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 drop table t1; create table t1 (n int not null, c char(1)) engine=myisam transactional=1; Warnings: @@ -529,7 +529,7 @@ t1 CREATE TABLE `t1` ( `n` int(11) NOT NULL, `c` char(1) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 +) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 drop table t1; create table t1 (a int, key(a)) transactional=0; insert into t1 values (0),(1),(2),(3),(4); === modified file 'mysql-test/t/myisam.test' --- a/mysql-test/t/myisam.test 2009-09-07 20:50:10 +0000 +++ b/mysql-test/t/myisam.test 2009-09-18 01:04:43 +0000 @@ -1478,7 +1478,10 @@ --exec $MYISAMCHK -d $MYSQLD_DATADIR/test/t1 DROP TABLE t1; +# # Test warnings with transactional=1 with MyISAM +# MariaDB: Note that the table will still have 'TRANSACTIONAL=1' attribute. +# That's the intended behavior atm. # create table t1 (n int not null, c char(1)) transactional=1; show create table t1; === modified file 'sql/sql_table.cc' --- a/sql/sql_table.cc 2009-09-16 11:31:20 +0000 +++ b/sql/sql_table.cc 2009-09-18 01:04:43 +0000 @@ -3747,19 +3747,11 @@ /* Give warnings for not supported table options */ if (create_info->transactional && !file->ht->commit) - { push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, ER_ILLEGAL_HA_CREATE_OPTION, ER(ER_ILLEGAL_HA_CREATE_OPTION), file->engine_name()->str, "TRANSACTIONAL=1"); - /* - MariaDB: need to do the same for row_format and page_checksum - options. See MBUG#425916 - */ - create_info->transactional= HA_CHOICE_UNDEF; - create_info->used_fields &= ~HA_CREATE_USED_TRANSACTIONAL; - } VOID(pthread_mutex_lock(&LOCK_open)); if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))

1 0

[Maria-developers] Rev 2749: Fix mysql-test-run on windows: in file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/
by Sergey Petrunya 18 Sep '09

18 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/ ------------------------------------------------------------ revno: 2749 revision-id: psergey(a)askmonty.org-20090918005527-k589m56f8q89zwol parent: psergey(a)askmonty.org-20090917230109-mni2vfp5mtgxpbhw committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd4 timestamp: Fri 2009-09-18 04:55:27 +0400 message: Fix mysql-test-run on windows: Make it not to add '--console' when '--log-error' option is present - Review feedback === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-17 00:13:50 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-09-18 00:55:27 +0000 @@ -4433,7 +4433,7 @@ if (IS_WINDOWS) { # Trick the server to send output to stderr, with --console - if (!(join(' ', @$args) =~ /--log-error/)) { + if (!(grep(/^--log-error/, @$args))) { mtr_add_arg($args, "--console"); } } @@ -5058,7 +5058,7 @@ if (IS_WINDOWS) { # Trick the server to send output to stderr, with --console - if (!(join(' ', @$args) =~ /--log-error/)) { + if (!(grep(/^--server-arg=--log-error/, @$args))) { mtr_add_arg($args, "--server-arg=--console"); } }

1 0

[Maria-developers] Rev 2748: Apply Igor's fix: in file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/
by Sergey Petrunya 18 Sep '09

18 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/ ------------------------------------------------------------ revno: 2748 revision-id: psergey(a)askmonty.org-20090917230109-mni2vfp5mtgxpbhw parent: psergey(a)askmonty.org-20090917224610-zeizjpwa3xp740bs committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd4 timestamp: Fri 2009-09-18 03:01:09 +0400 message: Apply Igor's fix: Fixed a failure of the merge_innodb test on windows. === modified file 'storage/myisammrg/ha_myisammrg.cc' --- a/storage/myisammrg/ha_myisammrg.cc 2009-09-07 20:50:10 +0000 +++ b/storage/myisammrg/ha_myisammrg.cc 2009-09-17 23:01:09 +0000 @@ -309,7 +309,7 @@ TABLE *parent; TABLE *child; TABLE_LIST *child_l; - MI_INFO *myisam; + MI_INFO *myisam= NULL; DBUG_ENTER("myisammrg_attach_children_callback"); my_errno= 0;

1 0

[Maria-developers] Rev 2747: Apply the following MySQL's fix: in file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/
by Sergey Petrunya 18 Sep '09

18 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/ ------------------------------------------------------------ revno: 2747 revision-id: psergey(a)askmonty.org-20090917224610-zeizjpwa3xp740bs parent: psergey(a)askmonty.org-20090917001350-pyxja2suxylxhez1 committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd4 timestamp: Fri 2009-09-18 02:46:10 +0400 message: Apply the following MySQL's fix: Bug #46212 safe_process: FATAL ERROR, Unknown option: --nocore Also fixed mysqld.cc to avoid popup-boxes === modified file 'mysql-test/lib/My/SafeProcess/safe_process_win.cc' --- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc 2009-05-14 19:56:53 +0000 +++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc 2009-09-17 22:46:10 +0000 @@ -163,6 +163,7 @@ HANDLE job_handle; HANDLE wait_handles[NUM_HANDLES]= {0}; PROCESS_INFORMATION process_info= {0}; + BOOL nocore= FALSE; sprintf(safe_process_name, "safe_process[%d]", pid); @@ -192,18 +193,22 @@ } break; } else { - if ( strcmp(arg, "--verbose") == 0 ) + if (strcmp(arg, "--verbose") == 0) verbose++; - else if ( strncmp(arg, "--parent-pid", 10) == 0 ) - { - /* Override parent_pid with a value provided by user */ - const char* start; + else if (strncmp(arg, "--parent-pid", 10) == 0) + { + /* Override parent_pid with a value provided by user */ + const char* start; if ((start= strstr(arg, "=")) == NULL) - die("Could not find start of option value in '%s'", arg); - start++; /* Step past = */ - if ((parent_pid= atoi(start)) == 0) - die("Invalid value '%s' passed to --parent-id", start); - } + die("Could not find start of option value in '%s'", arg); + start++; /* Step past = */ + if ((parent_pid= atoi(start)) == 0) + die("Invalid value '%s' passed to --parent-id", start); + } + else if (strcmp(arg, "--nocore") == 0) + { + nocore= TRUE; + } else die("Unknown option: %s", arg); } @@ -241,6 +246,11 @@ &jeli, sizeof(jeli)) == 0) message("SetInformationJobObject failed, continue anyway..."); + /* Avoid popup box */ + if (nocore) + SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX + | SEM_NOOPENFILEERRORBOX); + #if 0 /* Setup stdin, stdout and stderr redirect */ si.dwFlags= STARTF_USESTDHANDLES; === modified file 'sql/mysqld.cc' --- a/sql/mysqld.cc 2009-09-15 10:46:35 +0000 +++ b/sql/mysqld.cc 2009-09-17 22:46:10 +0000 @@ -2194,15 +2194,14 @@ win_install_sigabrt_handler(); if(opt_console) SetConsoleCtrlHandler(console_event_handler,TRUE); - else - { + /* Avoid MessageBox()es*/ - _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); - _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); - _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); + _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); + _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); + _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE); + _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); + _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE); + _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); /* Do not use SEM_NOGPFAULTERRORBOX in the following SetErrorMode (), @@ -2211,8 +2210,8 @@ exception filter is not guaranteed to work in all situation (like heap corruption or stack overflow) */ - SetErrorMode(SetErrorMode(0)|SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); - } + SetErrorMode(SetErrorMode(0) | SEM_FAILCRITICALERRORS + | SEM_NOOPENFILEERRORBOX); SetUnhandledExceptionFilter(my_unhandler_exception_filter); }

1 0

[Maria-developers] Rev 2731: Fix for in file:///Users/hakan/work/monty_program/maria-debug/
by Hakan Kuecuekyilmaz 17 Sep '09

17 Sep '09

At file:///Users/hakan/work/monty_program/maria-debug/ ------------------------------------------------------------ revno: 2731 revision-id: hakan(a)askmonty.org-20090917072332-xjnvyigid29r77ih parent: knielsen(a)knielsen-hq.org-20090907131358-6bq1e3qfcgi30hu8 committer: Hakan Kuecuekyilmaz <hakan(a)askmonty.org> branch nick: maria-debug timestamp: Thu 2009-09-17 09:23:32 +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-17 07:23:32 +0000 @@ -448,7 +448,16 @@ /* First we create */ if (create_statements) + { + /* + If we have an --engine option, then we indicate + create_schema() to add the engine type to the DDL. + */ + if (eptr) + create_statements->type= CREATE_TABLE_TYPE; + create_schema(mysql, create_schema_string, create_statements, eptr); + } /* If we generated GUID we need to build a list of them from creation that @@ -588,7 +597,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 for an engine" + "after a `:', 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 +969,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 +985,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 +1076,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 +1129,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 +1188,6 @@ exit(1); } - - if (auto_generate_sql && num_of_query && auto_actual_queries) { fprintf(stderr, @@ -1217,6 +1228,7 @@ num_int_cols= atoi(str->string); if (str->option) num_int_cols_index= atoi(str->option); + option_cleanup(str); } @@ -1229,6 +1241,7 @@ num_char_cols_index= atoi(str->option); else num_char_cols_index= 0; + option_cleanup(str); } @@ -1463,6 +1476,7 @@ if (tty_password) opt_password= get_tty_password(NullS); + DBUG_RETURN(0); } @@ -1477,6 +1491,7 @@ if (verbose >= 3) printf("%.*s;\n", len, query); + return mysql_real_query(mysql, query, len); } @@ -1592,18 +1607,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 +1620,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 +1668,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 +1957,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 +1993,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 +2010,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 +2060,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 +2118,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 */

2 1

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (igor:2744)
by Igor Babaev 17 Sep '09

17 Sep '09

#At lp:maria based on revid:igor@askmonty.org-20090916174301-lzzh1r0khn3dxwvp 2744 Igor Babaev 2009-09-16 Fixed a failure of the merge_innodb test on windows. modified: storage/myisammrg/ha_myisammrg.cc === modified file 'storage/myisammrg/ha_myisammrg.cc' --- a/storage/myisammrg/ha_myisammrg.cc 2009-09-07 20:50:10 +0000 +++ b/storage/myisammrg/ha_myisammrg.cc 2009-09-17 03:36:21 +0000 @@ -309,7 +309,7 @@ static MI_INFO *myisammrg_attach_childre TABLE *parent; TABLE *child; TABLE_LIST *child_l; - MI_INFO *myisam; + MI_INFO *myisam= NULL; DBUG_ENTER("myisammrg_attach_children_callback"); my_errno= 0;

2 2

[Maria-developers] Rev 2745: MWL#17: Table elimination: fixes for windows in file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/
by Sergey Petrunya 16 Sep '09

16 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/ ------------------------------------------------------------ revno: 2745 revision-id: psergey(a)askmonty.org-20090916190503-kgckwua1roxhonsy parent: psergey(a)askmonty.org-20090916184547-z63saem4y90zd0u8 committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd3 timestamp: Wed 2009-09-16 23:05:03 +0400 message: MWL#17: Table elimination: fixes for windows === modified file 'include/my_global.h' --- a/include/my_global.h 2009-09-15 10:46:35 +0000 +++ b/include/my_global.h 2009-09-16 19:05:03 +0000 @@ -925,6 +925,7 @@ #define MY_ALIGN(A,L) (((A) + (L) - 1) & ~((L) - 1)) #define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double)) +#define ALIGN_MAX_UNIT (sizeof(double)) /* Size to make adressable obj. */ #define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A), sizeof(double))) #define OFFSET(t, f) ((size_t)(char *)&((t *)0)->f) === modified file 'mysql-test/r/table_elim.result' --- a/mysql-test/r/table_elim.result 2009-08-26 21:01:40 +0000 +++ b/mysql-test/r/table_elim.result 2009-09-16 19:05:03 +0000 @@ -98,78 +98,78 @@ insert into t2 select id, id+1, date_add('2008-06-22', interval id day) from t0; create view v1 as select -F.id, A1.attr1, A2.attr2 +f.id, a1.attr1, a2.attr2 from -t0 F -left join t1 A1 on A1.id=F.id -left join t2 A2 on A2.id=F.id and -A2.fromdate=(select MAX(fromdate) from -t2 where id=A2.id); +t0 f +left join t1 a1 on a1.id=f.id +left join t2 a2 on a2.id=f.id and +a2.fromdate=(select MAX(fromdate) from +t2 where id=a2.id); create view v2 as select -F.id, A1.attr1, A2.attr2 +f.id, a1.attr1, a2.attr2 from -t0 F -left join t1 A1 on A1.id=F.id -left join t2 A2 on A2.id=F.id and -A2.fromdate=(select MAX(fromdate) from -t2 where id=F.id); +t0 f +left join t1 a1 on a1.id=f.id +left join t2 a2 on a2.id=f.id and +a2.fromdate=(select MAX(fromdate) from +t2 where id=f.id); This should use one table: explain select id from v1 where id=2; id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY F const PRIMARY PRIMARY 4 const 1 Using index +1 PRIMARY f const PRIMARY PRIMARY 4 const 1 Using index This should use one table: explain extended select id from v1 where id in (1,2,3,4); id select_type table type possible_keys key key_len ref rows filtered Extra -1 PRIMARY F range PRIMARY PRIMARY 4 NULL 4 100.00 Using where; Using index +1 PRIMARY f range PRIMARY PRIMARY 4 NULL 4 100.00 Using where; Using index Warnings: -Note 1276 Field or reference 'test.A2.id' of SELECT #3 was resolved in SELECT #1 -Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` where (`F`.`id` in (1,2,3,4)) -This should use facts and A1 tables: +Note 1276 Field or reference 'test.a2.id' of SELECT #3 was resolved in SELECT #1 +Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` where (`f`.`id` in (1,2,3,4)) +This should use facts and a1 tables: explain extended select id from v1 where attr1 between 12 and 14; id select_type table type possible_keys key key_len ref rows filtered Extra -1 PRIMARY A1 range PRIMARY,attr1 attr1 5 NULL 2 100.00 Using where -1 PRIMARY F eq_ref PRIMARY PRIMARY 4 test.A1.id 1 100.00 Using index +1 PRIMARY a1 range PRIMARY,attr1 attr1 5 NULL 2 100.00 Using where +1 PRIMARY f eq_ref PRIMARY PRIMARY 4 test.a1.id 1 100.00 Using index Warnings: -Note 1276 Field or reference 'test.A2.id' of SELECT #3 was resolved in SELECT #1 -Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` join `test`.`t1` `A1` where ((`F`.`id` = `A1`.`id`) and (`A1`.`attr1` between 12 and 14)) -This should use facts, A2 and its subquery: +Note 1276 Field or reference 'test.a2.id' of SELECT #3 was resolved in SELECT #1 +Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t1` `a1` where ((`f`.`id` = `a1`.`id`) and (`a1`.`attr1` between 12 and 14)) +This should use facts, a2 and its subquery: explain extended select id from v1 where attr2 between 12 and 14; id select_type table type possible_keys key key_len ref rows filtered Extra -1 PRIMARY A2 range PRIMARY,attr2 attr2 5 NULL 5 100.00 Using where -1 PRIMARY F eq_ref PRIMARY PRIMARY 4 test.A2.id 1 100.00 Using index -3 DEPENDENT SUBQUERY t2 ref PRIMARY PRIMARY 4 test.A2.id 2 100.00 Using index +1 PRIMARY a2 range PRIMARY,attr2 attr2 5 NULL 5 100.00 Using where +1 PRIMARY f eq_ref PRIMARY PRIMARY 4 test.a2.id 1 100.00 Using index +3 DEPENDENT SUBQUERY t2 ref PRIMARY PRIMARY 4 test.a2.id 2 100.00 Using index Warnings: -Note 1276 Field or reference 'test.A2.id' of SELECT #3 was resolved in SELECT #1 -Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` join `test`.`t2` `A2` where ((`F`.`id` = `A2`.`id`) and (`A2`.`attr2` between 12 and 14) and (`A2`.`fromdate` = (select max(`test`.`t2`.`fromdate`) AS `MAX(fromdate)` from `test`.`t2` where (`test`.`t2`.`id` = `A2`.`id`)))) +Note 1276 Field or reference 'test.a2.id' of SELECT #3 was resolved in SELECT #1 +Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t2` `a2` where ((`f`.`id` = `a2`.`id`) and (`a2`.`attr2` between 12 and 14) and (`a2`.`fromdate` = (select max(`test`.`t2`.`fromdate`) AS `MAX(fromdate)` from `test`.`t2` where (`test`.`t2`.`id` = `a2`.`id`)))) This should use one table: explain select id from v2 where id=2; id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY F const PRIMARY PRIMARY 4 const 1 Using index +1 PRIMARY f const PRIMARY PRIMARY 4 const 1 Using index This should use one table: explain extended select id from v2 where id in (1,2,3,4); id select_type table type possible_keys key key_len ref rows filtered Extra -1 PRIMARY F range PRIMARY PRIMARY 4 NULL 4 100.00 Using where; Using index +1 PRIMARY f range PRIMARY PRIMARY 4 NULL 4 100.00 Using where; Using index Warnings: -Note 1276 Field or reference 'test.F.id' of SELECT #3 was resolved in SELECT #1 -Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` where (`F`.`id` in (1,2,3,4)) -This should use facts and A1 tables: +Note 1276 Field or reference 'test.f.id' of SELECT #3 was resolved in SELECT #1 +Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` where (`f`.`id` in (1,2,3,4)) +This should use facts and a1 tables: explain extended select id from v2 where attr1 between 12 and 14; id select_type table type possible_keys key key_len ref rows filtered Extra -1 PRIMARY A1 range PRIMARY,attr1 attr1 5 NULL 2 100.00 Using where -1 PRIMARY F eq_ref PRIMARY PRIMARY 4 test.A1.id 1 100.00 Using index +1 PRIMARY a1 range PRIMARY,attr1 attr1 5 NULL 2 100.00 Using where +1 PRIMARY f eq_ref PRIMARY PRIMARY 4 test.a1.id 1 100.00 Using index Warnings: -Note 1276 Field or reference 'test.F.id' of SELECT #3 was resolved in SELECT #1 -Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` join `test`.`t1` `A1` where ((`F`.`id` = `A1`.`id`) and (`A1`.`attr1` between 12 and 14)) -This should use facts, A2 and its subquery: +Note 1276 Field or reference 'test.f.id' of SELECT #3 was resolved in SELECT #1 +Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t1` `a1` where ((`f`.`id` = `a1`.`id`) and (`a1`.`attr1` between 12 and 14)) +This should use facts, a2 and its subquery: explain extended select id from v2 where attr2 between 12 and 14; id select_type table type possible_keys key key_len ref rows filtered Extra -1 PRIMARY A2 range PRIMARY,attr2 attr2 5 NULL 5 100.00 Using where -1 PRIMARY F eq_ref PRIMARY PRIMARY 4 test.A2.id 1 100.00 Using where; Using index -3 DEPENDENT SUBQUERY t2 ref PRIMARY PRIMARY 4 test.F.id 2 100.00 Using index +1 PRIMARY a2 range PRIMARY,attr2 attr2 5 NULL 5 100.00 Using where +1 PRIMARY f eq_ref PRIMARY PRIMARY 4 test.a2.id 1 100.00 Using where; Using index +3 DEPENDENT SUBQUERY t2 ref PRIMARY PRIMARY 4 test.f.id 2 100.00 Using index Warnings: -Note 1276 Field or reference 'test.F.id' of SELECT #3 was resolved in SELECT #1 -Note 1003 select `F`.`id` AS `id` from `test`.`t0` `F` join `test`.`t2` `A2` where ((`F`.`id` = `A2`.`id`) and (`A2`.`attr2` between 12 and 14) and (`A2`.`fromdate` = (select max(`test`.`t2`.`fromdate`) AS `MAX(fromdate)` from `test`.`t2` where (`test`.`t2`.`id` = `F`.`id`)))) +Note 1276 Field or reference 'test.f.id' of SELECT #3 was resolved in SELECT #1 +Note 1003 select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t2` `a2` where ((`f`.`id` = `a2`.`id`) and (`a2`.`attr2` between 12 and 14) and (`a2`.`fromdate` = (select max(`test`.`t2`.`fromdate`) AS `MAX(fromdate)` from `test`.`t2` where (`test`.`t2`.`id` = `f`.`id`)))) drop view v1, v2; drop table t0, t1, t2; create table t1 (a int); === modified file 'mysql-test/t/table_elim.test' --- a/mysql-test/t/table_elim.test 2009-08-26 21:01:40 +0000 +++ b/mysql-test/t/table_elim.test 2009-09-16 19:05:03 +0000 @@ -86,30 +86,30 @@ create view v1 as select - F.id, A1.attr1, A2.attr2 + f.id, a1.attr1, a2.attr2 from - t0 F - left join t1 A1 on A1.id=F.id - left join t2 A2 on A2.id=F.id and - A2.fromdate=(select MAX(fromdate) from - t2 where id=A2.id); + t0 f + left join t1 a1 on a1.id=f.id + left join t2 a2 on a2.id=f.id and + a2.fromdate=(select MAX(fromdate) from + t2 where id=a2.id); create view v2 as select - F.id, A1.attr1, A2.attr2 + f.id, a1.attr1, a2.attr2 from - t0 F - left join t1 A1 on A1.id=F.id - left join t2 A2 on A2.id=F.id and - A2.fromdate=(select MAX(fromdate) from - t2 where id=F.id); + t0 f + left join t1 a1 on a1.id=f.id + left join t2 a2 on a2.id=f.id and + a2.fromdate=(select MAX(fromdate) from + t2 where id=f.id); --echo This should use one table: explain select id from v1 where id=2; --echo This should use one table: explain extended select id from v1 where id in (1,2,3,4); ---echo This should use facts and A1 tables: +--echo This should use facts and a1 tables: explain extended select id from v1 where attr1 between 12 and 14; ---echo This should use facts, A2 and its subquery: +--echo This should use facts, a2 and its subquery: explain extended select id from v1 where attr2 between 12 and 14; # Repeat for v2: @@ -118,9 +118,9 @@ explain select id from v2 where id=2; --echo This should use one table: explain extended select id from v2 where id in (1,2,3,4); ---echo This should use facts and A1 tables: +--echo This should use facts and a1 tables: explain extended select id from v2 where attr1 between 12 and 14; ---echo This should use facts, A2 and its subquery: +--echo This should use facts, a2 and its subquery: explain extended select id from v2 where attr2 between 12 and 14; drop view v1, v2; === modified file 'sql/opt_table_elimination.cc' --- a/sql/opt_table_elimination.cc 2009-09-07 07:12:38 +0000 +++ b/sql/opt_table_elimination.cc 2009-09-16 19:05:03 +0000 @@ -868,7 +868,7 @@ List_iterator<Dep_module> modules_it(*new_bound_modules); while ((module= modules_it++)) { - char iter_buf[Dep_module::iterator_size]; + char iter_buf[Dep_module::iterator_size + ALIGN_MAX_UNIT]; Dep_module::Iterator iter; iter= module->init_unbound_values_iter(iter_buf); while ((value= module->get_next_unbound_value(this, iter))) @@ -887,7 +887,7 @@ List_iterator<Dep_value> value_it(new_bound_values); while ((value= value_it++)) { - char iter_buf[Dep_value::iterator_size]; + char iter_buf[Dep_value::iterator_size + ALIGN_MAX_UNIT]; Dep_value::Iterator iter; iter= value->init_unbound_modules_iter(iter_buf); while ((module= value->get_next_unbound_module(this, iter)))

1 0

[Maria-developers] Rev 2744: Merge in file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/
by Sergey Petrunya 16 Sep '09

16 Sep '09

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/ ------------------------------------------------------------ revno: 2744 revision-id: psergey(a)askmonty.org-20090916184547-z63saem4y90zd0u8 parent: psergey(a)askmonty.org-20090916182518-spnq86qey2xnv33l parent: igor(a)askmonty.org-20090916174301-lzzh1r0khn3dxwvp committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: mysql-5.1-maria-contd3 timestamp: Wed 2009-09-16 22:45:47 +0400 message: Merge modified: storage/xtradb/srv/srv0start.c srv0start.c-20081201061010-zymrrwrczns2vrex-348 ------------------------------------------------------------ revno: 2742.1.1 revision-id: igor(a)askmonty.org-20090916174301-lzzh1r0khn3dxwvp parent: knielsen(a)knielsen-hq.org-20090916120716-ssmx93bg4znld9l8 committer: Igor Babaev <igor(a)askmonty.org> branch nick: maria-5.1-merge timestamp: Wed 2009-09-16 10:43:01 -0700 message: Fix of bug #417751 by Yasufumi Kinoshita. modified: storage/xtradb/srv/srv0start.c srv0start.c-20081201061010-zymrrwrczns2vrex-348 === modified file 'storage/xtradb/srv/srv0start.c' --- a/storage/xtradb/srv/srv0start.c 2009-09-03 13:20:22 +0000 +++ b/storage/xtradb/srv/srv0start.c 2009-09-16 17:43:01 +0000 @@ -1119,8 +1119,14 @@ os_aio_use_native_aio = FALSE; } else { - /* On Win 2000 and XP use async i/o */ - os_aio_use_native_aio = TRUE; + /* On Win 2000 and XP currently native async i/o + is not used for xtradb by default */ + //os_aio_use_native_aio = TRUE; + os_aio_use_native_aio = FALSE; + fprintf(stderr, + "InnoDB: Windows native async i/o is disabled as default.\n" + "InnoDB: It is not applicable for the current" + " multi io threads implementation.\n"); } #endif if (srv_file_flush_method_str == NULL) { @@ -1156,6 +1162,12 @@ } else if (0 == ut_strcmp(srv_file_flush_method_str, "async_unbuffered")) { srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED; + os_aio_use_native_aio = TRUE; + srv_n_read_io_threads = srv_n_write_io_threads = 1; + fprintf(stderr, + "InnoDB: 'async_unbuffered' was detected as innodb_flush_method.\n" + "InnoDB: Windows native async i/o is enabled.\n" + "InnoDB: And io threads are restricted.\n"); #endif } else { fprintf(stderr,

1 0