1. 28 Dec, 2005 7 commits
  2. 27 Dec, 2005 9 commits
    • unknown's avatar
      Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1c74210e
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-bug5390
      
      
      1c74210e
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6706115c
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my50
      
      
      6706115c
    • unknown's avatar
      Fix bug#14583 · 9a128b97
      unknown authored
      When InnoDB compares varchar field in ucs2 with given key using bin collation,
      it calls my_strnncollsp_ucs2_bin() to perform comparison.
      Because field length was lesser than length of key field should be padded
      with trailing spaces in order to get correct result. 
      Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
      doesn't pads field, wrong comparison result was returned. This results in
      wrong result set.
      
      my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
      but using binary collation.
      
      
      mysql-test/t/ctype_ucs.test:
        Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
        correct records.
      mysql-test/r/ctype_ucs.result:
        Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping correct records.
      strings/ctype-ucs2.c:
        Fix bug#14583 Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
        correct records.my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
        but using binary collation.
      9a128b97
    • unknown's avatar
      ndb - wl#2972 (5.0) fix detached trigger opType + new pgm test_event_merge · b4d11507
      unknown authored
      
      ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        error code 4709 was set outside if()
      ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        fix opType for detached triggers (accidental miss since v21x?)
      ndb/test/ndbapi/Makefile.am:
        test_event_merge v5.0
      ndb/test/ndbapi/test_event_merge.cpp:
        test_event_merge v5.0
      b4d11507
    • unknown's avatar
      5.0 ndb build fix. · f6910883
      unknown authored
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        build fix for 5.0
      f6910883
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · 88ef95ff
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      client/mysql.cc:
        Auto merged
      myisam/mi_delete.c:
        Auto merged
      mysql-test/r/fulltext2.result:
        Auto merged
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      88ef95ff
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 4b543591
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-bug5390
      
      
      libmysqld/ha_blackhole.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      4b543591
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · d03d5a30
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-bug5390
      
      
      BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      d03d5a30
    • unknown's avatar
  3. 26 Dec, 2005 1 commit
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1-bug5390 · e049f2c8
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-bug5390
      
      
      BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
        Auto merged
      mysql-test/r/create.result:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      mysql-test/r/merge.result:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      mysql-test/t/create.test:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      mysql-test/t/merge.test:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      sql/lock.cc:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      sql/mysql_priv.h:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      sql/sql_parse.cc:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      sql/sql_update.cc:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      e049f2c8
  4. 24 Dec, 2005 2 commits
  5. 23 Dec, 2005 3 commits
    • unknown's avatar
      locking issues, · bcc1ecd3
      unknown authored
      test for LONGLONG_MIN in decimal.c
      
      
      myisam/mi_create.c:
        lock THR_LOCK_myisam later
      mysys/thr_alarm.c:
        remove misplaced comment and "safety" if()
      server-tools/instance-manager/instance.cc:
        add unlock
      strings/decimal.c:
        correct the test for LONGLONG_MIN. fix debug sprintf
      bcc1ecd3
    • unknown's avatar
      correct help text · c2ac0891
      unknown authored
      c2ac0891
    • unknown's avatar
      ctype_uca.result, ctype_uca.test: · c885fb04
      unknown authored
        Adding test case.
      charset-def.c:
        Initialize new collation.
      ctype-uca.c:
        Adding simplified Hungarian collation.
      
      
      strings/ctype-uca.c:
        Adding simplified Hungarian collation.
      mysys/charset-def.c:
        Initialize new collation.
      mysql-test/t/ctype_uca.test:
        Adding test case.
      mysql-test/r/ctype_uca.result:
        Adding test case.
      c885fb04
  6. 22 Dec, 2005 2 commits
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 115a1d3f
      unknown authored
      into  frost.snake.net:/Users/paul/bk/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      115a1d3f
    • unknown's avatar
      mysqltest.c: · 6de9d67d
      unknown authored
        Put options in order.
        Add #ifdef around --debug for non-debug builds.
      
      
      client/mysqltest.c:
        Put options in order.
        Add #ifdef around --debug for non-debug builds.
      6de9d67d
  7. 21 Dec, 2005 5 commits
  8. 20 Dec, 2005 5 commits
    • unknown's avatar
      mysql.cc: · fd46c788
      unknown authored
        Typo in help message.
      
      
      client/mysql.cc:
        Typo in help message.
      fd46c788
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 17b32e1a
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
      
      
      17b32e1a
    • unknown's avatar
      errmsg.txt: · 3b94794f
      unknown authored
        Fix typo.
      
      
      sql/share/errmsg.txt:
        Fix typo.
      3b94794f
    • unknown's avatar
      BUG#5390 - problems with merge tables · 5113bdff
      unknown authored
      Problem #1: INSERT...SELECT, Version for 5.0.
      Extended the unique table check by a check of lock data.
      Merge sub-tables cannot be detected by doing name checks only.
      
      
      mysql-test/r/create.result:
        BUG#5390 - problems with merge tables
        Removed a duplicate test.
      mysql-test/r/merge.result:
        BUG#5390 - problems with merge tables
        Problem #1: INSERT...SELECT
        Added test results.
      mysql-test/t/create.test:
        BUG#5390 - problems with merge tables
        Removed a duplicate test.
      mysql-test/t/merge.test:
        BUG#5390 - problems with merge tables
        Problem #1: INSERT...SELECT
        Added tests.
      sql/lock.cc:
        BUG#5390 - problems with merge tables
        Problem #1: INSERT...SELECT, Version for 5.0.
        Added a new function to find a duplicate lock in a list of tables.
      sql/mysql_priv.h:
        BUG#5390 - problems with merge tables
        Problem #1: INSERT...SELECT, Version for 5.0.
        Added the thread handle to unique_table().
        Added a declaration for the new function.
      sql/sql_base.cc:
        BUG#5390 - problems with merge tables
        Problem #1: INSERT...SELECT, Version for 5.0.
        Added the thread handle to unique_table().
        Added a call to the new mysql_lock_have_duplicate(),
        which needs the thread handle, to unique_table().
      sql/sql_delete.cc:
        BUG#5390 - problems with merge tables
        Problem #1: INSERT...SELECT, Version for 5.0.
        Added the thread handle to unique_table().
      sql/sql_insert.cc:
        BUG#5390 - problems with merge tables
        Problem #1: INSERT...SELECT, Version for 5.0.
        Added the thread handle to unique_table().
      sql/sql_load.cc:
        BUG#5390 - problems with merge tables
        Problem #1: INSERT...SELECT, Version for 5.0.
        Added the thread handle to unique_table().
      sql/sql_parse.cc:
        BUG#5390 - problems with merge tables
        Problem #1: INSERT...SELECT, Version for 5.0.
        Added the thread handle to unique_table().
      sql/sql_update.cc:
        BUG#5390 - problems with merge tables
        Problem #1: INSERT...SELECT, Version for 5.0.
        Added the thread handle to unique_table().
        Replaced a call to find_table_in_local_list() by
        the newly extended unique_table().
      5113bdff
    • unknown's avatar
      build fix · e54c3c88
      unknown authored
      e54c3c88
  9. 19 Dec, 2005 6 commits
    • unknown's avatar
      Bug #15772 Aborted YaSSL connections force threads into busyloops · 28999410
      unknown authored
        - Report error when there is nothing to read after wait.
      
      
      extra/yassl/src/handshake.cpp:
        Report error if there is nothing to read after a blocking read
      28999410
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3823cfa9
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
      
      
      3823cfa9
    • unknown's avatar
      Fix for bug#14271 I_S: columns has no size for (var)binary columns · d920097a
      unknown authored
        set character_octet_length, character_maximum_length for
        binary and varbinary field types
      
      
      mysql-test/r/information_schema.result:
        Fix for bug#14271 I_S: columns has no size for (var)binary columns
          test case
      mysql-test/t/information_schema.test:
        Fix for bug#14271 I_S: columns has no size for (var)binary columns
          test case
      d920097a
    • unknown's avatar
      Fix for bug#14861 aliased column names are not preserved. · c7a440d1
      unknown authored
        Create tmp table filed using original item name when it's necessary
      
      
      mysql-test/r/view.result:
        Fix for bug#14861 aliased column names are not preserved.
          test case
      mysql-test/t/view.test:
        Fix for bug#14861 aliased column names are not preserved.
          test case
      c7a440d1
    • unknown's avatar
      Bug#12770 DESC cannot display the info. about temporary table · 479a02fa
      unknown authored
      Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
      Bug#15224 SHOW INDEX from temporary table doesn't work.
        Restore thd->temporary_tables to be able to process
        temporary tables(only for 'show index' & 'show columns').
        This should be changed when processing of temporary tables for
        I_S tables will be done.
      
      
      mysql-test/r/information_schema.result:
        Bug#12770 DESC cannot display the info. about temporary table
        Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
        Bug#15224 SHOW INDEX from temporary table doesn't work.
          test case
      mysql-test/t/information_schema.test:
        Bug#12770 DESC cannot display the info. about temporary table
        Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
        Bug#15224 SHOW INDEX from temporary table doesn't work.
          test case
      479a02fa
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · 5da2f843
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      5da2f843