1. 30 Apr, 2005 1 commit
    • unknown's avatar
      Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598) · de3d34b7
      unknown authored
      
      mysql-test/r/bigint.result:
        Test to show show that the parser threats big longlong values as unsigned
      mysql-test/r/user_var.result:
        Test of CAST(NULL as SIGNED/UNSIGNED)
      mysql-test/t/bigint.test:
        Test to show show that the parser threats big longlong values as unsigned
      mysql-test/t/user_var.test:
        Test of CAST(NULL as SIGNED/UNSIGNED)
      sql/item_func.cc:
        Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598)
        Setting a variable to NULL doesn't change the old result type.
      sql/item_func.h:
        Detect setting a variable to NULL
      sql/unireg.cc:
        Safety fix
      de3d34b7
  2. 27 Apr, 2005 15 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 022d94c5
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      myisam/mi_key.c:
        Auto merged
      sql/handler.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      022d94c5
    • unknown's avatar
      mysqladmin extended-status now displays global status · 13d69f08
      unknown authored
      Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
      
      
      client/mysqladmin.cc:
        Show GLOBAL status
      myisam/mi_key.c:
        Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
        (Ramil will soon push test cases)
      sql/handler.cc:
        Indentation fix
      tests/mysql_client_test.c:
        Portability fixes
      13d69f08
    • unknown's avatar
      after-merge fix · 00205076
      unknown authored
      
      mysql-test/r/func_math.result:
        after merge fix:
        the test should be added after we have new hf's pm code pushed.
      mysql-test/t/func_math.test:
        after merge fix:
        the test should be added after we have new hf's pm code pushed.
      00205076
    • unknown's avatar
      merging · 4c5552c3
      unknown authored
      
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      sql/item_func.cc:
        ul used, as hf said he has a patch for this code.
      4c5552c3
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2ae36fd5
      unknown authored
      into mysql.com:/usr/home/ram/work/4.1.b9803
      
      2ae36fd5
    • unknown's avatar
      handler.cc: · 82c2a2e9
      unknown authored
        Fix compilation error if HAVE_REPLICATION is not defined
      
      
      sql/handler.cc:
        Fix compilation error if HAVE_REPLICATION is not defined
      82c2a2e9
    • unknown's avatar
      Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0 · a9c5cd8a
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      a9c5cd8a
    • unknown's avatar
      Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0-build · 01262c54
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      01262c54
    • unknown's avatar
      fix for compile error (Windows) · 8d1bb622
      unknown authored
      8d1bb622
    • unknown's avatar
      ha_innodb.cc: · 02e1982a
      unknown authored
        Correct an assertion
      
      
      sql/ha_innodb.cc:
        Correct an assertion
      02e1982a
    • unknown's avatar
      ha_innodb.cc, mysqld.cc: · 45fe7666
      unknown authored
        Fix compilation error if HAVE_REPLICATION is not defined
      
      
      sql/mysqld.cc:
        Fix compilation error if HAVE_REPLICATION is not defined
      sql/ha_innodb.cc:
        Fix compilation error if HAVE_REPLICATION is not defined
      45fe7666
    • unknown's avatar
      ha_innodb.cc: · 6052e164
      unknown authored
        Fix linking and compilation errors
      
      
      sql/ha_innodb.cc:
        Fix linking and compilation errors
      6052e164
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 18bbc26d
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      18bbc26d
    • unknown's avatar
      sql_repl.cc: · b8413048
      unknown authored
        Remove printf's from semi-sync code in sql_repl.cc
      
      
      sql/sql_repl.cc:
        Remove printf's from semi-sync code in sql_repl.cc
      b8413048
    • unknown's avatar
      Merge hundin.mysql.fi:/home/heikki/mysql-4.1 · 748b731b
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/fil/fil0fil.c:
        Auto merged
      innobase/include/dict0dict.h:
        Auto merged
      748b731b
  3. 26 Apr, 2005 24 commits