1. 13 Feb, 2004 2 commits
  2. 12 Feb, 2004 8 commits
  3. 11 Feb, 2004 11 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2a1666bb
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-bg2248
      
      
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      2a1666bb
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8ec0eaa2
      unknown authored
      into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      8ec0eaa2
    • unknown's avatar
      Bug 2701: Function CHARSET() inconsistency · 32d955c5
      unknown authored
      CONVERT3 was removed, it was for test purposes,
      and rather harmful.
      
      32d955c5
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 41d3a703
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.2208
      
      
      sql/sql_parse.cc:
        Auto merged
      41d3a703
    • unknown's avatar
      Addition to the fix for #2208 · f1256438
      unknown authored
      Made code shorter and more correct
      
      
      libmysql/client_settings.h:
        cli_next_result removed
      libmysql/libmysql.c:
        cli_next_result removed
      f1256438
    • unknown's avatar
      Manual merge. · 95f97099
      unknown authored
      95f97099
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 9e7dcf4d
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      9e7dcf4d
    • unknown's avatar
      Fix for BUG#2703 · bb8f97b8
      unknown authored
      "MySQL server does not detect if garbage chars at the end of query":
      
      Detect garbage chars at the end of the query or at the end of a query
      for a prepared statement (which happens if mysql_real_query() or mysql_prepare()
      were called with a too big 'length' parameter (bigger than the real intended
      length of the query: then we receive a query + garbage characters from the
      client). This resulted in garbage chars written into the binlog.
      Now instead the client receives something like:
      'You have an error in your SQL syntax.  Check the manual that corresponds
      to your MySQL server version for the right syntax to use near '!stmt'
      at line 1' i.e. the server is pointing at the weird tail of the query
      (this '!stmt' are the garbage chars sent by the client).
      All tests pass, except mysqldump.test and ctype_utf8.test but they failed
      before the patch.
      
      
      sql/sql_parse.cc:
        Detect garbage chars at the end of the query
        (which happens if mysql_real_query() was called with a too big 'length'
        parameter (bigger than the real intended length of the query: then
        we receive a query + garbage characters from the client).
      sql/sql_prepare.cc:
        Detect garbage chars at the end of the query
        (which happens if mysql_prepare() was called with a too big 'length'
        parameter (bigger than the real intended length of the query: then
        we receive a query + garbage characters from the client).
      tests/client_test.c:
        The change to sql_parse.cc and sql_prepare.cc rightfully gives many
        syntax errors to tests/client_test.c which is full of
        mysql_prepare(mysql, "SHOW TABLES", 100).
        Correcting all these commands.
      bb8f97b8
    • unknown's avatar
      mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc: · 199763ce
      unknown authored
        No needs to load charset index if the character set is build-in.
      
      
      client/mysql.cc:
        No needs to load charset index if the character set is build-in.
      client/mysqlcheck.c:
        No needs to load charset index if the character set is build-in.
      client/mysqldump.c:
        No needs to load charset index if the character set is build-in.
      client/mysqlimport.c:
        No needs to load charset index if the character set is build-in.
      199763ce
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b8863717
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-bg2248
      
      b8863717
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6c9f3b97
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.2208
      
      6c9f3b97
  4. 10 Feb, 2004 19 commits
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · dc70e166
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      dc70e166
    • unknown's avatar
      Fix for prepared statements: · c37cead2
      unknown authored
      added setting of 'neg' in Item_param::set_time() (looks like the only forgotten
      member).
      It's the second place I find where 'neg' was forgotten.
      The symptom was unexpected negative times in the binary log when running
      tests/client_test.c (test_date() in fact):
      # at 43009
      #040210 15:46:42 server id 1  log_pos 43009     Query   thread_id=1     exec_time=0     error_code=0
      SET TIMESTAMP=1076424402;
      INSERT INTO test_date VALUES('2000-01-10 11:16:20','-11:16:20' etc
      
      
      sql/item.cc:
        Don't forget to copy 'neg'.
      c37cead2
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 76ad07be
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2592/mysql-4.1
      
      76ad07be
    • unknown's avatar
      code cleanup of processing MY_LEX_USER_VARIABLE_DELIMITER · eae7bd6e
      unknown authored
      in sql/sql_lex.cc
      
      
      sql/sql_lex.cc:
        code cleanup of processing MY_LEX_USER_VARIABLE_DELIMITER
      eae7bd6e
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · a87cd356
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      a87cd356
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f57f0042
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-bg2248
      
      f57f0042
    • unknown's avatar
      Another implementation of send_eof() cleanup · 48aabe92
      unknown authored
      48aabe92
    • unknown's avatar
      configure.in: · 2653c35a
      unknown authored
        FreeBSD "ps" detection usually failed, in 90% cases,
        on FreeBSD-5.1. This change should work fine under
        5.x and 4.x, and I believe in 3.x. too. 
      
      
      configure.in:
        FreeBSD "ps" detection usually failed, in 90% cases. Thi
      2653c35a
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · de5e1450
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.2208
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      de5e1450
    • unknown's avatar
      Bug #2368 Multibyte charsets do not check that incoming data is well-formed · 487c5d05
      unknown authored
      It was together with the previous but. This test tends to prove it.
      
      487c5d05
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 34113c8c
      unknown authored
      into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      34113c8c
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8be4bacc
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2592/mysql-4.1
      
      
      sql/sql_lex.cc:
        Auto merged
      8be4bacc
    • unknown's avatar
      correcting mysql-test/r/mysqldump.result after merge · eb7c22e6
      unknown authored
      
      mysql-test/r/mysqldump.result:
        correcting result after merge
      eb7c22e6
    • unknown's avatar
      Merge · a75114b3
      unknown authored
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        e
      a75114b3
    • unknown's avatar
      added skiped newline to the end of file mysql-test/t/mysqldump.test · 42c192b9
      unknown authored
      
      mysql-test/t/mysqldump.test:
        added skiped newline to the end of file
      42c192b9
    • unknown's avatar
      Follow-up of a discussion on dev-docs@ : · 8e2f29ed
      unknown authored
      Don't show PSEUDO_THREAD_ID in SHOW VARIABLES because:
      - we don't want people to discover this variable as it could never do good to
      set it (it was designed for use by mysqlbinlog only, so that a thread can have
      several temp tables of the same name at the same time)
      - if we show it in SHOW VARIABLES, Mysql Administrator will display it and
      this will force us to put a description, so all MySQL Administrator user
      will be aware of this variable, some may have the idea to set it with a SET
      command, and then it will cause bad things.
      The variable is still settable, and still visible with SELECT @@.
      
      
      sql/set_var.cc:
        Don't show PSEUDO_THREAD_ID in SHOW VARIABLES because:
        - we don't want people to discover this variable as it could never do good to
        set it (it was designed for use by mysqlbinlog only, so that a thread can have
        several temp tables of the same name at the same time)
        - if we show it in SHOW VARIABLES, Mysql Administrator will display it and
        this will force us to put a description, so all MySQL Administrator user
        will be aware of this variable, some may have the idea to set it with a SET
        command, and then it will cause bad things.
        The variable is still settable, and still visible with SELECT @@.
      8e2f29ed
    • unknown's avatar
      Fixed bug #2248 "mysql_fetch without prior mysql_execute hangs" · c26ffd67
      unknown authored
      Done clean-up in prep stmt API functions:
      1) Removed some checks that were performed only in debug version
      were making debug version more tolerable to user errors than 
      production (and thus caused problems for example masking some
      bugs). 
      2) Also removed some other checks to make prep stmt API 
      consistent with the rest of C API (this also in line with 
      general politics - make checks in only those places where 
      errors are very common and hard to spot).
      
      
      include/mysql.h:
        Removed CHECK_EXTRA_ARGUMENTS define since it is no longer used 
        anywhere.
      libmysql/libmysql.c:
        Added check that will cause mysql_fetch() to bark then it is 
        used without calling mysql_execute() before.
        Removed checks that were performed only in debug version and
        caused problems since they were making debug version more 
        tolerable to user errors than production. Also removed some
        other checks to make prep stmt API consistent in this regard 
        with the rest of C API (this also in line with general politics -
        make checks in only those places where errors are very common 
        and hard to spot).
      tests/client_test.c:
        Updated tests to reflect removal of some checks in prep stmt API.
        Removed lines that caused bug #2473 to pop up, should be added 
        as separate test with the fix for this bug.
        Added test for bug#2248 "mysql_fetch without prior mysql_execute 
        hangs"
      c26ffd67
    • unknown's avatar
      Wrong type of an argument was sent to my_printf_error(), which · 7d9a821b
      unknown authored
      caused UDF functions to segmenation fault when they tried to
      print an error during wrong usage.
      
      7d9a821b
    • unknown's avatar
      An include was missing. · bf0e695f
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      bf0e695f