Skip to content

M
MariaDB
Switch branch/tag
  1. 04 Jun, 2004 1 commit
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6fa41b0a
      unknown authored 
      into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/lex.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
      6fa41b0a
  3. 03 Jun, 2004 20 commits
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 8aabe7f8
      unknown authored 
      into mysql.com:/home/mysql_src/mysql-4.1


sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
      8aabe7f8
    • unknown's avatar
      Implementation of WL#1824 "Add replication of character set variables in 4.1", · e784947a
      unknown authored 
      by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill. 
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput  if query uses
 variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
 properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.


mysql-test/r/rpl_server_id1.result:
  it's normal to not run as I have added a test to compare server ids of master and slave
  at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
  result update (as we now print charset of user var).
mysql-test/r/user_var.result:
  result update
mysql-test/t/rpl_server_id1.test:
  no need to select as slave is not running
mysql-test/t/user_var.test:
  testing if the content of user vars is escaped when mysqlbinlog prints them,
  and if the name is backquoted.
sql/lex.h:
  new keyword ONE_SHOT
sql/log.cc:
  when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
  for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
  print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
  escape the content of the var. Backquote its name.
  Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
  understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
  Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
  as it will make the master or slave make wrong assumptions.
  A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
  no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
  Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
  when I/O slave thread starts, verify that master's and slave charsets match.
  And by the way verify that server ids are different.
  Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
  not fatal.
sql/sql_class.cc:
  one_shot
sql/sql_class.h:
  one_shot
sql/sql_lex.h:
  one_shot
sql/sql_parse.cc:
  when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
  otherwise refuse.
sql/sql_yacc.yy:
  ONE_SHOT keyword in SET
      e784947a
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · e2dd7f23
      unknown authored 
      into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
      e2dd7f23
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49986732
      unknown authored 
      into mc05.(none):/space2/tomas/mm
      49986732
    • unknown's avatar
      fil0fil.c: · c9ecde4c
      unknown authored 
        Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()


innobase/fil/fil0fil.c:
  Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()
      c9ecde4c
    • unknown's avatar
      os0file.c, fil0fil.c: · ac913659
      unknown authored 
        Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup


innobase/fil/fil0fil.c:
  Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
innobase/os/os0file.c:
  Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
      ac913659
    • unknown's avatar
      fixes for ndb and make distdir · 810555ad
      unknown authored
      810555ad
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3a875403
      unknown authored 
      into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
      3a875403
    • unknown's avatar
      Unicode collations: WL#916 · c5f8d174
      unknown authored 
      XML and "collation customization" language parsers.
      c5f8d174
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 06f230b2
      unknown authored 
      into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
      06f230b2
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · cf02d830
      unknown authored 
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      cf02d830
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c4de7e48
      unknown authored 
      into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


configure.in:
  Auto merged
      c4de7e48
    • unknown's avatar
      Makefile.am: · 673c0676
      unknown authored 
        local flag in ndbapi to set -O2 since problems occur with -O3
pc.hpp, Emulator.hpp, Emulator.cpp, ErrorReporter.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ErrorReporter.hpp:
  removed NDEBUG and removed THREAD_ASSERT
Dbdict.cpp:
  NDB_DEBUG -> VM_TRACE
configure.in:
  cleaned up ndb CXX flags and added optional flag possibility


configure.in:
  cleaned up ndb CXX flags and added optional flag possibility
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  NDB_DEBUG -> VM_TRACE
ndb/src/kernel/error/ErrorReporter.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/error/ErrorReporter.hpp:
  removed NDEBUG and removed THREAD_ASSERT
ndb/src/kernel/vm/Emulator.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/Emulator.hpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/pc.hpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/ndbapi/Makefile.am:
  local flag in ndbapi to set -O2 since problems occur with -O3
      673c0676
    • unknown's avatar
      More warnings in atrt · e1a4dfce
      unknown authored 
      
ndb/test/run-test/main.cpp:
  More warnings
      e1a4dfce
    • unknown's avatar
      Setup connect string · 149431ab
      unknown authored
      149431ab
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 17c0cfcc
      unknown authored 
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      17c0cfcc
    • unknown's avatar
      Fix for 840, invalid tuple size. · 18cc1ddc
      unknown authored 
      Still don't know reason, but this works
      18cc1ddc
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 8c4513fa
      unknown authored 
      into mc01.ndb.mysql.com:/space/mysql-4.1-ndb
      8c4513fa
    • unknown's avatar
      extern"C" bug · 02876737
      unknown authored 
      
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
      02876737
    • unknown's avatar
      Fix for 3910 · 6651e07a
      unknown authored
      6651e07a
  5. 02 Jun, 2004 17 commits
    • unknown's avatar
      portability fix · 7d10bea2
      unknown authored
      7d10bea2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 394ad320
      unknown authored 
      into mysql.com:/home/my/mysql-4.1
      394ad320
    • unknown's avatar
      Added authentication code that was missed in merge · d6db18e8
      unknown authored 
      Added new windows configuration


VC++Files/client/mysqlclient.dsp:
  Added new configuration
VC++Files/zlib/zlib.dsp:
  Added new configuration
libmysql/libmysql.c:
  Moved check function from libmysql.c to client.c
sql-common/client.c:
  Moved check function from libmysql.c to client.c
      d6db18e8
    • unknown's avatar
      fil0fil.c: · 01e772b5
      unknown authored 
        Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'


innobase/fil/fil0fil.c:
  Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'
      01e772b5
    • unknown's avatar
      Merging · c4fc72e9
      unknown authored 
      
myisam/rt_index.c:
  Auto merged
myisam/rt_index.h:
  Auto merged
myisam/rt_mbr.c:
  Auto merged
myisam/rt_mbr.h:
  Auto merged
myisam/rt_split.c:
  Auto merged
myisam/rt_test.c:
  Auto merged
sql/spatial.cc:
  Auto merged
      c4fc72e9
    • unknown's avatar
      wl 1562 (To improve RTree indexes) · 7cafb309
      unknown authored 
      some changes to make code nicer


include/myisampack.h:
  mi_sint1korr and similar things added to do conversion in an
  uniform way
myisam/rt_index.c:
  'if' simplified
myisam/rt_mbr.c:
  some fixes to make code nicer and smaller
myisam/rt_test.c:
  some modifications to extend test
mysql-test/r/gis-rtree.result:
  result became slightly different because of changes made
      7cafb309
    • unknown's avatar
      Update atrt to use new names of binaries · 10428132
      unknown authored 
      
ndb/test/run-test/main.cpp:
  1) Updated names of binaries
  2) Use NDB_CONNECTSTRING
      10428132
    • unknown's avatar
      fixed naming error · cb13803d
      unknown authored
      cb13803d
    • unknown's avatar
      collapsed ndb start/stop scripts in mysql-test-run + ndb bin name changes · 9a0a301d
      unknown authored 
      
BitKeeper/deleted/.del-stop_ndbcluster.sh~b3b9e9505384aca1:
  Delete: mysql-test/ndb/stop_ndbcluster.sh
mysql-test/mysql-test-run.sh:
  collapsed ndb start/stop scripts
mysql-test/ndb/Makefile.am:
  collapsed ndb start/stop scripts
mysql-test/ndb/ndbcluster.sh:
  collapsed ndb start/stop scripts + ndb bin name changes
ndb/src/kernel/Makefile.am:
  ndb bin name changes
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  ndb bin name changes
ndb/src/mgmclient/Makefile.am:
  ndb bin name changes
ndb/src/mgmsrv/Makefile.am:
  ndb bin name changes
ndb/tools/Makefile.am:
  ndb bin name changes
      9a0a301d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5084d189
      unknown authored 
      into mysql.com:/home/my/mysql-4.1


sql/sql_acl.cc:
  Auto merged
      5084d189
    • unknown's avatar
      after merge fixes · 1f14cc70
      unknown authored 
      
innobase/os/os0file.c:
  after merge fix
sql/ha_innodb.cc:
  after merge fix
sql/sql_select.cc:
  after merge fix (The patch for 4.0 didn't make sence in 4.1)
      1f14cc70
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 5d5408b6
      unknown authored 
      into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
      5d5408b6
    • unknown's avatar
      BUG#3662 · 115d7aee
      unknown authored 
      Fixed bug introduced with upgrade code
      115d7aee
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d1d61d9a
      unknown authored 
      into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
      d1d61d9a
    • unknown's avatar
      fil0fil.c: · 4de5ecdc
      unknown authored 
        Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.


innobase/fil/fil0fil.c:
  Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.
      4de5ecdc
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 93c5bc86
      unknown authored 
      into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb


configure.in:
  Auto merged
      93c5bc86
    • unknown's avatar
      several ndb make changes, see respective file · 90dabc71
      unknown authored 
      
ndb/src/kernel/Main.cpp:
  Rename: ndb/src/kernel/ndb-main/Main.cpp -> ndb/src/kernel/Main.cpp
ndb/src/kernel/SimBlockList.cpp:
  Rename: ndb/src/kernel/ndb-main/SimBlockList.cpp -> ndb/src/kernel/SimBlockList.cpp
BitKeeper/deleted/.del-Makefile.am~dbb6038d7163a54d:
  Delete: ndb/src/kernel/ndb-main/Makefile.am
BitKeeper/deleted/.del-Makefile_old~1f37e763ba5d06d0:
  Delete: ndb/src/kernel/ndb-main/Makefile_old
ndb/old_files/BinDist.sh:
  Rename: ndb/BinDist.sh -> ndb/old_files/BinDist.sh
ndb/old_files/Defs.mk:
  Rename: ndb/Defs.mk -> ndb/old_files/Defs.mk
ndb/old_files/Makefile:
  Rename: ndb/Makefile_old -> ndb/old_files/Makefile
ndb/old_files/SrcDist.sh:
  Rename: ndb/SrcDist.sh -> ndb/old_files/SrcDist.sh
ndb/old_files/configure:
  Rename: ndb/configure_old -> ndb/old_files/configure
ndb/old_files/Epilogue.mk:
  Rename: ndb/Epilogue.mk_old -> ndb/old_files/Epilogue.mk
ndb/config/old_files/Defs.DEBUG.mk:
  Rename: ndb/config/Defs.DEBUG.mk -> ndb/config/old_files/Defs.DEBUG.mk
ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk:
  Rename: ndb/config/Defs.HPUX.HPPA.GCC.mk -> ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk
ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk:
  Rename: ndb/config/Defs.IBMAIX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk
ndb/config/old_files/Defs.LINUX.x86.GCC.mk:
  Rename: ndb/config/Defs.LINUX.x86.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86.GCC.mk
ndb/config/old_files/Defs.LINUX.x86.ICC.mk:
  Rename: ndb/config/Defs.LINUX.x86.ICC.mk -> ndb/config/old_files/Defs.LINUX.x86.ICC.mk
ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk:
  Rename: ndb/config/Defs.LINUX.x86_64.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk
ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk:
  Rename: ndb/config/Defs.MACOSX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk
ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk:
  Rename: ndb/config/Defs.OSE.PPC750.DIAB.mk -> ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk
ndb/config/old_files/Defs.RELEASE.mk:
  Rename: ndb/config/Defs.RELEASE.mk -> ndb/config/old_files/Defs.RELEASE.mk
ndb/config/old_files/Defs.RELEASE_TRACE.mk:
  Rename: ndb/config/Defs.RELEASE_TRACE.mk -> ndb/config/old_files/Defs.RELEASE_TRACE.mk
ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk:
  Rename: ndb/config/Defs.SIMCELLO.SOFTOSE.GCC.mk -> ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk
ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOFTOSE.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk
ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC.FORTE6.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk
ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk
ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC_64.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk
ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS6.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk
ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk:
  Rename: ndb/config/Defs.TRU64X.ALPHA.GCC.mk -> ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk
ndb/config/old_files/Defs.WIN32.x86.VC7.mk:
  Rename: ndb/config/Defs.WIN32.x86.VC7.mk -> ndb/config/old_files/Defs.WIN32.x86.VC7.mk
ndb/config/old_files/acinclude.m4:
  Rename: ndb/config/acinclude.m4 -> ndb/config/old_files/acinclude.m4
ndb/config/old_files/Makefile.am:
  Rename: ndb/config/Makefile.am_old -> ndb/config/old_files/Makefile.am
ndb/config/old_files/GuessConfig.sh:
  Rename: ndb/config/GuessConfig.sh_old -> ndb/config/old_files/GuessConfig.sh
ndb/config/old_files/configure.in:
  Rename: ndb/config/configure.in -> ndb/config/old_files/configure.in
ndb/config/old_files/config.h.in:
  Rename: ndb/config/config.h.in -> ndb/config/old_files/config.h.in
ndb/old_files/README:
  Rename: ndb/README -> ndb/old_files/README
ndb/old_files/mysqlclusterenv.sh:
  Rename: ndb/mysqlclusterenv.sh -> ndb/old_files/mysqlclusterenv.sh
ndb/old_files/env.sh:
  Rename: ndb/env.sh -> ndb/old_files/env.sh
BitKeeper/deleted/.del-Makefile~650473b0dabb331b:
  Delete: ndb/src/scripts/Makefile
ndb/src/old_files/ndbbaseclient/Makefile:
  mvdir
ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp:
  mvdir
ndb/src/old_files/ndbclient/Makefile:
  mvdir
ndb/src/old_files/ndbclient/ndbclient_dummy.cpp:
  mvdir
ndb/src/old_files/Makefile:
  Rename: ndb/src/Makefile_old -> ndb/src/old_files/Makefile
acinclude.m4:
  added ndb configure options
configure.in:
  moved lots of stuff for ndb over to Makefile.ams and added some config opt for ndb
mysql-test/ndb/install_ndbcluster.sh:
  adopt to new ndb install
mysql-test/ndb/stop_ndbcluster.sh:
  adopt to new ndb install
ndb/Makefile.am:
  moved some things to include/Makefile.am
ndb/config/common.mk.am:
  moved some things from configure.in
ndb/config/type_kernel.mk.am:
  moved some things from configure.in
ndb/config/type_mgmapiclient.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapi.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapiclient.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapitest.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapitools.mk.am:
  moved some things from configure.in
ndb/config/type_util.mk.am:
  moved some things from configure.in
ndb/src/Makefile.am:
  .
ndb/src/common/portlib/Makefile.am:
  fix for make distdir
ndb/src/cw/cpcd/Makefile.am:
  added configurable ldflags
ndb/src/kernel/Makefile.am:
  moved up ndb-main one level
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  added configurable ldflags
ndb/src/kernel/blocks/suma/Makefile.am:
  fixed error
ndb/src/kernel/error/Makefile.am:
  fix error
ndb/src/kernel/vm/Makefile.am:
  fix error
ndb/src/mgmapi/Makefile.am:
  removed libMGM_API
ndb/src/mgmclient/Makefile.am:
  added configurable ldflags
ndb/src/mgmsrv/Makefile.am:
  added configurable ldflags
ndb/src/ndbapi/Makefile.am:
  removed libNDB_API
ndb/test/Makefile.am:
  added optional build of ndbapi tests
ndb/tools/Makefile.am:
  added configurable ldflags
ndb/include/Makefile.am:
  fixed missing .h files in make distdir
scripts/make_binary_distribution.sh:
  updated for ndb and new make
      90dabc71
  7. 01 Jun, 2004 2 commits
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7