1. 22 Mar, 2004 2 commits
  2. 20 Mar, 2004 3 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 331ff0d8
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      
      331ff0d8
    • unknown's avatar
      The automatic DROP TEMPORARY TABLE is now DROP TEMPORARY TABLE IF EXISTS, · 02d2d70c
      unknown authored
      this is better in this case:
      - imagine user1 has created a temp table
      - imagine user2 does FLUSH TABLES WITH READ LOCK, then takes a backup,
      then RESET MASTER then UNLOCK TABLES, like mysqldump --first-slave
      - then in the binlog you will finally have the DROP TEMPORARY TABLE,
      but not the CREATE TEMPORARY TABLE, so when you later restore with
      mysqlbinlog|mysql, mysql will complain that table does not exist.
      Replication was already protected of this (it processes DROP TEMPORARY
      TABLE as if there was a IF EXISTS), now I add it directly to the query
      for mysqlbinlog|mysql to work.
      
      
      mysql-test/r/drop_temp_table.result:
        result update (query changed)
      02d2d70c
    • unknown's avatar
      btr0btr.c: · 3e5f1eae
      unknown authored
        Correct previous bk commit comment about page splits: actually, in versions < 4.0.19 space utilization is very poor if 1500 - 8000 byte rows are inserted in the order of the primary key
      
      
      innobase/btr/btr0btr.c:
        Correct previous bk commit comment about page splits: actually, in versions < 4.0.19 space utilization is very poor if 1500 - 8000 byte rows are inserted in the order of the primary key
      3e5f1eae
  3. 19 Mar, 2004 11 commits
    • unknown's avatar
      btr0btr.c: · 72d15bcc
      unknown authored
        Improve space utilization if we have 3 kB - 8 kB rows to insert in the order of the primary key
      btr0cur.c:
        Fix bug: The row count and key cardinality estimate was grossly too small if each clustered index page only contained one record
      
      
      innobase/btr/btr0cur.c:
        Fix bug: The row count and key cardinality estimate was grossly too small if each clustered index page only contained one record
      innobase/btr/btr0btr.c:
        Improve space utilization if we have 3 kB - 8 kB rows to insert in the order of the primary key
      72d15bcc
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0 · eb72cf66
      unknown authored
      into mysql.com:/space/my/mysql-4.0
      
      
      eb72cf66
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.0 · a53fc49e
      unknown authored
      into mysql.com:/space/my/mysql-4.0-build
      
      
      a53fc49e
    • unknown's avatar
      - Do-pkg: PGK and DMG names now include the full arch name (e.g. · 84418a9e
      unknown authored
         "-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
         Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
         how we name all other packages)
      
      
      Build-tools/Do-pkg:
         - PGK and DMG names now include the full arch name (e.g. 
           "-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
           Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
           how we name all other packages)
      84418a9e
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · fd15d5ae
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      fd15d5ae
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · c56697f0
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      c56697f0
    • unknown's avatar
      Portability fixes · 86ae07cd
      unknown authored
      Fixed some wrong column specifications in mysql_fix_privilege_tables
      
      
      mysql-test/mysql-test-run.sh:
        Portability fix
      mysql-test/r/func_math.result:
        portability fix
      mysql-test/r/rpl_error_ignored_table.result:
        portability fix
      mysql-test/t/func_math.test:
        portability fix
      mysql-test/t/rpl_error_ignored_table.test:
        portability fix
      scripts/mysql_fix_privilege_tables.sh:
        func.name was not generated correctly
      scripts/mysql_fix_privilege_tables.sql:
        Fixed some wrong column specifications
      86ae07cd
    • unknown's avatar
      typo in mysql_install_db fixed · 88267ae5
      unknown authored
      
      scripts/mysql_install_db.sh:
        typo fixed
        (thanks Alex Dupre <ale@FreeBSD.org> for noticing this!)
      88267ae5
    • unknown's avatar
      Removed \r · 6b465557
      unknown authored
      6b465557
    • unknown's avatar
      Portability fixes · 9935110b
      unknown authored
      Removed \r from new tests
      Fixes to get new sustem_mysql_db... tests to work
      
      
      client/mysqltest.c:
        More debug information
      innobase/que/que0que.c:
        Fixed wrong usage of __attribute
      mysql-test/mysql-test-run.sh:
        Portability fix; Added CLIENT_BINDIR
      mysql-test/t/system_mysql_db_fix.test:
        Removed \r
      mysql-test/t/system_mysql_db_refs.test:
        Removed \r
      scripts/mysql_fix_privilege_tables.sh:
        Don't set root password from first option
        Added --bindir option
      9935110b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 00ff1f60
      unknown authored
      into mysql.com:/home/my/mysql-4.0
      
      
      00ff1f60
  4. 17 Mar, 2004 6 commits
    • unknown's avatar
      WL #1510 "Implement support for "commercial" binaries on handshake", · c6a05996
      unknown authored
      client library:
      - implemented 'check_license' function
      
      
      include/errmsg.h:
        WL #1510: new error code
      include/mysql_version.h.in:
        WL #1510: fallback define for LICENSE
      libmysql/errmsg.c:
        WL #1510: error message to print in case when client and server license 
        mismatch.
      libmysql/libmysql.c:
        WL#1510: implementation of 'check_license' function
      sql/set_var.cc:
        removed unused variable 'license'
      c6a05996
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 · d7307566
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
      
      
      d7307566
    • unknown's avatar
      fixed structure error from last merge for bug #2874 · 6fd2a7bc
      unknown authored
      
      BitKeeper/deleted/.del-system_mysql_db.test~f5a7ec0e9440c043:
        Delete: mysql-test/t/reserv/system_mysql_db.test
      BitKeeper/deleted/.del-system_mysql_db_fix.test~180b2fd4873a9c49:
        Delete: mysql-test/t/reserv/system_mysql_db_fix.test
      BitKeeper/deleted/.del-system_mysql_db_fix-master.opt~2897a9ebb17f930e:
        Delete: mysql-test/t/reserv/system_mysql_db_fix-master.opt
      BitKeeper/deleted/.del-system_mysql_db_refs.test~e5bffdb55190a23c:
        Delete: mysql-test/t/reserv/system_mysql_db_refs.test
      6fd2a7bc
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 8b623739
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      
      8b623739
    • unknown's avatar
      Fix for BUG#2922 "Crash (signal11) after "load data from master"" · 9d78adc1
      unknown authored
      with a testcase.
      We needed to init_master_info before we flush_master_info
      in LOAD DATA FROM MASTER.
      
      
      mysql-test/r/rpl000009.result:
        result update
      mysql-test/t/rpl000009.test:
        adding a test for RESET SLAVE + LOAD DATA FROM MASTER
      sql/repl_failsafe.cc:
        LOAD DATA FROM MASTER udpates the master info in the slave,
        so needs to ensure that it is properly inited first
        (otherwise, after RESET SLAVE, we are flush_io_cache()ing
        an uninitialized IO_CACHE master.info).
        Note that it master info is already inited (active_mi->inited==1),
        init_master_info() will do nothing, which is what we want.
      9d78adc1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · b5469837
      unknown authored
      into mysql.com:/home/my/mysql-4.0
      
      
      b5469837
  5. 16 Mar, 2004 14 commits
  6. 13 Mar, 2004 4 commits
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.0 · e9eb0239
      unknown authored
      into hundin.mysql.fi:/home/marko/l/mysql-4.0
      
      
      e9eb0239
    • unknown's avatar
      InnoDB: Replace ut_a(0) with ut_error · 1f7f2662
      unknown authored
      
      innobase/btr/btr0btr.c:
        Replace ut_a(0) with ut_error
      innobase/buf/buf0flu.c:
        Replace ut_a(0) with ut_error
      innobase/buf/buf0lru.c:
        Replace ut_a(0) with ut_error
      innobase/data/data0data.c:
        Replace ut_a(0) with ut_error
      innobase/dict/dict0crea.c:
        Replace ut_a(0) with ut_error
      innobase/dict/dict0dict.c:
        Replace ut_a(0) with ut_error
      innobase/dict/dict0load.c:
        Replace ut_a(0) with ut_error
      innobase/fil/fil0fil.c:
        Replace ut_a(0) with ut_error
      innobase/fsp/fsp0fsp.c:
        Replace ut_a(0) with ut_error
      innobase/ibuf/ibuf0ibuf.c:
        Replace ut_a(0) with ut_error
      innobase/include/buf0buf.ic:
        Replace ut_a(0) with ut_error
      innobase/include/data0type.ic:
        Replace ut_a(0) with ut_error
      innobase/include/mtr0log.ic:
        Replace ut_a(0) with ut_error
      innobase/include/trx0rseg.ic:
        Replace ut_a(0) with ut_error
      innobase/lock/lock0lock.c:
        Replace ut_a(0) with ut_error
      innobase/log/log0log.c:
        Replace ut_a(0) with ut_error
      innobase/log/log0recv.c:
        Replace ut_a(0) with ut_error
      innobase/mem/mem0pool.c:
        Replace ut_a(0) with ut_error
      innobase/mtr/mtr0log.c:
        Replace ut_a(0) with ut_error
      innobase/os/os0file.c:
        Replace ut_a(0) with ut_error
      innobase/page/page0cur.c:
        Replace ut_a(0) with ut_error
      innobase/page/page0page.c:
        Replace ut_a(0) with ut_error
      innobase/pars/lexyy.c:
        Replace ut_a(0) with ut_error
      innobase/que/que0que.c:
        Replace ut_a(0) with ut_error
      innobase/rem/rem0cmp.c:
        Replace ut_a(0) with ut_error
      innobase/rem/rem0rec.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0ins.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0mysql.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0purge.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0row.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0sel.c:
        Replace ut_a(0) with ut_error
      innobase/row/row0undo.c:
        Replace ut_a(0) with ut_error
      innobase/srv/srv0srv.c:
        Replace ut_a(0) with ut_error
      innobase/sync/sync0arr.c:
        Replace ut_a(0) with ut_error
      innobase/trx/trx0purge.c:
        Replace ut_a(0) with ut_error
      innobase/trx/trx0trx.c:
        Replace ut_a(0) with ut_error
      innobase/trx/trx0undo.c:
        Replace ut_a(0) with ut_error
      1f7f2662
    • unknown's avatar
      after merge fixes. · 8dd15d31
      unknown authored
      8dd15d31
    • unknown's avatar
      multi_update.result: · 05b10203
      unknown authored
        Fix for a bug in the result
      multi_update.test:
        Fix for a bug in the test
      
      
      mysql-test/t/multi_update.test:
        Fix for a bug in the test
      mysql-test/r/multi_update.result:
        Fix for a bug in the result
      05b10203