1. 06 May, 2005 1 commit
    • unknown's avatar
      Fixes while reviewing new code · ab54e167
      unknown authored
      Added option --count to mysqlshow (to show number of rows)
      Fixed possible core dump in information schema
      
      
      client/client_priv.h:
        --count for mysqlshow
      client/mysqlshow.c:
        Added option --count to be used when the user want's number of rows per table in the output
        (We shouldn't use count(*) as default as this can be a slow operation)
      mysys/my_thr_init.c:
        Correct comment
      sql/ha_berkeley.cc:
        Remove not used variable
      sql/ha_berkeley.h:
        Remove not used variable
      sql/ha_innodb.cc:
        Remove not used function
      sql/ha_ndbcluster.cc:
        false -> FALSE
        true -> TRUE
      sql/handler.cc:
        Added and fixed comments
        Remove 'strange' code to remove compiler warnings (better to do things like this with attribute)
      sql/item.cc:
        false -> FALSE
      sql/item_cmpfunc.cc:
        Fixed indentation
      sql/item_cmpfunc.h:
        marked BETWEEN as a bool function
      sql/item_func.cc:
        Simple optimzation
      sql/key.cc:
        Removed wrong code
      sql/log.cc:
        Check result from open_index_file()
      sql/mysql_priv.h:
        Simplyfy some test of netware
      sql/mysqld.cc:
        Fixed indentation
        Check result form open_index_file()
        Simplify code with IF_NETWARE()
      sql/opt_range.cc:
        false -> FALSE
        true -> TRUE
        Fixed indentation
      sql/opt_sum.cc:
        Fixed comments
      sql/sp_head.cc:
        Simple optimzation
        Move variable declarations to begining of blocks
      sql/sql_acl.cc:
        Fix long lines
        Rename xx -> column
        Move declaration to beginning of block
      sql/sql_parse.cc:
        Removed comment
      sql/sql_select.cc:
        Indentation fixes
      sql/sql_show.cc:
        Fixed reference outside of array (possible core dump)
      sql/sql_table.cc:
        Simplify code
        Combine common code
      sql/sql_test.cc:
        false -> FALSE
      sql/sql_trigger.cc:
        false -> false
        true -> TRUE
      sql/sql_yacc.yy:
        Simpler test
      sql/unireg.cc:
        Added comment
      ab54e167
  2. 01 May, 2005 2 commits
  3. 30 Apr, 2005 7 commits
    • unknown's avatar
      After merge fixes · d1d474c8
      unknown authored
      
      Makefile.am:
        Added target test-force
      mysql-test/r/cast.result:
        Updated results after merge
      d1d474c8
    • unknown's avatar
      Merge with 4.1 · a6acc446
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      include/config-win.h:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/r/drop.result:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/mf_keycache.c:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
        Auto merged
      mysql-test/r/cast.result:
        Merge
      mysql-test/t/cast.test:
        Merge
      sql/sql_insert.cc:
        Merge
      sql/sql_select.cc:
        Merge
      a6acc446
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e64d221e
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      tests/mysql_client_test.c:
        Auto merged
      e64d221e
    • unknown's avatar
      A fix and a test case for Bug#9520 "SELECT DISTINCT crashes server · 963e94ce
      unknown authored
      with cursor". The patch refactors do_select/sub_select
      functions, which implement the nested loop algorithm, and reuses them to
      fetch rows for cursors as well.
      Pushing with view.test failing (--ps-protocol).
      
      
      sql/sql_prepare.cc:
         Cursor::fetch() now returns void
      sql/sql_select.cc:
        A fix for Bug#9520 "SELECT DISTINCT crashes server with cursor":
        * rename sub_select returns codes to be able to track down what's going
          on in which case.
        * move record processing and outer join record processing to a separate
          function, out of sub_select read-record loop.
        * use generalized sub_select() nested loop function for
        cursors instead of own loop implementation used in Cursor::fetch() before
      sql/sql_select.h:
        Replace all return values of sub_select family with enum.
        Add JOIN::resume_nested_loop flag to indicate we are restarting the nested loop
        for execution of next chunk of cursor's rows.
      tests/mysql_client_test.c:
        A test case for Bug#9520 "SELECT DISTINCT crashes server with cursor"
      963e94ce
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 66bea0de
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      66bea0de
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3b604387
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      3b604387
    • unknown's avatar
      Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598) · ac82a2d5
      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
      ac82a2d5
  4. 29 Apr, 2005 19 commits
  5. 28 Apr, 2005 11 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · cfd04210
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug9821
      
      
      sql/sql_parse.cc:
        Auto merged
      cfd04210
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1-4100 · 45031a44
      unknown authored
      into mysql.com:/home/mydev/mysql-5.0-5000
      
      
      include/my_sys.h:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      45031a44
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5192a1a3
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
      
      
      5192a1a3
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1-bug5964 · 275c8e77
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      
      275c8e77
    • unknown's avatar
      BUG#5964 - 4.1 MERGE tables regression from 4.0 · f0e256ef
      unknown authored
      Changed the creation of the .MRG file so that only the table  name
      is written when the MyISAM table is in the same database as the
      MERGE table, a relative path is used in other cases in mysqld,
      and possibly an absolute path is used in an embedded server.
      No test case is added as the external behaviour is unchanged.
      Only the file names within the .MRG file are changed.
      
      
      include/my_sys.h:
        BUG#5964 - 4.1 MERGE tables regression from 4.0
        Added declaration for a new function.
      myisammrg/myrg_open.c:
        BUG#5964 - 4.1 MERGE tables regression from 4.0
        Changed check for absolute path to check for any path.
      mysys/my_getwd.c:
        BUG#5964 - 4.1 MERGE tables regression from 4.0
        Added a new functions which checks for absolute _or_
        relative paths.
      sql/ha_myisammrg.cc:
        BUG#5964 - 4.1 MERGE tables regression from 4.0
        Changed the creation of the .MRG file so that only the table  name
        is written when the MyISAM table is in the same database as the
        MERGE table, a relative path is used in other cases in mysqld,
        and possibly an absolute path is used in an embedded server.
      f0e256ef
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · e26a93e9
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-bug9298
      
      
      e26a93e9
    • unknown's avatar
      Fix tiny typo in configure.in · 745d52bb
      unknown authored
      
      configure.in:
        Fix typo
      745d52bb
    • unknown's avatar
      Bug#8321 - myisampack bug in compression algorithm · 21d16ca7
      unknown authored
      Merge from 4.0.
      
      
      21d16ca7
    • unknown's avatar
      Bug#8321 - myisampack bug in compression algorithm · 994674c0
      unknown authored
      This is the second of three changesets. It contains the pure bug fix.
      It also contains the second after-review fixes.
      The problem was that with gcc on x86, shifts are done modulo word size. 
      'value' is 32 bits wide and shifting it by 32 bits is a no-op.
      This was triggered by an evil distribution of character incidences. 
      A distribution of 2917027827 characters made of 202 distinct values led to
      34 occurrences of 32-bit Huffman codes.
      This might have been the first time ever that write_bits() had to write
      32-bit values. Since it can be expected that one day even 32 bits might
      be insufficient, the third changeset suggests to enlarge some variables
      to 64 bits.
      
      
      994674c0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2a69f004
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      2a69f004
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · f25f9b58
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      configure.in:
        Auto merged
      f25f9b58