1. 17 Oct, 2002 1 commit
    • unknown's avatar
      merge · 976e6db7
      unknown authored
      
      Docs/world.sql:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      976e6db7
  2. 16 Oct, 2002 13 commits
    • unknown's avatar
      Fix after merge · 98e82f55
      unknown authored
      98e82f55
    • unknown's avatar
      fix of the small bug in UNION's · d482a3af
      unknown authored
      
      mysql-test/r/heap_btree.result:
        I donno why this changed, aint my fault
      sql/sql_union.cc:
        fix of the small bug
      d482a3af
    • unknown's avatar
      Some small accelerations ... · 14cc2fc1
      unknown authored
      I intend to do some more accelerations in mysql_execute_command and
      in SQLCOM_SELECT part for which I need to fix EXPLAIN with derived
      tables plus few additional items. If this proves to be much I wil
      just make it a new SCRUM task
      
      
      sql/sql_lex.h:
        Some small accelerations ...
      sql/sql_parse.cc:
        Some small accelerations ...
      sql/sql_yacc.yy:
        Some small accelerations ...
      14cc2fc1
    • unknown's avatar
      Merge hundin.mysql.fi:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.1 · d7c95933
      unknown authored
      
      mysql-test/r/null_key.result:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      d7c95933
    • unknown's avatar
      merge with 4.0.5 · 34e528b4
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      Docs/manual.texi:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      mysql-test/r/null_key.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      sql/field.h:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      34e528b4
    • unknown's avatar
      Fixes after last merge. · baa1ddb0
      unknown authored
      Ignore changed keyblocks when on does DELETE FROM table_name;
      
      
      acinclude.m4:
        Don't give warnings when using openssl installed in /usr/include with gcc 3.x
      myisam/mi_delete_all.c:
        Ignore changed keyblocks when on does DELETE FROM table_name;
      mysql-test/r/null_key.result:
        Fix null test
      sql/ha_innodb.cc:
        Fix bug in last merge
      sql/sql_parse.cc:
        Fix bug introduced with merge
      baa1ddb0
    • unknown's avatar
      Added THD as parameter to filesort. Removed not used 'special' argument. · fc04af4f
      unknown authored
      
      sql/mysql_priv.h:
        Fix for changed parameters to filesort
      sql/sql_delete.cc:
        Fix for changed parameters to filesort
      sql/sql_select.cc:
        Fix for changed parameters to filesort
      sql/sql_table.cc:
        Fix for changed parameters to filesort
      sql/sql_test.cc:
        Removed not used special parameter
      sql/sql_update.cc:
        Fix for changed parameters to filesort
      fc04af4f
    • unknown's avatar
      Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 · e8ba6a76
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.1
      
      
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      e8ba6a76
    • unknown's avatar
      some fixes for SELECT INTO @vars .. · ed8b2529
      unknown authored
      
      sql/sql_parse.cc:
        Simplification of code
      ed8b2529
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · ae43238f
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/mysqld.cc:
        Auto merged
      ae43238f
    • unknown's avatar
      Merge with 3.23.54 · 419fe1cb
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
        Auto merged
      BitKeeper/deleted/.del-MySQLEULA.txt:
        Delete: Docs/MySQLEULA.txt
      BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
        Auto merged
      Build-tools/mysql-copyright-2:
        Auto merged
      Build-tools/mysql-copyright:
        Auto merged
      heap/heapdef.h:
        Auto merged
      heap/hp_open.c:
        Auto merged
      innobase/btr/btr0cur.c:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      innobase/os/os0thread.c:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/t/null_key.test:
        Auto merged
      mysys/safemalloc.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      scripts/mysqlhotcopy.sh:
        Auto merged
      sql/field.h:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      tests/grant.res:
        Auto merged
      Build-tools/Do-compile:
        merge
      Docs/manual.texi:
        merge
      configure.in:
        merge
      mysql-test/r/distinct.result:
        merge
      mysql-test/r/null_key.result:
        merge
      sql/ha_innodb.cc:
        merge
      sql/item.h:
        merge
      sql/log.cc:
        merge
      sql/mysqld.cc:
        merge
      support-files/mysql.spec.sh:
        merge
      419fe1cb
    • unknown's avatar
      5ef8ccba
    • unknown's avatar
      Fixed bug in LEFT JOIN ... WHERE not_null_key_column=NULL; · 39a84b79
      unknown authored
      
      Docs/manual.texi:
        ChangeLog
      sql/field.h:
        New virtual function to set a field to null or signal an error
      sql/field_conv.cc:
        New function to set a field to null or signal an error
      sql/item.cc:
        When setting a field to null internally (for WHERE testing) don't autoconvert NULL -> now() or last_insert_id()
      sql/item.h:
        New virtual function to set a field to null or signal an error
      39a84b79
  3. 15 Oct, 2002 18 commits
  4. 14 Oct, 2002 8 commits