Commit graph

13930 commits

Author SHA1 Message Date
unknown
e7157aba3a (manual port from 4.0 - was needed)
Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().


mysql-test/r/rpl_heap.result:
  result update
mysql-test/t/rpl_heap.test:
  changing test to test a bug (but anyway, mysql-test-run --manager looks like not working in 4.1 currently,
  so this test is never run).
sql/log.cc:
  new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/mysql_priv.h:
  removing argument no_log from mysql_create_table(); no_log was not perfect as some
  binlogging could still be done by open_unireg_entry() for a HEAP table.
sql/sql_class.h:
  new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/sql_parse.cc:
  removing no_log arg from mysql_create_table()
sql/sql_table.cc:
  removing no_log from mysql_create_table(); instead using new class Disable_binlog.
  Disabling binlogging in some cases, where the binlogging is done later by some other code
  (case of CREATE SELECT and ALTER).
2004-08-19 23:24:35 +02:00
unknown
0ed563e801 Fixed symbol name problems that made build fail.
include/mysql.h:
  Fixed symbol name change.
include/mysql_com.h:
  Reverted parts of previous changeset (name changes) to make it build.
libmysql/libmysql.c:
  Fixed symbol name change.
sql/sql_parse.cc:
  Fixed symbol name change.
2004-08-19 20:48:00 +02:00
unknown
e3c56fd4d7 mysql_com.h:
still better names for enum; removing unneeded symbol


include/mysql_com.h:
  still better names for enum; removing unneeded symbol
VC++Files/winmysqladmin/mysql_com.h:
  still better names for enum; removing unneeded symbol
2004-08-19 15:15:52 +02:00
unknown
d4590fa8bf Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-19 15:11:37 +02:00
unknown
32ad58799d mysql_com.h:
Better names for defines, as these are visible in API


include/mysql_com.h:
  Better names for defines, as these are visible in API
VC++Files/winmysqladmin/mysql_com.h:
  Better names for defines, as these are visible in API
2004-08-19 15:10:59 +02:00
unknown
cc6d65b8d8 Bug 4531: unique key prefix interacts poorly with utf8
Check HEAP+HASH, binary collation
2004-08-19 16:07:18 +05:00
unknown
cba27e4a91 Fix trailing spaces behaviour for binary collation. 2004-08-19 15:21:35 +05:00
unknown
7fbc796d4a Bug#4521: unique key prefix interacts poorly with utf8.
Fix for binary collations for MyISAM and HEAP BTREE.
This patch also changes trailing spaces behaviour for
binary collations. Binary collations now have PAD 
characteristic too.
2004-08-19 15:15:10 +05:00
unknown
6cf9fd7cdb ctype_utf8.test, ctype_utf8.result:
Typo fix


mysql-test/r/ctype_utf8.result:
  Typo fix
mysql-test/t/ctype_utf8.test:
  Typo fix
2004-08-19 15:00:55 +05:00
unknown
b368cb3f6e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-19 10:37:47 +02:00
unknown
0e0b785fc3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-08-19 13:37:46 +05:00
unknown
13b0c809ec Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-19 08:37:45 +00:00
unknown
9dc57a2a7f Some platfom compile/build fixes for ndb
ndb/include/kernel/Interpreter.hpp:
  R1 defined on some platforms
ndb/include/util/BaseString.hpp:
  fix for compiler bug
2004-08-19 08:24:27 +00:00
unknown
0281941158 Bug#5081: UCS2 fields are filled with '0x2020' after extending field length 2004-08-19 11:59:33 +05:00
unknown
853a01f719 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-19 08:05:30 +02:00
unknown
14f1d933c1 Set correct error code 2004-08-19 08:03:54 +02:00
unknown
f9b8ffc2ae field.cc:
Serg's typo fix :)


sql/field.cc:
  Serg's typo fix :)
2004-08-19 10:28:40 +05:00
unknown
f832ccaf8f Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-19 03:03:02 +02:00
unknown
ae2bf6275e after merge fixes
strings/my_vsnprintf.c:
  %.#s support in my_vsnprintf
BitKeeper/etc/ignore:
  Added EXCEPTIONS-CLIENT to the ignore list
2004-08-19 03:02:09 +02:00
unknown
5347ea97b1 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-19 01:05:40 +02:00
unknown
bcfb79c844 Very small API change: changing the values in enum enum_shutdown_level;
as this enum is not really usable yet (as MySQL server supports only one
shutdown level), and as SHUTDOWN_DEFAULT is still left to 0, this change
should disturb no user. Later (in 4.1.4 or 4.1.5) code will be pushed to
implement graceful shutdown using this enum.


VC++Files/winmysqladmin/mysql_com.h:
  changing the values in the enumeration enum_shutdown_level.
include/mysql_com.h:
  changing the values in the enum enum_shutdown_level.
  The main one, SHUTDOWN_DEFAULT, is unchanged.
2004-08-19 01:03:43 +02:00
unknown
945625ebaa manually merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0dbg.h:
  Auto merged
innobase/lock/lock0lock.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/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/conf_to_src.c:
  Auto merged
libmysql/dll.c:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_uint.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.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/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/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/polish/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
2004-08-18 19:57:55 +02:00
unknown
992ff0a272 Added some explicit templates 2004-08-18 14:26:39 +00:00
unknown
0c6b96658e Bug 4937: different date -> string conversion when using
SELECT ... UNION and INSERT ... SELECT ... UNION
2004-08-18 14:46:31 +02:00
unknown
e9995b300f Added some explicit templates 2004-08-18 12:15:02 +00:00
unknown
2b6b61642b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-18 10:11:30 +00:00
unknown
504c2f4579 bug#5076 bug#5077 2004-08-18 10:10:50 +00:00
unknown
8ddcba9d8a Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-18 09:25:27 +02:00
unknown
d8e4cad72e func_like.result:
LIKE crashed mysqld for binary collations in some cases


mysql-test/r/func_like.result:
  LIKE crashed mysqld for binary collations in some cases
2004-08-18 12:11:26 +05:00
unknown
eda663a155 Many files:
LIKE crashed mysqld for binary collations in some cases


strings/ctype-big5.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-euc_kr.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-gb2312.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-gbk.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-latin1.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-sjis.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-tis620.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-ucs2.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-ujis.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-utf8.c:
  LIKE crashed mysqld for binary collations in some cases
sql/item_cmpfunc.cc:
  LIKE crashed mysqld for binary collations in some cases
2004-08-18 12:07:54 +05:00
unknown
74dc0adce5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-18 01:07:56 +02:00
unknown
0c062ae60f srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h:
Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
mysqld.cc, ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) 


sql/ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
sql/mysqld.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/include/srv0start.h:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/include/ut0dbg.h:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/ut/ut0dbg.c:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/ut/ut0mem.c:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/srv/srv0start.c:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
2004-08-18 01:48:01 +03:00
unknown
002dda7aca Renamed Arg_comparator::compare_int -> compare_int_signed 2004-08-18 02:37:31 +04:00
unknown
1d07adfb6e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-18 00:27:09 +02:00
unknown
b5136781f1 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
2004-08-18 00:24:11 +02:00
unknown
0ef511b1cb Make sure registers is 64-bit aligned 2004-08-18 00:19:47 +02:00
unknown
4e9bb7a9a9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-root
2004-08-18 02:16:43 +04:00
unknown
3585e4a4f1 Don gather results for unallocated api's 2004-08-18 00:06:18 +02:00
unknown
fdc8712cb0 use my_vsnprintf() just in case
bug#4925
2004-08-18 00:04:43 +02:00
unknown
4387ef041b Use native format in interpreter -
(old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])

This fixes problem with auto increment on different byte order

(This also make adding of signed ints really simple...)


ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])
ndb/src/ndbapi/Ndb.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])
ndb/src/ndbapi/NdbOperationInt.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])
2004-08-17 22:59:38 +02:00
unknown
ead6df77e2 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-17 17:34:58 +02:00
unknown
35daaa5e15 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-17 17:34:53 +02:00
unknown
70f0a36dbd Fix for BUG#5038 "Cannot disable LOAD DATA LOCAL INFILE from client"
(specific to 4.1): don't put CLIENT_LOCAL_FILES in
CLIENT_CAPABILITIES; it would make mysql_options(CLIENT_LOCAL_FILES,0)
have no effect.


libmysql/client_settings.h:
  Don't enforce that we client have CLIENT_LOCAL_FILES;
  indeed this CLIENT_CAPABILITIES is used as minimum
  client options in mysql_real_connect(), which is *after*
  mysql_options(). Having CLIENT_LOCAL_FILES in
  CLIENT_CAPABILITIES defeats disabling it in mysql_options().
2004-08-17 17:33:21 +02:00
unknown
21a264cc4c Removed non-used variable
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-17 12:20:01 -03:00
unknown
5590305627 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-17 14:05:01 +00:00
unknown
33ea8b103f automake fix for getting dependencies right for ndb 2004-08-17 14:03:20 +00:00
unknown
d13c9acff8 Fix for BUG#5073 "--disable-local-infile has no effect if client reads it with MYSQL_READ_DEFAULT":
that was a forgotten '~' probably.


libmysql/libmysql.c:
  When we read "disable-local-infile" from the option file specified by mysql_options(MYSQL_READ_DEFAULT_FILE),
  we must take CLIENT_LOCAL_FILES down (it was probably a forgotten '~').
2004-08-17 14:12:37 +02:00
unknown
0f7bf1199b Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-08-17 14:30:36 +03:00
unknown
5f8f12818a Merge mysqldev@bk-internal.mysql.com:/tmp/jonas/save
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-17 11:57:50 +02:00
unknown
02e04a7aa9 Solaris fixes
ndb/include/ndb_global.h:
  Include my_alarm (to get signal.h)
ndb/src/cw/cpcd/Process.cpp:
  Include my_alarm (to get signal.h)
ndb/src/cw/cpcd/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/kernel/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/kernel/vm/Emulator.cpp:
  Include my_alarm (to get signal.h)
ndb/src/mgmclient/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/mgmsrv/Services.cpp:
  Include ndb_global instead of string.h
ndb/src/ndbapi/NdbOperationInt.cpp:
  Keep consistent order of 64 bits in interpreter
ndb/src/ndbapi/TransporterFacade.cpp:
  Include my_alarm (to get signal.h)
2004-08-17 11:55:51 +02:00