1. 03 Sep, 2007 3 commits
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 329534a8
      unknown authored
      into  dl145s.mysql.com:/data0/mhansson/my51-bug30234-push
      
      
      sql/sql_yacc.yy:
        Bug#30234: Manual merge
      329534a8
    • unknown's avatar
      Merge linux-st28.site:/home/martin/mysql/src/bug30234-push/my50-bug30234-push · a895c77d
      unknown authored
      into  linux-st28.site:/home/martin/mysql/src/bug30234-push/my51-bug30234-push
      
      
      sql/sql_yacc.yy:
        Auto merged
      a895c77d
    • unknown's avatar
      Bug #30234: Unexpected behavior using DELETE with AS and USING · f0d4beee
      unknown authored
        
      DELETE FROM ... USING ... statements with the following type of 
      ambiguous aliasing gave unexpected results:
      DELETE FROM t1 AS alias USING t1, t2 AS alias WHERE t1.a = alias.a;
      This query would leave table t1 intact but delete rows from t2.
      Fixed by changing DELETE FROM ... USING syntax so that only alias 
      references (as opposed to alias declarations) may be used in FROM.
      
      
      mysql-test/r/delete.result:
        Bug#30234: Test Result
      mysql-test/t/delete.test:
        Bug#30234: Test Case
      sql/sql_yacc.yy:
        Bug#30234:
        - Added parser rule table_alias_ref_list that contains a list of table 
          aliases only.
        - Added parser rule table_alias_ref that sets the TL_OPTION_ALIAS in 
          order to turn off semantic checking that applies only for table names.
      f0d4beee
  2. 31 Aug, 2007 2 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30126 · 035e516a
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      sql/sql_parse.cc:
        SCCS merged
      035e516a
    • unknown's avatar
      Fixed bug #30126. · ff149b71
      unknown authored
      When dumping database from a 4.x server, the mysqldump client
      inserted a delimiter sign inside special commentaries of the form:
        /*!... CREATE DATABASE IF NOT EXISTS ... ;*/
      During restoration that dump file was splitten by delimiter signs on
      the client side, and the rest of some commentary strings was prepended
      to following statements.
      
      The 4x_server_emul test case option has been added for use with the
      DBUG_EXECUTE_IF debugging macro. This option affects debug server
      builds only to emulate particular behavior of a 4.x server for
      the mysqldump client testing. Non-debugging builds are not affected.
      
      
      mysql-test/r/mysqldump-compat.result:
        Added test case for bug #30126.
      mysql-test/t/mysqldump-compat.opt:
        Added test case for bug #30126.
      mysql-test/t/mysqldump-compat.test:
        Added test case for bug #30126.
      sql/sql_parse.cc:
        Fixed bug #30126.
        The mysqldump client uses the "SHOW CREATE DATABASE" query to
        obtain the "CREATE DATABASE" statement from that database.
        The 4.x server doesn't recognise that query, and mysqldump
        forms the "CREATE DATABASE" statement from scratch.
        That statement was formed incorrectly.
        
        To enforce the mysqldump client to create that statement from
        scratch, debugging code has been added to the mysql_execute_command
        function: in tcase of the --loose-debug=d,4x_server_emul option,
        the server returns parse error to client to emulate old behaviour.
        
        The 4x_server_emul test case option has been added for use with the
        DBUG_EXECUTE_IF debugging macro. This option affects debug server
        builds only to emulate particular behavior of a 4.x server for
        the mysqldump client testing. Non-debugging builds are not affected.
      client/mysqldump.c:
        Fixed bug #30126.
        The init_dumping_tables function has been modified to output semicolon
        outside of commentaries.
      ff149b71
  3. 29 Aug, 2007 6 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-opt · 55335f0d
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B30393-5.1-opt
      
      
      55335f0d
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 40aaeeea
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30244-5.1-opt
      
      
      sql/item_create.cc:
        Auto merged
      40aaeeea
    • unknown's avatar
      Bug #30244: row_count/found_rows does not replicate well · 385ef618
      unknown authored
       The functions ROW_COUNT/FOUND_ROWS are indeed not safe to be used in 
       statement based replication.
       Added code to declare them as such and switch the statement they're in
       to row based logging for mixed mode.
      
      
      sql/item_create.cc:
        Bug #30244: row_count/found_rows does not replicate well
         - add the functions to the set of "unsafe functions" 
           for statement based replication
      mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result:
        BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result
      mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test:
        BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
      385ef618
    • unknown's avatar
      Bug #30393: Test "group_by" fails with a difference in "row count" · 1bae3c20
      unknown authored
          and strategy (explain)
        
      The fix for WL3527 adds tests that test if the index usage hints
      combinations don't cause syntax errors.
      The EXPLAIN for one of these tests can be affected by the size of the
      rowid on the disk (affected by the presence of large file support). 
      Fixed to avoid the platform dependent test result by removing the 
      irrelevant columns from the EXPLAIN result.
      
      
      mysql-test/r/group_by.result:
        Bug #30393: ignore columns irrelevant to the test
      mysql-test/t/group_by.test:
        Bug #30393: ignore columns irrelevant to the test
      1bae3c20
    • unknown's avatar
      Addendum to the 5.1 merge of the fix · d2bd51c5
      unknown authored
      for bug 30377: use the function instead of
      the complex condition.
      
      
      d2bd51c5
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B30377-5.0-opt · 79e87471
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B30377-5.1-opt
      
      
      mysql-test/t/status.test:
        Auto merged
      mysql-test/r/status.result:
        merge 5.0->5.1 of the fix for bug 30377
      sql/sql_lex.h:
        merge 5.0->5.1 of the fix for bug 30377
      sql/sql_select.cc:
        merge 5.0->5.1 of the fix for bug 30377
      79e87471
  4. 28 Aug, 2007 4 commits
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · 53daf2e6
      unknown authored
      into  linux-st28.site:/home/martin/mysql/src/5.1o-bug30596
      
      
      sql/sql_select.cc:
        Auto merged
      53daf2e6
    • unknown's avatar
      Bug #30596 GROUP BY optimization gives wrong result order · 22440b53
      unknown authored
        
      The optimization that uses a unique index to remove GROUP BY did not 
      ensure that the index was actually used, thus violating the ORDER BY
      that is implied by GROUP BY.
      Fixed by replacing GROUP BY with ORDER BY if the GROUP BY clause contains
      a unique index over non-nullable field(s). In case GROUP BY ... ORDER BY 
      null is used, GROUP BY is simply removed.
      
      
      mysql-test/include/mix1.inc:
        Bug#30596: Test case for InnoDB
        Here, as opposed to for MyISAM, row lookup is done using index 
        whenever the index covers the group list.
      mysql-test/r/distinct.result:
        Bug#30596: Changed test case. 
        Prior to Bug#16458, These queries use temp table and filesort. The
        bug was that they used a temp table. However, that patch removed
        filesort also, in which case we can no longer gurantee correct ordering.
      mysql-test/r/group_by.result:
        Bug#30596: Correct result
        The test case for IGNORE INDEX FOR GROUP BY gets degraded performance 
        (unneccesary filesort). This is due to Bug#30665, which will be fixed separately.
      mysql-test/r/innodb_mysql.result:
        Bug#30596: Test result
      mysql-test/t/group_by.test:
        Bug#30596: Test case
      sql/sql_select.cc:
        Bug#30596: The fix: 
        - replace GROUP BY with ORDER BY unless ORDER BY [NULL|<constant>]
        - make sure to use the keys for GROUP BY in this ORDER BY.
      22440b53
    • unknown's avatar
      Bug #30377: EXPLAIN loses last_query_cost when used with UNION · 310afbd4
      unknown authored
      Currently the Last_query_cost session status variable shows
      only the cost of a single flat subselect. For complex queries
      (with subselects or unions etc) Last_query_cost is not valid
      as it was showing the cost for the last optimized subselect.
      Fixed by reseting to zero Last_query_cost when the complete
      cost of the query cannot be determined.
      Last_query_cost will be non-zero only for single flat queries.
      
      
      mysql-test/r/status.result:
        Bug #30377: test case
      mysql-test/t/status.test:
        Bug #30377: test case
      sql/sql_lex.h:
        Bug #30377: helper function
      sql/sql_select.cc:
        Bug #30377: don't assign cost if not on single level statement
      310afbd4
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 8c31792c
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28284-5.1-opt
      
      
      include/my_pthread.h:
        Auto merged
      8c31792c
  5. 26 Aug, 2007 3 commits
  6. 25 Aug, 2007 8 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · fb3a392f
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      fb3a392f
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.1 · 08fdc882
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      sql/sql_select.cc:
        Auto merged
      08fdc882
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · c81d4aac
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      c81d4aac
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 92c9c80d
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      mysql-test/r/type_bit.result:
        Auto merged
      mysql-test/t/type_bit.test:
        Auto merged
      sql/sql_select.cc:
        Merge with 5.0-opt.
      92c9c80d
    • unknown's avatar
      sql_select.cc: · 5b03876f
      unknown authored
        Additional fix for the bug#30245.
      
      
      sql/sql_select.cc:
        Additional fix for the bug#30245.
      5b03876f
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel · 36553dfd
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      36553dfd
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main · fe471aed
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      client/mysqldump.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/status.result:
        Auto merged
      sql/event_db_repository.cc:
        Auto merged
      sql/event_queue.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/ha_partition.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/log_event_old.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/t/status.test:
        Manual resolve with 5.1.
      sql/log_event.cc:
        Manual resolve with 5.1.
      sql/sql_yacc.yy:
        Manual resolve with 5.1.
      fe471aed
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main · 863a4301
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
      
      
      863a4301
  7. 24 Aug, 2007 14 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · e19f49ae
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/30245-bug-5.0-opt-mysql
      
      
      sql/sql_select.cc:
        Auto merged
      e19f49ae
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · ba6174cb
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      netware/Makefile.am:
        Auto merged
      ba6174cb
    • unknown's avatar
      Merge trift2.:/MySQL/M50/netware2-5.0 · ac7f0f98
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      netware/Makefile.am:
        Auto merged
      ac7f0f98
    • unknown's avatar
      Merge trift2.:/MySQL/M51/netware2-5.1 · 35d6bc55
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      netware/BUILD/compile-netware-END:
        Auto merged
      netware/Makefile.am:
        Auto merged
      35d6bc55
    • unknown's avatar
      Merge trift2.:/MySQL/M50/netware2-5.0 · 454063c5
      unknown authored
      into  trift2.:/MySQL/M51/netware2-5.1
      
      
      netware/BUILD/compile-netware-END:
        Auto merged
      netware/Makefile.am:
        Manual merge.
      454063c5
    • unknown's avatar
      Fixes for the NetWare builds, discovered during 5.1.21-beta and backported to 5.0: · 4a801dde
      unknown authored
      1) Ensure "init_db.sql" and "test_db-sql" really get built.
      
      2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.
      
      
      netware/BUILD/compile-netware-END:
        Ensure the "*.def" files are built for NetWare.
        
        This is a backport of a 5.1 fix which may not be needed in 5.0 but cannot do any harm:
        the general "link_sources" step might fall victim to a cleanup which would be fatal
        just for NetWare, because of problems in the ordering of SUBDIR entries.
      netware/Makefile.am:
        1) The scripts "init_db.sql" and "test_db.sql" must be built in the NetWare phase.
        
        2) Use "basename", not sed.
      4a801dde
    • unknown's avatar
      Bug #28284: Test "mysqlslap" reports "out of memory" · 06d80f11
      unknown authored
      When locking a "fast" mutex a static variable cpu_count 
      was used as a flag to initialize itself on the first usage 
      by calling sysconf() and setting non-zero value.
      This is not thread and optimization safe on some 
      platforms. That's why the global initialization needs 
      to be done once in a designated function.
      This will also speed up the usage (by a small bit) 
      because it won't have to check if it's initialized on
      every call.
      
      Fixed by moving the fast mutexes initialization out of 
      my_pthread_fastmutex_lock() to fastmutex_global_init()
      and call it from my_init()
      
      
      include/my_pthread.h:
        Bug #28284: move the fast mutexes initialization out of 
        my_pthread_fastmutex_lock() to fastmutex_global_init()
        and call it from my_init()
      mysys/my_init.c:
        Bug #28284: move the fast mutexes initialization out of 
        my_pthread_fastmutex_lock() to fastmutex_global_init()
        and call it from my_init()
      mysys/thr_mutex.c:
        Bug #28284: move the fast mutexes initialization out of 
        my_pthread_fastmutex_lock() to fastmutex_global_init()
        and call it from my_init()
      06d80f11
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel · e5447e46
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      e5447e46
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main · c2d5b26a
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/ha_partition.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      c2d5b26a
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main · aecc3606
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
      
      
      aecc3606
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 2669e39d
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      2669e39d
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 9c4b35ed
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      9c4b35ed
    • unknown's avatar
      Merge trift2.:/MySQL/M51/target-5.1.22 · b824ff95
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      b824ff95
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 7d65f9e8
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      7d65f9e8