1. 23 Mar, 2004 1 commit
  2. 19 Mar, 2004 7 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · b436a551
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      b436a551
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · 137935db
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      137935db
    • unknown's avatar
      Portability fixes · a63bd6dd
      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
      a63bd6dd
    • unknown's avatar
      typo in mysql_install_db fixed · c5f2beea
      unknown authored
      
      scripts/mysql_install_db.sh:
        typo fixed
        (thanks Alex Dupre <ale@FreeBSD.org> for noticing this!)
      c5f2beea
    • unknown's avatar
      Removed \r · 02dbb9ad
      unknown authored
      02dbb9ad
    • unknown's avatar
      Portability fixes · 5f00bc3c
      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
      5f00bc3c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · bb0e83f9
      unknown authored
      into mysql.com:/home/my/mysql-4.0
      
      bb0e83f9
  3. 17 Mar, 2004 6 commits
    • unknown's avatar
      WL #1510 "Implement support for "commercial" binaries on handshake", · 1b8f0058
      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'
      1b8f0058
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 · e4e4166e
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
      
      e4e4166e
    • unknown's avatar
      fixed structure error from last merge for bug #2874 · 68d3db4b
      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
      68d3db4b
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 49121afc
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      49121afc
    • unknown's avatar
      Fix for BUG#2922 "Crash (signal11) after "load data from master"" · 0103d946
      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.
      0103d946
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 10c4e9ad
      unknown authored
      into mysql.com:/home/my/mysql-4.0
      
      10c4e9ad
  4. 16 Mar, 2004 14 commits
  5. 13 Mar, 2004 4 commits
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.0 · 4f27d6eb
      unknown authored
      into hundin.mysql.fi:/home/marko/l/mysql-4.0
      
      4f27d6eb
    • unknown's avatar
      InnoDB: Replace ut_a(0) with ut_error · 80a5f391
      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
      80a5f391
    • unknown's avatar
      after merge fixes. · 2bc08cbe
      unknown authored
      2bc08cbe
    • unknown's avatar
      multi_update.result: · fe544498
      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
      fe544498
  6. 12 Mar, 2004 8 commits