1. 10 Apr, 2003 3 commits
    • unknown's avatar
      For to use the /libmysql/libmysql.def file instead · 8188c5d2
      unknown authored
      
      BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
        Delete: VC++Files/libmysql/libmysql.def
      8188c5d2
    • unknown's avatar
      Merge · 839be686
      unknown authored
      
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      include/mysqld_error.h:
        merge.
      sql/share/czech/errmsg.txt:
        SCCS merged
      sql/share/danish/errmsg.txt:
        merge.
      sql/share/dutch/errmsg.txt:
        merge .
      sql/share/english/errmsg.txt:
        merge.
      sql/share/estonian/errmsg.txt:
        merge.
      sql/share/french/errmsg.txt:
        merge.
      sql/share/german/errmsg.txt:
        merge.
      sql/share/greek/errmsg.txt:
        merge.
      sql/share/hungarian/errmsg.txt:
        e
        merge.
      sql/share/italian/errmsg.txt:
        merge.
      sql/share/japanese/errmsg.txt:
        merge.
      sql/share/korean/errmsg.txt:
        merge.
      sql/share/norwegian/errmsg.txt:
        merge.
      sql/share/norwegian-ny/errmsg.txt:
        merge.
      sql/share/polish/errmsg.txt:
        merge.
      sql/share/portuguese/errmsg.txt:
        merge.
      sql/share/romanian/errmsg.txt:
        SCCS merged
      sql/share/russian/errmsg.txt:
        merge.
      sql/share/serbian/errmsg.txt:
        merge.
      sql/share/slovak/errmsg.txt:
        merge.
      sql/share/spanish/errmsg.txt:
        merge.
      sql/share/swedish/errmsg.txt:
        merge.
      sql/share/ukrainian/errmsg.txt:
        merge.
      839be686
    • unknown's avatar
      added compress/uncompress function · f82e15ba
      unknown authored
      
      sql/mysql_priv.h:
        added have_compress variable
      sql/mysqld.cc:
        added have_compress variable
      sql/set_var.cc:
        added have_compress variable
      f82e15ba
  2. 09 Apr, 2003 1 commit
  3. 08 Apr, 2003 4 commits
  4. 07 Apr, 2003 4 commits
  5. 05 Apr, 2003 8 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · ba1abaa2
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
      
      
      sql/sql_yacc.yy:
        Auto merged
      ba1abaa2
    • unknown's avatar
      Some optimization in SET NAMES · 72d3b3a1
      unknown authored
      
      mysql-test/r/ctype_collate.result:
        SET NAMES charset COLLATE collation is new syntax
      mysql-test/r/variables.result:
        SET NAMES charset COLLATE collation is new syntax
      mysql-test/t/ctype_collate.test:
        SET NAMES charset COLLATE collation is new syntax
      mysql-test/t/variables.test:
        SET NAMES charset COLLATE collation is new syntax
      72d3b3a1
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · a24734ce
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
      
      
      sql/sql_yacc.yy:
        Auto merged
      a24734ce
    • unknown's avatar
      sql_yacc.yy: · 97415bd7
      unknown authored
        I wonder how it happend that I compiled this!
      
      
      sql/sql_yacc.yy:
        I wonder how it happend that I compiled this!
      97415bd7
    • unknown's avatar
      sql_yacc.yy, set_var.h, set_var.cc: · 9b4452f8
      unknown authored
        Optimization of SET NAMES
      
      
      sql/set_var.cc:
        Optimization of SET NAMES
      sql/set_var.h:
        Optimization of SET NAMES
      sql/sql_yacc.yy:
        Optimization of SET NAMES
      9b4452f8
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 58676d75
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
      
      
      mysql-test/r/subselect.result:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      58676d75
    • unknown's avatar
      fixed st_select_lex initialization · 1a0898c3
      unknown authored
      fixed mustiupdate subselect compatibility
      
      (bug 217)
      
      
      
      mysql-test/r/subselect.result:
        test of multi-update & subselect
      mysql-test/t/subselect.test:
        test of multi-update & subselect
      sql/sql_update.cc:
        added subselect compatibility to query cache
      sql/sql_yacc.yy:
        right st_select_lex initialization 
        layout fix
      1a0898c3
    • unknown's avatar
      sql_cache.cc: · 6fa8e897
      unknown authored
        Cast to unsigned char
      
      
      sql/sql_cache.cc:
        Cast to unsigned char
      6fa8e897
  6. 04 Apr, 2003 9 commits
    • unknown's avatar
      Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5582a83a
      unknown authored
      into mysql.com:/home/pem/work/mysql-4.1
      
      5582a83a
    • unknown's avatar
      Added missing error message (was only added in english/). · 33acac60
      unknown authored
      Removed extraneous error message from german/errmsg.txt.
      
      
      sql/share/czech/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/danish/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/dutch/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/estonian/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/french/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/german/errmsg.txt:
        Added missing error message (was only added in english/).
        Removed extraneous error message.
      sql/share/greek/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/hungarian/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/italian/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/japanese/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/korean/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/norwegian-ny/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/norwegian/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/polish/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/portuguese/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/romanian/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/russian/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/serbian/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/slovak/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/spanish/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/swedish/errmsg.txt:
        Added missing error message (was only added in english/).
      sql/share/ukrainian/errmsg.txt:
        Added missing error message (was only added in english/).
      33acac60
    • unknown's avatar
      Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 1e95930f
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      1e95930f
    • unknown's avatar
      Index.xml: · 59bf122b
      unknown authored
        Type
      
      
      sql/share/charsets/Index.xml:
        Type
      59bf122b
    • unknown's avatar
      Updating subselect results after SUBSELECT was changed into SUBQUERY. · f859761a
      unknown authored
      
      mysql-test/r/subselect.result:
        Updating results after SUBSELECT was changed into SUBQUERY.
      f859761a
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2dc116a5
      unknown authored
      into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
      
      
      sql/item_strfunc.cc:
        Auto merged
      2dc116a5
    • unknown's avatar
      Fixed envelope() function. · 5aeebd64
      unknown authored
      5aeebd64
    • unknown's avatar
    • unknown's avatar
      gis.txt deleted - updated text merged into manual (mysqldoc tree). · 90961f24
      unknown authored
      
      BitKeeper/deleted/.del-gis.txt~2dde6d55b3075921:
        Delete: Docs/gis.txt
      90961f24
  7. 03 Apr, 2003 11 commits
    • unknown's avatar
      And got rid of signess warnings... · d6b847ff
      unknown authored
      d6b847ff
    • unknown's avatar
      Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5e7641a9
      unknown authored
      into mysql.com:/home/pem/work/mysql-4.1
      
      5e7641a9
    • unknown's avatar
      4d465bc2
    • unknown's avatar
      Merge akishkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c033b474
      unknown authored
      into mysql.com:/home/walrus/bk/41
      
      c033b474
    • unknown's avatar
      field.cc: · 5d003684
      unknown authored
        Geometry is now large blob
      
      
      sql/field.cc:
        Geometry is now large blob
      5d003684
    • unknown's avatar
      Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT) · 67a854a7
      unknown authored
      
      sql/item_sum.cc:
        Fixed bug in warning handling.
      sql/item_sum.h:
        Fixed bug in warning handling.
      sql/sql_class.h:
        Fixed bug in warning handling.
      sql/sql_error.cc:
        Fixed bug in warning handling.
      strings/my_vsnprintf.c:
        After merge fix
      67a854a7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c41b7356
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/item_strfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      c41b7356
    • unknown's avatar
      Merge with 4.0 · 6c36f424
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
        Auto merged
      BitKeeper/deleted/.del-mysql.xdc:
        Delete: netware/mysql.xdc
      BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
        Auto merged
      BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
        Auto merged
      BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
        Auto merged
      client/mysql.cc:
        Auto merged
      include/my_pthread.h:
        Auto merged
      libmysqld/examples/Makefile.am:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/backup.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/my_init.c:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/thr_mutex.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql-bench/crash-me.sh:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      strings/my_vsnprintf.c:
        Auto merged
      sql/sql_parse.cc:
        Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
      mysql-test/r/rpl_loaddata.result:
        Auto merged
      6c36f424
    • unknown's avatar
      After merge fix · 3804913a
      unknown authored
      
      sql/log_event.cc:
        Fixed a wrong && test -> &
      3804913a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 39aaf940
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.0
      
      39aaf940
    • unknown's avatar
      add test file for rpl_loaddata.test · 1447a459
      unknown authored
      1447a459