1. 26 May, 2003 1 commit
    • unknown's avatar
      New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set · a8184622
      unknown authored
       
      
      
      Docs/internals.texi:
        Updated protocol information
      include/mysql.h:
        Added catalog to MYSQL_FIELD
        Added sqlstate handling to protocol
      include/mysql_com.h:
        New 4.1 protocol
      libmysql/libmysql.c:
        Added sqlstate handling
        Added CLIENT_MULTI_RESULTS
      sql/field.cc:
        Indentation cleanup
      sql/field.h:
        Indentation cleanup
      sql/mysql_priv.h:
        Changed arguments to close_connection()
      sql/mysqld.cc:
        Changed arguments to close_connection()
        Added checking of extra arguments to mysqld
      sql/protocol.cc:
        Fixed bug in TIME handling
        Added SQLSTATE on errors
        Removed net_send_error()
      sql/protocol.h:
        Removed net_send_error()
      sql/repl_failsafe.cc:
        Fixed arguments to close_connection()
      sql/sql_parse.cc:
        New 4.1 protocol
      a8184622
  2. 22 May, 2003 2 commits
    • unknown's avatar
      mysqlimport.c, mysqldump.c, mysqlcheck.c: · c3a373e6
      unknown authored
        Bug fix: latin1 is not compiled charset and is not specified..
      mysql.cc:
        Bug fix: latin1 is not compiled charset and is not specified...
      
      
      client/mysql.cc:
        Bug fix: latin1 is not compiled charset and is not specified...
      client/mysqlcheck.c:
        Bug fix: latin1 is not compiled charset and is not specified..
      client/mysqldump.c:
        Bug fix: latin1 is not compiled charset and is not specified..
      client/mysqlimport.c:
        Bug fix: latin1 is not compiled charset and is not specified..
      c3a373e6
    • unknown's avatar
      Updated results & after merge fix · 12c77750
      unknown authored
      
      BitKeeper/etc/ignore:
        added include/readline/*.h
      mysql-test/r/create.result:
        Update results
      mysql-test/r/loaddata.result:
        Updated results
      sql/mysqld.cc:
        Fix after merge
      12c77750
  3. 21 May, 2003 17 commits
    • unknown's avatar
      merge · c23102ab
      unknown authored
      
      VC++Files/libmysql/libmysql.dsp:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      include/my_sys.h:
        Auto merged
      libmysql/libmysql.def:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/r/key.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/null_key.result:
        Auto merged
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/ctype_latin1_de-master.opt:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      mysys/charset.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/share/dutch/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/german/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      c23102ab
    • unknown's avatar
      After merge fixes · 7dd91a0e
      unknown authored
      Added initialization of all important global variables
      
      
      BUILD/SETUP.sh:
        build with readline
      client/mysqltest.c:
        Added variable SERVER_VERSION
      myisam/mi_key.c:
        Indentation change
      myisam/mi_open.c:
        After merge fix
      myisam/mi_range.c:
        After merge fix
      myisam/mi_rkey.c:
        After merge fix
      myisam/mi_search.c:
        After merge fix
      myisam/myisamdef.h:
        After merge fix
      mysql-test/include/not_embedded.inc:
        Fix test (because of wrong utf8 test)
      mysql-test/r/alter_table.result:
        Updated results after merge
      mysql-test/r/create.result:
        Updated results after merge
      mysql-test/r/ctype_recoding.result:
        Updated results after merge
      mysql-test/r/fulltext.result:
        Updated results after merge
      mysql-test/r/func_group.result:
        Updated results after merge
      mysql-test/r/group_by.result:
        Updated results after merge
      mysql-test/r/innodb.result:
        Updated results after merge
      mysql-test/r/join_outer.result:
        Updated results after merge
      mysql-test/r/null_key.result:
        Updated results after merge
      mysql-test/r/order_by.result:
        Updated results after merge
      mysql-test/r/query_cache.result:
        Updated results after merge
      mysql-test/r/repair.result:
        Updated results after merge
      mysql-test/r/rpl_flush_tables.result:
        Updated results after merge
      mysql-test/r/union.result:
        Updated results after merge
      mysql-test/r/update.result:
        Updated results after merge
      mysql-test/t/ansi.test:
        After merge fixes
      mysql-test/t/create.test:
        After merge fixes
      mysql-test/t/ctype_recoding.test:
        After merge fixes
      mysql-test/t/ctype_ujis.test:
        After merge fixes
      mysql-test/t/fulltext.test:
        After merge fixes
      mysql-test/t/innodb.test:
        After merge fixes
      mysql-test/t/join_outer.test:
        After merge fixes
      mysql-test/t/loaddata.test:
        After merge fixes
      mysql-test/t/order_by.test:
        After merge fixes
      mysql-test/t/rpl_flush_tables.test:
        After merge fixes
      mysql-test/t/status.test:
        After merge fixes
      mysql-test/t/subselect.test:
        After merge fixes
      sql/convert.cc:
        Code cleanup
      sql/field.cc:
        After merge fixes
      sql/filesort.cc:
        Remove compiler warning
      sql/item.cc:
        More efficient set_name() (no mallocs)
      sql/item_cmpfunc.cc:
        Code Code cleanup
        Item_bool_func2::fix_fields() added to get error handling right for cmp_charset
      sql/item_cmpfunc.h:
        New prototypes
      sql/item_func.cc:
        After merge fix
      sql/item_strfunc.cc:
        Faster check for BINARY
      sql/log_event.cc:
        Comment cleanup
      sql/mysql_priv.h:
        New prototypes and variables
      sql/mysqld.cc:
        Added initialization of all important global variables.
        Cleanup of variable declarations
        This is needed ot make the embedded version restartable
      sql/opt_sum.cc:
        After merge fix
      sql/set_var.cc:
        Code cleanup
      sql/sql_acl.cc:
        After merge fix
        Better error message
      sql/sql_db.cc:
        After merge fix
      sql/sql_derived.cc:
        After merge fix
      sql/sql_insert.cc:
        Indentation cleanups
      sql/sql_list.h:
        Added empty() to base_ilist
      sql/sql_parse.cc:
        After merge fix
      sql/sql_select.cc:
        After merge fix
        Fixed derived name handling in EXPLAIN
      sql/sql_show.cc:
        After merge fix
      sql/sql_string.cc:
        Made copy_and_convert global
      sql/sql_string.h:
        Made copy_and_convert global
      sql/sql_update.cc:
        After merge fix
      sql/sql_yacc.yy:
        After merge fix
      sql/thr_malloc.cc:
        Added sql_strmake_with_convert()
      sql/unireg.h:
        Added MAX_ALIAS_NAME
      strings/ctype-ujis.c:
        Fixed bug in converting to ujis
      7dd91a0e
    • unknown's avatar
      Some SHOW VARIABLES have been renamed: · 1bc4c113
      unknown authored
      collation_client  -> character_set_client
      collation_results -> character_set_results
      character_set     -> character_set_server
      
      SET NAMES now doesn't start client->server conversion
      SET CHARACTER SET now starts both client->server and server->client conversion
      
      1bc4c113
    • unknown's avatar
      UCS2 and UTF8 are in separate files now · 39873485
      unknown authored
      39873485
    • unknown's avatar
      Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 5d48bfdc
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      
      sql/set_var.cc:
        Auto merged
      5d48bfdc
    • unknown's avatar
      "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead. · 0e2f1990
      unknown authored
       "character_set_system" has been added to display the system character set
      
      0e2f1990
    • unknown's avatar
      Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 418113d4
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      418113d4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 21c1c0a2
      unknown authored
      into myvenu.com:/home/venu/work/sql/dev-4.1
      
      21c1c0a2
    • unknown's avatar
      Fix merge conflict by changing warning codes to new one · 2513f33b
      unknown authored
      
      mysql-test/t/warnings.test:
        Fix merge conflict by changing warning code
      mysql-test/r/create.result:
        Fix merge conflict
      mysql-test/r/warnings.result:
        Fix merge conflict
      sql/share/english/errmsg.txt:
        Fix the merge conflict
      2513f33b
    • unknown's avatar
      client_test.c: · b579ec19
      unknown authored
        Updated protocol test
      
      
      tests/client_test.c:
        Updated protocol test
      b579ec19
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 74e0fdc5
      unknown authored
      into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.latest
      
      74e0fdc5
    • unknown's avatar
      Two separate startup arguments for mysqld: · ec4a7fdd
      unknown authored
      --default-character-set and --default-collation 
      
      ec4a7fdd
    • unknown's avatar
      Added AsBinary alias for AsWKB function. · b026af91
      unknown authored
      
      sql/lex.h:
        Added AsBinary alias for AsWKB funtion.
      b026af91
    • unknown's avatar
      Resolve merge conflict · 0cb24b5e
      unknown authored
      0cb24b5e
    • unknown's avatar
      Resolve merge colflict · 91c481e3
      unknown authored
      
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/isam.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      scripts/make_win_src_distribution.sh:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      include/mysqld_error.h:
        Resolve merge colflict by changing the warning codes
      91c481e3
    • unknown's avatar
      Fix for Windows build by adding pack.c to appropriate .dsp files · bea0806e
      unknown authored
      
      libmysql/libmysql.c:
        Fix for Windows builds
      VC++Files/client/mysqlclient.dsp:
        Added pack.c
      VC++Files/libmysql/libmysql.dsp:
        Added pack.c
      bea0806e
    • unknown's avatar
      Added mysql_fetch_column function · cac3a402
      unknown authored
      Added MYSQL_TYPE_NULL as a dummy bind case for fetch buffers
      Fix for offset based re-fetch using mysql_fetch_column
      Misc cleanups for ODBC compatibility
      
      
      include/mysql.h:
        Fix for offset based re-fetch using mysql_fetch_column
      libmysql/libmysql.c:
        Added mysql_fetch_column function
        Added MYSQL_TYPE_NULL as a dummy bind case for fetch buffers
      libmysql/libmysql.def:
        Updated new APIs
      cac3a402
  4. 20 May, 2003 4 commits
  5. 19 May, 2003 7 commits
    • unknown's avatar
      Merge with 4.0.13 · 5532ff9c
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      BUILD/SETUP.sh:
        Auto merged
      BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
        Auto merged
      Makefile.am:
        Auto merged
      acinclude.m4:
        Auto merged
      BitKeeper/triggers/post-commit:
        Auto merged
      Build-tools/Do-compile:
        Auto merged
      VC++Files/libmysql/libmysql.dsp:
        Auto merged
      VC++Files/mysql.dsw:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      include/my_base.h:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/violite.h:
        Auto merged
      innobase/buf/buf0flu.c:
        Auto merged
      innobase/buf/buf0lru.c:
        Auto merged
      innobase/include/buf0buf.h:
        Auto merged
      innobase/include/buf0lru.h:
        Auto merged
      innobase/include/row0mysql.h:
        Auto merged
      innobase/include/srv0srv.h:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/log/log0log.c:
        Auto merged
      innobase/log/log0recv.c:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      innobase/row/row0mysql.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      innobase/srv/srv0start.c:
        Auto merged
      innobase/trx/trx0sys.c:
        Auto merged
      innobase/trx/trx0trx.c:
        Auto merged
      innobase/ut/ut0ut.c:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/mi_key.c:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      myisam/mi_range.c:
        Auto merged
      myisam/mi_search.c:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/r/delete.result:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/r/innodb_handler.result:
        Auto merged
      mysql-test/r/join.result:
        Auto merged
      mysql-test/r/join_outer.result:
        Auto merged
      mysql-test/r/key.result:
        Auto merged
      mysql-test/r/multi_update.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/ctype_latin1_de.test:
        Auto merged
      mysql-test/t/delete.test:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      mysql-test/t/innodb_handler.test:
        Auto merged
      mysql-test/t/join.test:
        Auto merged
      mysql-test/t/join_outer.test:
        Auto merged
      mysql-test/t/key.test:
        Auto merged
      mysql-test/t/multi_update.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/repair.test:
        Auto merged
      mysql-test/t/select_safe.test:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      scripts/mysql_fix_privilege_tables.sh:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/ha_heap.h:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/init.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mini_client.cc:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/records.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.h:
        Auto merged
      sql/sql_analyse.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/share/dutch/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      sql/unireg.h:
        Auto merged
      sql-bench/crash-me.sh:
        Auto merged
      sql-bench/test-transactions.sh:
        Auto merged
      strings/ctype-tis620.c:
        Auto merged
      tests/grant.res:
        Auto merged
      sql/log_event.cc:
        Merge with 4.0.13
        Cleaned up comment syntax
      5532ff9c
    • unknown's avatar
      new error message · deab2e1a
      unknown authored
      deab2e1a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · f85a24fc
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.0
      
      
      sql/mysql_priv.h:
        Auto merged
      f85a24fc
    • unknown's avatar
      Added option --read-only (Thanks to Markus Benning) · 91ab6a15
      unknown authored
      
      myisam/myisamchk.c:
        Removed warning from fulltext when repairing many tables with fulltext index
      sql/init.cc:
        Remove not used variables
      sql/mysql_priv.h:
        Remove not used variables
      sql/mysqld.cc:
        Removed not used variables
        Added option --read-only
        Change opt_do_pstack and master_ssl to get them to work with my_getopt
      sql/set_var.cc:
        Option --read-only
      sql/sql_parse.cc:
        Option --read-only
      91ab6a15
    • unknown's avatar
      Fix for when compiling with HAVE_ISAM enabled · 5f640d67
      unknown authored
      5f640d67
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 60022623
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      sql/mysqld.cc:
        Auto merged
      60022623
    • unknown's avatar
      Add empty() function for baselist. · 157a18a1
      unknown authored
      
      sql/mysqld.cc:
        Simple cleanup
      157a18a1
  6. 18 May, 2003 1 commit
    • unknown's avatar
      srv0start.c: · 0539904b
      unknown authored
        Better instructions for the user if adding of new ibdata files fails
      
      
      innobase/srv/srv0start.c:
        Better instructions for the user if adding of new ibdata files fails
      0539904b
  7. 17 May, 2003 1 commit
    • unknown's avatar
      buf0buf.c: · 74045190
      unknown authored
        When calculating the buf pool dirty pages ratio, add also free pages to the LRU list length: no need to active flushing if there are lots of free pages in the buffer pool
      
      
      innobase/buf/buf0buf.c:
        When calculating the buf pool dirty pages ratio, add also free pages to the LRU list length: no need to active flushing if there are lots of free pages in the buffer pool
      74045190
  8. 16 May, 2003 4 commits
    • unknown's avatar
      LOCAL is an alias of NO_WRITE_TO_BINLOG · c19a2dde
      unknown authored
      c19a2dde
    • unknown's avatar
      buf0lru.c, buf0flu.c, buf0buf.c, buf0lru.h: · 11808c8e
      unknown authored
        Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
      trx0trx.c:
        Add forgotten return value (it was not used anywhere, fortunately)
      ha_innodb.h, mysql_priv.h:
        Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
      
      
      sql/mysql_priv.h:
        Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
      sql/ha_innodb.h:
        Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
      innobase/trx/trx0trx.c:
        Add forgotten return value (it was not used anywhere, fortunately)
      innobase/include/buf0lru.h:
        Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
      innobase/buf/buf0buf.c:
        Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
      innobase/buf/buf0flu.c:
        Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
      innobase/buf/buf0lru.c:
        Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
      11808c8e
    • unknown's avatar
      fa6c97df
    • unknown's avatar
      my_global.h: · a7e093a4
      unknown authored
        - QNX 6.2.1 actually defines HAVE_RINT
        - fixed rint(A) #define as it was causing compile errors on QNX
      
      
      include/my_global.h:
        - QNX 6.2.1 actually defines HAVE_RINT
        - fixed rint(A) #define as it was causing compile errors on QNX
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      a7e093a4
  9. 15 May, 2003 3 commits
    • unknown's avatar
      changes to mysqladmin : use queries instead of commands (so that they have a chance to go · b68abce1
      unknown authored
      into the binlog), SLAVE START -> START SLAVE, error test changes.
      
      
      client/mysqladmin.c:
        Now that FLUSH TABLES and some other FLUSH go into the binlog, the same commands
        issued from mysqladmin should also go into the binlog. How could I explain to
        a user that "mysql -e 'flush tables'" is not exactly the same as "mysqladmin
        flush-tables" ?? So I replace mysql_refresh() by mysql_query().
        Also SLAVE START -> START SLAVE to make this work with 4.1 (it won't work with
        3.23 anymore).
        Also the code tested for mysql_refresh() < 0 for errors, but this cannot happen :
        - mysql_refresh() calls simple_command()
        - in 4.1 the return type of simple_command() is my_bool, and I have checked the 4.1 libmysql
        code and it returns 0 or 1, not negative values.
        - note that in 4.0 libmysql, simple_command() returns int which can be < 0, but we don't
        care here as we link the 4.1 mysqladmin with the 4.1 libmysql.
        Btw, some other parts of the code already checked
        for mysql_refresh() != 0, not < 0. So now it's homogenous : we always test for != 0
        instead of < 0.
      b68abce1
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8081b62b
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      8081b62b
    • unknown's avatar
      Scrum task 845. Thi is a behaviour change : · e8336c8a
      unknown authored
      now by default, FLUSH, OPTIMIZE, ANALYZE, REPAIR commands are written to the
      binlog, unless the new NO_WRITE_TO_BINLOG keyword was used :
      OPTIMIZE NO_WRITE_TO_BINLOG table t;
      
      Previously these commands were never written to the binlog, but there are
      2 reasons to change this :
      - the RENAME TABLE in MERGE table bug (#175) on slave
      - the possible "differently optimised queries may lead to different
      updates on the master and slave" bug, until we have automatic ORDER BY.
      
      FLUSH LOGS/SLAVE/MASTER/TABLES WITH READ LOCK are never written to the binlog.
      New test for the new logging behaviour.
      Other small change : reload_acl_and_cache() and reset_slave() don't send their errors themselves,
      this is more usual.
      
      
      mysql-test/mysql-test-run.sh:
        rpl_flush_tables.test generates 'table xx is open on rename'.
        This is normal and done on purpose, so don't report it.
      sql/lex.h:
        New keyword NO_WRITE_TO_BINLOG
      sql/mysql_priv.h:
        reload_acl_and_cache() now decides if we want to write the FLUSH command
        to the binlog or not (FLUSH MASTER, FLUSH SLAVE, FLUSH TABLES
        WITH READ LOCK, FLUSH LOGS cannot go into the binlog).
      sql/mysqld.cc:
        updated for new prototype of reload_acl_and_cache().
      sql/sql_lex.h:
        New boolean no_write_to_binlog in the lex structure.
      sql/sql_parse.cc:
        reload_acl_and_cache() now does not send its errors itself;
        it saves the error and the caller sends it.
        FLUSH, OPTIMIZE, ANALYZE, REPAIR commands don't write to the binlog
        if the NO_WRITE_TO_BINLOG keyword was used.
      sql/sql_repl.cc:
        reset_slave() does not send its errors himself.
      sql/sql_yacc.yy:
        New optional keyword NO_WRITE_TO_BINLOG for OPTIMIZE/ANALYZE/REPAIR/FLUSH :
        OPTIMIZE NO_WRITE_TO_BINLOG TABLE t;
        ANALYZE NO_WRITE_TO_BINLOG TABLE t;
        REPAIR NO_WRITE_TO_BINLOG TABLE t;
        FLUSH NO_WRITE_TO_BINLOG TABLE t;
      e8336c8a