- developers - lists.mariadb.org

Re: [Maria-developers] request for advice on managing a mysql patch in bzr
by MARK CALLAGHAN 27 Feb '10

27 Feb '10

On Fri, Feb 26, 2010 at 4:19 PM, Sergei Golubchik <serg(a)askmonty.org> wrote: > Eh, you omitted lots of crucial details here, but luckily you mentioned > them in your email to internals, so I was able to decrypt the above :) > > Anyway, what happens - you are not merging one mysql branch into > another. You merge two completely unrelated repositories. And bzr see > that both the source and the target repositories have the files with the > name "configure.in" for example - and this is obviously a conflict, as > two different files have the same name, bzr cannot merge that, it's not > the same file with the different content, they are two different files. > Two different file keys, at least. > > I seriously doubt that git would handle that situation the way you want. > By all means, bitkeeper would not - it would not even allow you to pull > from an unrelated repository, I'm a bit surprised that bzr let you do > that. > > I'm afraid your only option is to replay your changes on a mysql bzr > branch. I ended up doing that. Thanks for the advice. https://code.launchpad.net/~mysqlatfacebook/mysqlatfacebook/5.1 -- Mark Callaghan mdcallag(a)gmail.com

1 0

Re: [Maria-developers] request for advice on managing a mysql patch in bzr
by MARK CALLAGHAN 26 Feb '10

26 Feb '10

On Fri, Feb 26, 2010 at 6:36 AM, Sergei Golubchik <serg(a)askmonty.org> wrote: > When done, you'll still have your patches on top of the tree, and you > can trivially extract them (e.g. with bzr log -p) and publish them. > If you merge instead of rebasing, you'll have old patches in the tree > and merge changes spread over many merge changesets. There apparently isn't a trivial tool to import commits between two branches. Doing something like this does way more than apply the diff for that one change and copy the commit mesage. bzr merge -c revno:2 /s/bzr/fb/5.1 -- Mark Callaghan mdcallag(a)gmail.com

1 0

Re: [Maria-developers] request for advice on managing a mysql patch in bzr
by MARK CALLAGHAN 26 Feb '10

26 Feb '10

On Fri, Feb 26, 2010 at 6:36 AM, Sergei Golubchik <serg(a)askmonty.org> wrote: > Hi, MARK! > > On Feb 25, MARK CALLAGHAN wrote: >> >> I know this question is more about official MySQL than MariaDB, but it >> is also about sharing code we write at Facebook and all of the patches >> we publish can be reused by others as long as others accept BSD >> contributions. >> >> I am getting ready to publish facebook patches for mysql 5.1. We use >> git internally and are based on MySQL 5.1.44. We intend to stay >> current with 5.1 releases. What is the best way to manage the code in >> launchpad across new releases of official MySQL. My current plan is: >> >> 1) import MySQL 5.1.44, commit 2) apply patches from my git repo to my >> bzr repo, commit after each one 3) publish >> >> But there will soon be a release of 5.1.45 or 5.1.46 and I don't want >> to repeat the steps above each time that happens. Do I just publish a >> large patch for 5.1.44 -> 5.1.4X and get on with my work? Is there a >> better way? > > The least labor-intensive path, I think, could be something like > Branch mysql-5.1 tree (say, up to tag:mysql-5.1.44), apply your patches > and commit. One commit per logical patch, as usual. > > Then when 5.1.45 comes out you rebase (not merge) your tree to > tag:mysql-5.1.45. Some merges you'll need to resolve manually, others > bzr can handle automatically. > > When done, you'll still have your patches on top of the tree, and you > can trivially extract them (e.g. with bzr log -p) and publish them. > If you merge instead of rebasing, you'll have old patches in the tree > and merge changes spread over many merge changesets. That is the advice I need. Thanks. -- Mark Callaghan mdcallag(a)gmail.com

1 0

[Maria-developers] Rev 11: Merge. in file:///Users/hakan/work/monty_program/mariadb-tools/
by Hakan Kuecuekyilmaz 26 Feb '10

26 Feb '10

At file:///Users/hakan/work/monty_program/mariadb-tools/ ------------------------------------------------------------ revno: 11 [merge] revision-id: hakan(a)askmonty.org-20100226170755-uucbsqe4n60b50c1 parent: hakan(a)askmonty.org-20100226162413-118168qx5c9c02ml parent: knielsen@hasky-20100223074854-mg13sm3jnan2s51a committer: Hakan Kuecuekyilmaz <hakan(a)askmonty.org> branch nick: mariadb-tools timestamp: Fri 2010-02-26 17:07:55 +0000 message: Merge. modified: buildbot/maria-master.cfg mariamaster.cfg-20091218103450-cvifjz3i70oerkej-1 === modified file 'buildbot/maria-master.cfg' --- a/buildbot/maria-master.cfg 2010-02-02 15:10:12 +0000 +++ b/buildbot/maria-master.cfg 2010-02-23 07:48:54 +0000 @@ -113,7 +113,8 @@ "lp:~maria-captains/maria/maria-5.2-merge-5.1" : "maria-5.2-merge-5.1", "lp:~maria-captains/maria/5.2-dsmrr" : "5.2-dsmrr", "lp:~maria-captains/maria/5.3" : "5.3", - "lp:~maria-captains/maria/5.3-sj-subqueries" : "5.3-sj-subqueries" + "lp:~maria-captains/maria/5.3-sj-subqueries" : "5.3-sj-subqueries", + "lp:~maria-captains/maria/5.3-subqueries" : "5.3-subqueries" } mailSource = mail.BzrLaunchpadEmailMaildirSource("/var/lib/buildbot/Maildir", branchMap=myBranchMap) @@ -154,7 +155,7 @@ "mariadb-5.1-monty", "mariadb-5.2-monty", "mariadb-5.1-knielsen","5.1-release", "5.1-merge", "maria-5.1-wl24", "maria-5.1-vcol","maria-5.1-wl36","mysql-5.1-mwl36", - "5.1.39-oqgraph", "5.2-dsmrr", "5.3", "5.3-sj-subqueries" + "5.1.39-oqgraph", "5.2-dsmrr", "5.3", "5.3-sj-subqueries", "5.3-subqueries" ], treeStableTimer=60, # 1 sec for bzr builderNames=["centos5-debug", "hardy-x86-rtai", "hardy-amd64-makedist", @@ -531,7 +532,7 @@ "slavename": "adutko-centos5-amd64", "builddir": "centos5-amd64-minimal", "factory": f_minimal, - "category": "main", + "category": "experimental", } f_win32_rel_nmake = factory.BuildFactory()

1 0

[Maria-developers] Rev 10: Do one thing, and do that one thing proper. - The Unix Way. in file:///Users/hakan/work/monty_program/mariadb-tools/
by Hakan Kuecuekyilmaz 26 Feb '10

26 Feb '10

At file:///Users/hakan/work/monty_program/mariadb-tools/ ------------------------------------------------------------ revno: 10 revision-id: hakan(a)askmonty.org-20100226162413-118168qx5c9c02ml parent: hakan(a)askmonty.org-20100219052704-8nnlzsbu0nslnxba committer: Hakan Kuecuekyilmaz <hakan(a)askmonty.org> branch nick: mariadb-tools timestamp: Fri 2010-02-26 16:24:13 +0000 message: Do one thing, and do that one thing proper. - The Unix Way. We are running the benchmark for one source repository now. Also we run each test three times, so that peaks and glitches are balanced out. === modified file 'sysbench/run-sysbench.sh' --- a/sysbench/run-sysbench.sh 2010-02-19 05:27:04 +0000 +++ b/sysbench/run-sysbench.sh 2010-02-26 16:24:13 +0000 @@ -2,8 +2,10 @@ # # Run sysbench tests with MariaDB and MySQL # -# Note: Do not run this script with root privileges. -# We use killall -9, which can cause severe side effects! +# Notes: +# * Do not run this script with root privileges. We use +# killall -9, which can cause severe side effects! +# * By bzr pull we mean bzr merge --pull # # Hakan Kuecuekyilmaz <hakan at askmonty dot org> 2010-02-19. # @@ -19,6 +21,29 @@ exit 1 fi +if [ $# != 3 ]; then + echo '[ERROR]: Please provide exactly three options.' + echo " Example: $0 [pull | no-pull] [/path/to/bzr/repo] [name]" + echo " $0 pull ${HOME}/work/monty_program/maria-local-master MariaDB" + + exit 1 +else + PULL="$1" + LOCAL_MASTER="$2" + PRODUCT="$3" +fi + +# +# Binaries. +# +MYSQLADMIN='client/mysqladmin' + +# +# Adjust the following paths according to your installation. +# +SYSBENCH='/usr/local/bin/sysbench' +BZR='/usr/local/bin/bzr' + # # Variables. # @@ -27,32 +52,42 @@ MY_SOCKET="${TEMP_DIR}/mysql.sock" MYSQLADMIN_OPTIONS="--no-defaults -uroot --socket=$MY_SOCKET" MYSQL_OPTIONS="--no-defaults \ + --datadir=$DATA_DIR \ + --language=./sql/share/english \ + --max_connections=256 \ + --query_cache_size=0 \ + --query_cache_type=0 \ --skip-grant-tables \ - --language=./sql/share/english \ - --datadir=$DATA_DIR \ - --tmpdir=$TEMP_DIR \ --socket=$MY_SOCKET \ --table_open_cache=512 \ --thread_cache=512 \ - --query_cache_size=0 \ - --query_cache_type=0 \ + --tmpdir=$TEMP_DIR \ + --innodb_additional_mem_pool_size=32M \ + --innodb_buffer_pool_size=1024M \ + --innodb_data_file_path=ibdata1:32M:autoextend \ --innodb_data_home_dir=$DATA_DIR \ - --innodb_data_file_path=ibdata1:128M:autoextend \ - --innodb_log_group_home_dir=$DATA_DIR \ - --innodb_buffer_pool_size=1024M \ - --innodb_additional_mem_pool_size=32M \ - --innodb_log_file_size=256M \ - --innodb_log_buffer_size=16M \ + --innodb_doublewrite=0 \ --innodb_flush_log_at_trx_commit=1 \ + --innodb_flush_method=O_DIRECT \ --innodb_lock_wait_timeout=50 \ - --innodb_doublewrite=0 \ - --innodb_flush_method=O_DIRECT \ - --innodb_thread_concurrency=0 \ - --innodb_max_dirty_pages_pct=80" + --innodb_log_buffer_size=16M \ + --innodb_log_file_size=256M \ + --innodb_log_group_home_dir=$DATA_DIR \ + --innodb_max_dirty_pages_pct=80 \ + --innodb_thread_concurrency=0" +# Number of threads we run sysbench with. NUM_THREADS="1 4 8 16 32 64 128" + +# The table size we use for sysbench. TABLE_SIZE=2000000 + +# The run time we use for sysbench. RUN_TIME=300 + +# How many times we run each test. +LOOP_COUNT=3 + SYSBENCH_TESTS="delete.lua \ insert.lua \ oltp_complex_ro.lua \ @@ -61,6 +96,7 @@ select.lua \ update_index.lua \ update_non_index.lua" + SYSBENCH_OPTIONS="--oltp-table-size=$TABLE_SIZE \ --max-time=$RUN_TIME \ --max-requests=0 \ @@ -68,123 +104,86 @@ --mysql-user=root \ --mysql-engine-trx=yes" -PRODUCTS='MariaDB MySQL' - # Timeout in seconds for waiting for mysqld to start. TIMEOUT=100 # # Files # -MARIADB_BUILD_LOG='/tmp/mariadb_build.log' -MYSQL_BUILD_LOG='/tmp/mysql_build.log' +BUILD_LOG="/tmp/${PRODUCT}_build.log" # # Directories. # BASE="${HOME}/work" -MARIADB_LOCAL_MASTER="${BASE}/monty_program/maria-local-master" -MARIADB_WORK="${BASE}/monty_program/maria" -MYSQL_LOCAL_MASTER="${BASE}/mysql/mysql-server-local-master" -MYSQL_WORK="${BASE}/mysql/mysql-server" TEST_DIR="${BASE}/monty_program/sysbench/sysbench/tests/db" RESULT_DIR="${BASE}/sysbench-results" - -# -# Binaries. -# -MYSQLADMIN='./client/mysqladmin' -SYSBENCH='/usr/local/bin/sysbench' -BZR='/usr/local/bin/bzr' - -# -# Refresh repositories. -# -echo "[$(date "+%Y-%m-%d %H:%M:%S")] Refreshing source repositories." -rm -rf $MARIADB_WORK -if [ ! -d $MARIADB_LOCAL_MASTER ]; then - echo "[ERROR]: Local master of MariaDB does not exist." - echo " Please make a initial branch from lp:maria" - echo " Exiting." - exit 1 -else - cd $MARIADB_LOCAL_MASTER +WORK_DIR='/tmp' + +if [ ! -d $LOCAL_MASTER ]; then + echo "[ERROR]: Supplied local master $LOCAL_MASTER does not exists." + echo " Please provide a valid bzr repository." + echo " Exiting." + exit 1 +fi + +# +# Refresh repositories, if requested. +# +if [ x"$PULL" = x"pull" ]; then + echo "[$(date "+%Y-%m-%d %H:%M:%S")] Refreshing source repositories." + + cd $LOCAL_MASTER echo "Pulling latest MariaDB sources." - $BZR pull - if [ $? != 0 ]; then - echo "[ERROR]: $BZR pull for $MARIADB_LOCAL_MASTER failed" - echo " Please check your bzr setup" - echo " Exiting." - exit 1 - fi - - echo "Branching MariaDB working directory." - $BZR branch $MARIADB_LOCAL_MASTER $MARIADB_WORK - if [ $? != 0 ]; then - echo "[ERROR]: $BZR branch of $MARIADB_LOCAL_MASTER failed" - echo " Please check your bzr setup" - echo " Exiting." - exit 1 - fi -fi - -rm -rf $MYSQL_WORK -if [ ! -d $MYSQL_LOCAL_MASTER ]; then - echo "[ERROR]: Local master of MySQL does not exist." - echo " Please make a initial branch from lp:mysql-server" - echo " Exiting." - exit 1 -else - cd $MYSQL_LOCAL_MASTER - echo "Pulling latest MySQL sources." - $BZR pull - if [ $? != 0 ]; then - echo "[ERROR]: $BZR pull for $MYSQL_LOCAL_MASTER failed" - echo " Please check your bzr setup" - echo " Exiting." - exit 1 - fi - - echo "Branching MySQL working directory." - $BZR branch $MYSQL_LOCAL_MASTER $MYSQL_WORK - if [ $? != 0 ]; then - echo "[ERROR]: $BZR branch of $MYSQL_LOCAL_MASTER failed" - echo " Please check your bzr setup" - echo " Exiting." - exit 1 - fi -fi - -echo "[$(date "+%Y-%m-%d %H:%M:%S")] Done refreshing source repositories." - - -# -# TODO: Add platform detection and choose proper build script. -# -echo "[$(date "+%Y-%m-%d %H:%M:%S")] Starting to compile." - -echo "[$(date "+%Y-%m-%d %H:%M:%S")] Compiling MariaDB." -cd $MARIADB_WORK -BUILD/compile-amd64-max > $MARIADB_BUILD_LOG 2>&1 -if [ $? != 0 ]; then - echo "[ERROR]: Build of $MARIADB_WORK failed" - echo " Please check the log at $MARIDB_BUILD_LOG" - echo " Exiting." - exit 1 -fi -echo "[$(date "+%Y-%m-%d %H:%M:%S")] Finnished compiling MariaDB." - -echo "[$(date "+%Y-%m-%d %H:%M:%S")] Compiling MySQL." -cd $MYSQL_WORK -BUILD/compile-amd64-max > $MYSQL_BUILD_LOG 2>&1 -if [ $? != 0 ]; then - echo "[ERROR]: Build of $MYSQL_WORK failed" - echo " Please check the log at $MYSQL_BUILD_LOG" - echo " Exiting." - exit 1 -fi -echo "[$(date "+%Y-%m-%d %H:%M:%S")] Finnished compiling MySQL." -echo "[$(date "+%Y-%m-%d %H:%M:%S")] Finnished compiling." + $BZR merge --pull + if [ $? != 0 ]; then + echo "[ERROR]: $BZR pull for $LOCAL_MASTER failed" + echo " Please check your bzr setup and/or repository" + echo " Exiting." + exit 1 + fi + + echo "[$(date "+%Y-%m-%d %H:%M:%S")] Done refreshing source repositories." +fi + +cd $WORK_DIR +TEMP_DIR=$(mktemp -d) +if [ $? != 0 ]; then + echo "[ERROR]: mktemp in $WORK_DIR failed." + echo 'Exiting.' + + exit 1 +fi + +# +# bzr export refuses to export to an existing directory, +# therefore we use an extra build/ directory. +# +echo "Exporting from $LOCAL_MASTER to ${TEMP_DIR}/build" +$BZR export --format=dir ${TEMP_DIR}/build $LOCAL_MASTER +if [ $? != 0 ]; then + echo '[ERROR]: bzr export failed.' + echo 'Exiting.' + + exit 1 +fi + +# +# Compile sources. +# TODO: Add platform detection and choose proper build script accordingly. +# +echo "[$(date "+%Y-%m-%d %H:%M:%S")] Starting to compile $PRODUCT." + +cd ${TEMP_DIR}/build +BUILD/compile-amd64-max > $BUILD_LOG 2>&1 +if [ $? != 0 ]; then + echo "[ERROR]: Build of $PRODUCT failed" + echo " Please check your log at $BUILD_LOG" + echo " Exiting." + exit 1 +fi + +echo "[$(date "+%Y-%m-%d %H:%M:%S")] Finnished compiling $PRODUCT." # # Go to work. @@ -194,78 +193,79 @@ # # Prepare results directory. # -if [ ! -d $RESULT_DIRS ]; then - echo "[NOTE]: $RESULT_DIRS did not exist." +if [ ! -d $RESULT_DIR ]; then + echo "[NOTE]: $RESULT_DIR did not exist." echo " We are creating it for you!" - mkdir $RESULT_DIRS + mkdir $RESULT_DIR fi TODAY=$(date +%Y-%m-%d) mkdir ${RESULT_DIR}/${TODAY} - -for PRODUCT in $PRODUCTS; do - mkdir ${RESULT_DIR}/${TODAY}/${PRODUCT} - - killall -9 mysqld - rm -rf $DATA_DIR - rm -f $MY_SOCKET - mkdir $DATA_DIR - - if [ x"$PRODUCT" = x"MariaDB" ];then - cd $MARIADB_WORK - else - cd $MYSQL_WORK - fi - - sql/mysqld $MYSQL_OPTIONS & - - j=0 - STARTED=-1 - while [ $j -le $TIMEOUT ] - do - $MYSQLADMIN $MYSQLADMIN_OPTIONS ping > /dev/null 2>&1 - if [ $? = 0 ]; then - STARTED=0 - - break - fi - - sleep 1 - j=$(($j + 1)) - done - - if [ $STARTED != 0 ]; then - echo '[ERROR]: Start of mysqld failed.' - echo ' Please check your error log.' - echo ' Exiting.' - - exit 1 - fi - - for SYSBENCH_TEST in $SYSBENCH_TESTS; do - mkdir ${RESULT_DIR}/${TODAY}/${PRODUCT}/${SYSBENCH_TEST} - - for THREADS in $NUM_THREADS; do - THIS_RESULT_DIR="${RESULT_DIR}/${TODAY}/${PRODUCT}/${SYSBENCH_TEST}/${THREADS}" - mkdir $THIS_RESULT_DIR - echo "[$(date "+%Y-%m-%d %H:%M:%S")] Running $SYSBENCH_TEST with $THREADS threads for $PRODUCT" - - $MYSQLADMIN $MYSQLADMIN_OPTIONS -f drop sbtest - $MYSQLADMIN $MYSQLADMIN_OPTIONS create sbtest - if [ $? != 0 ]; then - echo "[ERROR]: Create of sbtest database failed" - echo " Please check your setup." - echo " Exiting" - exit 1 - fi - - SYSBENCH_OPTIONS="$SYSBENCH_OPTIONS --num-threads=$THREADS --test=${TEST_DIR}/${SYSBENCH_TEST}" - $SYSBENCH $SYSBENCH_OPTIONS prepare - $SYSBENCH $SYSBENCH_OPTIONS run > ${THIS_RESULT_DIR}/result.txt 2>&1 - - done - done +mkdir ${RESULT_DIR}/${TODAY}/${PRODUCT} + +killall -9 mysqld +rm -rf $DATA_DIR +rm -f $MY_SOCKET +mkdir $DATA_DIR + +sql/mysqld $MYSQL_OPTIONS & + +j=0 +STARTED=-1 +while [ $j -le $TIMEOUT ] + do + $MYSQLADMIN $MYSQLADMIN_OPTIONS ping > /dev/null 2>&1 + if [ $? = 0 ]; then + STARTED=0 + + break + fi + + sleep 1 + j=$(($j + 1)) +done + +if [ $STARTED != 0 ]; then + echo '[ERROR]: Start of mysqld failed.' + echo ' Please check your error log.' + echo ' Exiting.' + + exit 1 +fi + +for SYSBENCH_TEST in $SYSBENCH_TESTS + do + mkdir ${RESULT_DIR}/${TODAY}/${PRODUCT}/${SYSBENCH_TEST} + + for THREADS in $NUM_THREADS + do + THIS_RESULT_DIR="${RESULT_DIR}/${TODAY}/${PRODUCT}/${SYSBENCH_TEST}/${THREADS}" + mkdir $THIS_RESULT_DIR + echo "[$(date "+%Y-%m-%d %H:%M:%S")] Running $SYSBENCH_TEST with $THREADS threads and $LOOP_COUNT iterations for $PRODUCT" | tee ${THIS_RESULT_DIR}/results.txt + echo '' >> ${THIS_RESULT_DIR}/results.txt + + k=0 + while [ $k -lt $LOOP_COUNT ] + do + $MYSQLADMIN $MYSQLADMIN_OPTIONS -f drop sbtest + $MYSQLADMIN $MYSQLADMIN_OPTIONS create sbtest + if [ $? != 0 ]; then + echo "[ERROR]: Create of sbtest database failed" + echo " Please check your setup." + echo " Exiting" + exit 1 + fi + + SYSBENCH_OPTIONS="$SYSBENCH_OPTIONS --num-threads=$THREADS --test=${TEST_DIR}/${SYSBENCH_TEST}" + $SYSBENCH $SYSBENCH_OPTIONS prepare + $SYSBENCH $SYSBENCH_OPTIONS run > ${THIS_RESULT_DIR}/result${k}.txt 2>&1 + + grep "write requests:" ${THIS_RESULT_DIR}/result${k}.txt | awk '{ print $4 }' | sed -e 's/(//' >> ${THIS_RESULT_DIR}/results.txt + + k=$(($k + 1)) + done + done done #

1 0

Re: [Maria-developers] request for advice on managing a mysql patch in bzr
by MARK CALLAGHAN 26 Feb '10

26 Feb '10

On Fri, Feb 26, 2010 at 1:30 AM, Sergei Golubchik <serg(a)askmonty.org> wrote: > Hi, MARK! > > On Feb 25, MARK CALLAGHAN wrote: >> >> One other comment. I don't think the official releases are in >> launchpad. If they were I imagine this would be easier to do. Of >> course, anyone could republish the official releases there. > > Official MySQL releases ? > > What do you mean - mysql-5.1 tree is on launchpad, all releases are > tagged, you can branch up to any tag to get a release. > What am I missing ? > I missed that there were tags. I know that now -- Harrison explained it to me. -- Mark Callaghan mdcallag(a)gmail.com

1 0

[Maria-developers] askmonty.org moving to a new server this Thursday (25 Feb)
by Daniel Bartholomew 25 Feb '10

25 Feb '10

All, I'm sending this to both Maria Developers and Maria Discuss to make sure it gets to everyone, sorry for any duplicates. Just a heads up for everyone: I will be moving the askmonty.org website from its current home to a new server this Thursday, 25 Feb. If all goes according to plan, the website will remain up during the move but will be read-only during the actual switch. askmonty.org is the only domain/website that will be impacted by this move, websites on any other domain (such as buildbot.askmonty.org) are not part of this move and will continue to function normally. I will send a notice out on Thursday when I start the process, and a final one once the move is complete and I've tested that things are working properly. Thanks! -- Daniel Bartholomew Monty Program - http://askmonty.org

3 4

Re: [Maria-developers] protocol testing tool
by Eric Day 25 Feb '10

25 Feb '10

Hi Sergei! Like I mentioned, this will be a tool written in Python that tests all the edge cases for the MySQL and Drizzle protocols. Currently I'm through the handshake code, and will be looking at command and result processing next. This is to make sure we guarantee compatibility as we re-write the protocol code in Drizzle. This will be part of the libdrizzle project, so free to use and contribute to it! I've not pushed anything up yet, but probably will do so by the end of this week. I'll send you a link once I push it up. -Eric On Tue, Feb 09, 2010 at 01:18:24PM +0100, Sergei Golubchik wrote: > Hi, Eric > > > >>>>> "Eric" == Eric Day <eday(a)oddments.org> writes: > > > > Hi! > > I'm working on a MySQL and Drizzle protocol testing tool, and while > > testing various edge cases, > ...... > > This is interesting. I've just extended MySQL protocol [with lost of new > corner cases :)] and would love to see that tested too. > > Can you tell more about this work of yours ? > > Regards, > Sergei

3 4

[Maria-developers] Rev 2770: Prepare for OJ+SJ handling: Make replace_where_subcondition() not to assume in file:///home/psergey/dev/maria-5.3-subqueries-r7/
by Sergey Petrunya 25 Feb '10

25 Feb '10

At file:///home/psergey/dev/maria-5.3-subqueries-r7/ ------------------------------------------------------------ revno: 2770 revision-id: psergey(a)askmonty.org-20100225080910-38wapbgw5vpm6nax parent: psergey(a)askmonty.org-20100224113342-k558ogyr3cik1767 committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.3-subqueries-r7 timestamp: Thu 2010-02-25 08:09:10 +0000 message: Prepare for OJ+SJ handling: Make replace_where_subcondition() not to assume it's working on the WHERE clause. === modified file 'sql/opt_subselect.cc' --- a/sql/opt_subselect.cc 2010-02-17 21:59:41 +0000 +++ b/sql/opt_subselect.cc 2010-02-25 08:09:10 +0000 @@ -536,7 +536,6 @@ *expr= new_cond; if (do_fix_fields) new_cond->fix_fields(join->thd, expr); - join->select_lex->where= *expr; return FALSE; }

1 0

[Maria-developers] Rev 2769: Bug#49198 Wrong result for second call of of procedure with view in subselect. in file:///home/psergey/dev/maria-5.3-subqueries-r7/
by Sergey Petrunya 24 Feb '10

24 Feb '10

At file:///home/psergey/dev/maria-5.3-subqueries-r7/ ------------------------------------------------------------ revno: 2769 revision-id: psergey(a)askmonty.org-20100224113342-k558ogyr3cik1767 parent: psergey(a)askmonty.org-20100223092202-sc3huivw9yymnj5d committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.3-subqueries-r7 timestamp: Wed 2010-02-24 12:33:42 +0100 message: Bug#49198 Wrong result for second call of of procedure with view in subselect. Re-worked fix of Tor Didriksen: The problem was that fix_after_pullout() after semijoin conversion wasn't propagated from the view to the underlying table. On subesequent executions of the prepared statement, we would mark the underlying table as 'dependent' and the predicate anlysis would lead to a different (and illegal) execution plan. === modified file 'mysql-test/r/subselect_sj.result' --- a/mysql-test/r/subselect_sj.result 2010-02-21 07:53:12 +0000 +++ b/mysql-test/r/subselect_sj.result 2010-02-24 11:33:42 +0000 @@ -824,3 +824,50 @@ 3 2 drop table t1, t2, t3; +# +# Bug#49198 Wrong result for second call of procedure +# with view in subselect. +# +CREATE TABLE t1 (t1field integer, primary key (t1field)); +CREATE TABLE t2 (t2field integer, primary key (t2field)); +CREATE TABLE t3 (t3field integer, primary key (t3field)); +CREATE VIEW v2 AS SELECT * FROM t2; +CREATE VIEW v3 AS SELECT * FROM t3; +INSERT INTO t1 VALUES(1),(2); +INSERT INTO t2 VALUES(1),(2); +INSERT INTO t3 VALUES(1),(2); +PREPARE stmt FROM +" +SELECT t1field +FROM t1 +WHERE t1field IN (SELECT * FROM v2); +"; +EXECUTE stmt; +t1field +1 +2 +EXECUTE stmt; +t1field +1 +2 +PREPARE stmt FROM +" +EXPLAIN +SELECT t1field +FROM t1 +WHERE t1field IN (SELECT * FROM v2) + AND t1field IN (SELECT * FROM v3) +"; +EXECUTE stmt; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t1 index PRIMARY PRIMARY 4 NULL 2 Using index +1 PRIMARY t2 eq_ref PRIMARY PRIMARY 4 test.t1.t1field 1 Using index +1 PRIMARY t3 eq_ref PRIMARY PRIMARY 4 test.t1.t1field 1 Using index +EXECUTE stmt; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 index PRIMARY PRIMARY 4 NULL 2 Using index +1 SIMPLE t2 eq_ref PRIMARY PRIMARY 4 test.t1.t1field 1 Using index +1 SIMPLE t3 eq_ref PRIMARY PRIMARY 4 test.t1.t1field 1 Using index +DROP TABLE t1, t2, t3; +DROP VIEW v2, v3; +# End of Bug#49198 === modified file 'mysql-test/r/subselect_sj_jcl6.result' --- a/mysql-test/r/subselect_sj_jcl6.result 2010-02-21 07:53:12 +0000 +++ b/mysql-test/r/subselect_sj_jcl6.result 2010-02-24 11:33:42 +0000 @@ -828,6 +828,53 @@ 3 2 drop table t1, t2, t3; +# +# Bug#49198 Wrong result for second call of procedure +# with view in subselect. +# +CREATE TABLE t1 (t1field integer, primary key (t1field)); +CREATE TABLE t2 (t2field integer, primary key (t2field)); +CREATE TABLE t3 (t3field integer, primary key (t3field)); +CREATE VIEW v2 AS SELECT * FROM t2; +CREATE VIEW v3 AS SELECT * FROM t3; +INSERT INTO t1 VALUES(1),(2); +INSERT INTO t2 VALUES(1),(2); +INSERT INTO t3 VALUES(1),(2); +PREPARE stmt FROM +" +SELECT t1field +FROM t1 +WHERE t1field IN (SELECT * FROM v2); +"; +EXECUTE stmt; +t1field +1 +2 +EXECUTE stmt; +t1field +1 +2 +PREPARE stmt FROM +" +EXPLAIN +SELECT t1field +FROM t1 +WHERE t1field IN (SELECT * FROM v2) + AND t1field IN (SELECT * FROM v3) +"; +EXECUTE stmt; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t1 index PRIMARY PRIMARY 4 NULL 2 Using index +1 PRIMARY t2 eq_ref PRIMARY PRIMARY 4 test.t1.t1field 1 Using index +1 PRIMARY t3 eq_ref PRIMARY PRIMARY 4 test.t1.t1field 1 Using index +EXECUTE stmt; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 index PRIMARY PRIMARY 4 NULL 2 Using index +1 SIMPLE t2 eq_ref PRIMARY PRIMARY 4 test.t1.t1field 1 Using index +1 SIMPLE t3 eq_ref PRIMARY PRIMARY 4 test.t1.t1field 1 Using index +DROP TABLE t1, t2, t3; +DROP VIEW v2, v3; +# End of Bug#49198 set join_cache_level=default; show variables like 'join_cache_level'; Variable_name Value === modified file 'mysql-test/t/subselect_sj.test' --- a/mysql-test/t/subselect_sj.test 2010-02-21 07:53:12 +0000 +++ b/mysql-test/t/subselect_sj.test 2010-02-24 11:33:42 +0000 @@ -728,3 +728,45 @@ drop table t1, t2, t3; +--echo # +--echo # Bug#49198 Wrong result for second call of procedure +--echo # with view in subselect. +--echo # + +CREATE TABLE t1 (t1field integer, primary key (t1field)); +CREATE TABLE t2 (t2field integer, primary key (t2field)); +CREATE TABLE t3 (t3field integer, primary key (t3field)); + +CREATE VIEW v2 AS SELECT * FROM t2; +CREATE VIEW v3 AS SELECT * FROM t3; + +INSERT INTO t1 VALUES(1),(2); +INSERT INTO t2 VALUES(1),(2); +INSERT INTO t3 VALUES(1),(2); + +PREPARE stmt FROM +" +SELECT t1field +FROM t1 +WHERE t1field IN (SELECT * FROM v2); +"; + +EXECUTE stmt; +EXECUTE stmt; + +PREPARE stmt FROM +" +EXPLAIN +SELECT t1field +FROM t1 +WHERE t1field IN (SELECT * FROM v2) + AND t1field IN (SELECT * FROM v3) +"; + +EXECUTE stmt; +EXECUTE stmt; + +DROP TABLE t1, t2, t3; +DROP VIEW v2, v3; + +--echo # End of Bug#49198 === modified file 'sql/item.cc' --- a/sql/item.cc 2010-02-21 06:32:23 +0000 +++ b/sql/item.cc 2010-02-24 11:33:42 +0000 @@ -6491,11 +6491,9 @@ void Item_ref::fix_after_pullout(st_select_lex *new_parent, Item **refptr) { + (*ref)->fix_after_pullout(new_parent, ref); if (depended_from == new_parent) - { - (*ref)->fix_after_pullout(new_parent, ref); depended_from= NULL; - } }

1 0