1. 22 Nov, 2005 1 commit
  2. 21 Nov, 2005 2 commits
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 36dd2cf6
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new
      
      
      sql/lock.cc:
        Auto merged
      36dd2cf6
    • unknown's avatar
      BUG #14524 · 53319497
      unknown authored
      Post-review fixes to original changeset http://lists.mysql.com/internals/32422
      
      
      BUILD/SETUP.sh:
        BUG #14524
        
        Added flags to no-ndb build script to include archive.
      mysql-test/r/partition.result:
        BUG #14524 
        
        Post review mods to test results
      mysql-test/t/partition.test:
        BUG #14524
        
        Post review mods to test
      sql/ha_partition.cc:
        BUG# 14524
        
        Post review modifications to code - removed if, just pass m_no_locks
      53319497
  3. 20 Nov, 2005 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 64a81f01
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.1-new
      
      
      64a81f01
    • unknown's avatar
      ndb - bug#14007 5.1 (merge 5.0->5.1) · defa8e84
      unknown authored
      
      mysql-test/r/ndb_charset.result:
        bug#14007 5.1 (merge 5.0->5.1)
      mysql-test/t/ndb_charset.test:
        bug#14007 5.1 (merge 5.0->5.1)
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        bug#14007 5.1 (merge 5.0->5.1)
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
        bug#14007 5.1 (merge 5.0->5.1)
      defa8e84
  4. 19 Nov, 2005 6 commits
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-5.0-8568 · ca035724
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.1-new
      
      
      ca035724
    • unknown's avatar
      A fix for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA when · 4ca413e9
      unknown authored
      COUNT(*) is 0" (the test case has been pushed already)
      
      
      sql/sql_cursor.cc:
        Fix a return of an unitialized variable: return_zero_rows
        checks the return value of send_fields and in case it's 1
        doesn't call send_data. This caused creation of an empty result 
        set for the case when there is a cursor against a select with a 
        group function and no matching rows.
      4ca413e9
    • unknown's avatar
      Fix after merge of 5.0 into 5.1. Failed tests before merge: bdb-deadlock, ndb_cache2, ndb_multi2, · a93a2a90
      unknown authored
      ps_6bdb (this one fails circa once over 4 runs). After the merge: the same PLUS mysql_client_test&sp (due to problem in fix of BUG#14845 which has also
      been noticed in 5.0 too and Konstantin is looking at it) PLUS mysqlcheck (just consequence of mysql_client_test).
      And a replication bugfix (thd->spcont must be taken into account when calling tables_ok(), as in 5.0,
      and so some brackets were missing which changed one test).
      Pekka will look at the NDB code where I just used "ul": ndb_charset test, and storage/ndb/src/kernel/vm/SimulatedBlock.cpp
      and storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp (SimulatedBlock.hpp automerged);
      please also check storage/ndb/src/ndbapi/NdbRecAttr.cpp. Petr please check ha_tina.cc.
      
      
      mysql-test/r/ndb_charset.result:
        "ul" in merge (Pekka please fix)
      mysql-test/t/ndb_charset.test:
        "ul" in merge (Pekka please fix)
      sql/sql_acl.cc:
        missing ()
      sql/sql_parse.cc:
        If thd->spcont is true, always replicate (as in 5.0) (bad old merge probably).
      a93a2a90
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 51972f1a
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
      
      
      51972f1a
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-5.0-van · 38069031
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
      (2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
      and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
      
      
      configure.in:
        Auto merged
      mysql-test/r/ndb_charset.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      mysys/base64.c:
        Auto merged
      sql/ha_archive.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/myisam/ft_parser.c:
        Auto merged
      storage/ndb/include/kernel/AttributeDescriptor.hpp:
        Auto merged
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
        Auto merged
      storage/ndb/tools/ndb_size.pl:
        Auto merged
      storage/ndb/tools/ndb_size.tmpl:
        Auto merged
      mysql-test/t/disabled.def:
        merge
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        used "ul", Pekka said he'll fix
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
        used "ul", Pekka said he'll fix
      38069031
    • unknown's avatar
      BUG #14524 · 136c91dd
      unknown authored
      Patch that fixes crashing when partition uses blackole for 
      underlying tables.
      
      
      mysql-test/r/partition.result:
        BUG #14524 New test result
      mysql-test/t/partition.test:
        BUG #14524
        
        New test
      sql/ha_partition.cc:
        BUG# 14524
        
        Added new class var m_no_locks to keep track of the absense of locks. If 
        '0', then lock_count returns 0, which keeps thr_multi_lock from crashing
        in the case of the underlying table being ha_blackhole.
      sql/ha_partition.h:
        BUG #14524
        
        Added new class var m_no_locks to keep track of lock count
      sql/lock.cc:
        BUG #14524
        
        DBUG PRINTs and ENTERs to make tracking the bug easier. I think these are 
        useful regardless of this bug.
      sql/sql_partition.cc:
        BUG #14524
        
        Changed umlaut o to allow fixing bug 14524 using DDD (file would not display
        in DDD)
      136c91dd
  5. 18 Nov, 2005 12 commits
    • unknown's avatar
      Bug#13510 "Setting password local variable changes current · 6ba79a25
      unknown authored
      password": additional fix, also make sure that a syntax error is 
      returned for set names="foo" when there is no such variable or no
      stored procedure.
      
      
      mysql-test/r/sp-error.result:
        Test results fixed: a new test for Bug#13510
      mysql-test/t/sp-error.test:
        A new test for Bug#13510 (set names out of an SP)
      sql/sql_yacc.yy:
        Bug#13510: fix the case when there is no stored procedure or
        no 'names' variable declared. Return a syntax error in this case.
      6ba79a25
    • unknown's avatar
      A test case for Bug#8568 "GROUP_CONCAT returns string, unless in · a11caf1e
      unknown authored
      a UNION in which case returns BLOB". The bug is not present anymore.
      
      
      mysql-test/r/func_gconcat.result:
        Bug#8568: test results
      mysql-test/t/func_gconcat.test:
        Add a test case for Bug#8568
      a11caf1e
    • unknown's avatar
      fix after merge of 5.0 into 5.1 · a06f394e
      unknown authored
      
      sql/share/errmsg.txt:
        fix after merge
      sql/sql_show.cc:
        fix after merge
      a06f394e
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 43262f34
      unknown authored
      into moonbone.local:/work/13622-bug-5.0-mysql
      
      
      43262f34
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-5.0 · 41de6f9a
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
      I'll fix; I'll ask some devs to check their part)
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      storage/myisam/mi_key.c:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbImpl.hpp:
        Auto merged
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      configure.in:
        merge
      mysql-test/r/ps_1general.result:
        merge ("ul", will fix)
      sql/examples/ha_tina.cc:
        merge
      sql/ha_innodb.cc:
        merge
      sql/handler.h:
        merge
      sql/log.cc:
        merge
      sql/set_var.cc:
        merge
      sql/share/errmsg.txt:
        merge (bad, will fix)
      sql/sql_show.cc:
        merge (bad, will fix)
      sql/sql_yacc.yy:
        merge
      storage/ndb/src/ndbapi/NdbRecAttr.cpp:
        merge
      41de6f9a
    • unknown's avatar
      A test case for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA · fe94b6bf
      unknown authored
      when COUNT(*) is 0". The bug itself cannot be repeated.
      
      
      mysql-test/r/sp.result:
        Test results were fixed (Bug#14845)
      mysql-test/t/sp.test:
        An SQL language test case for Bug#14845
      tests/mysql_client_test.c:
        A test case for Bug#14845
      fe94b6bf
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 18ca0d63
      unknown authored
      into moonbone.local:/work/13622-bug-5.0-mysql
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      18ca0d63
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 27b4c2a5
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      27b4c2a5
    • unknown's avatar
      More authors. · 7a976f73
      unknown authored
      
      mysql-test/r/show_check.result:
        Test fix results.
      7a976f73
    • unknown's avatar
      WL#2486 - natural/using joins according to SQL:2003. · 28396247
      unknown authored
      Enabled view tests that didn't work before.
      
      
      mysql-test/r/view.result:
        Enabled natural outer join tests with views - now they work after WL#2486 was pushed.
      mysql-test/t/view.test:
        Enabled natural outer join tests with views - now they work after WL#2486 was pushed.
      28396247
    • unknown's avatar
      Fix mix_innodb_myisam_binlog test and results after merge · 39ceae40
      unknown authored
      
      mysql-test/r/mix_innodb_myisam_binlog.result:
        update results
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Update binlog test
      39ceae40
    • unknown's avatar
      Updated authors.h file (and show_check.result file) to include QA team members · f37c218d
      unknown authored
      Note: This change was reviewed by Brian before the commit.
      
      
      mysql-test/r/show_check.result:
        Updated result file
      sql/authors.h:
        Added QA team to the file
      f37c218d
  6. 17 Nov, 2005 17 commits