Commit graph

14470 commits

Author SHA1 Message Date
bar@mysql.com
6b90806a4a ctype_utf8.test, ctype_utf8.result:
Typo fix
2004-08-19 15:00:55 +05:00
serg@serg.mylan
3360c997ac Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-19 12:00:03 +02:00
mskold@mysql.com
99eef36f24 Minor typo 2004-08-19 11:51:06 +02:00
serg@serg.mylan
8ef3cdc2f9 take dec. point into account in store_double_in_string 2004-08-19 11:21:08 +02:00
mskold@mysql.com
59c9bcb366 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-19 11:13:49 +02:00
mskold@mysql.com
348cff4196 Cleaned up build of index list 2004-08-19 11:10:35 +02:00
joreland@mysql.com
b9dbef8e23 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
joreland@mysql.com
9c9812eb8c Merge joreland@bk-internal.mysql.com:wl2025
into mysql.com:/home/jonas/src/wl2025
2004-08-19 10:37:46 +02:00
serg@serg.mylan
cf1be1069e Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-19 10:37:46 +02:00
bar@mysql.com
4f8144833f 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
tomas@poseidon.(none)
a0f8452e2f 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
tomas@poseidon.(none)
f9337ba947 Some platfom compile/build fixes for ndb 2004-08-19 08:24:27 +00:00
guilhem@mysql.com
96a000ae78 cosmetic change 2004-08-19 10:01:01 +02:00
serg@serg.mylan
71d6b35267 dependencies are auto-generated 2004-08-19 09:02:29 +02:00
bar@mysql.com
7f92905954 Bug#5081: UCS2 fields are filled with '0x2020' after extending field length 2004-08-19 11:59:33 +05:00
joreland@mysql.com
afc10d5182 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
joreland@mysql.com
3023d0ddc1 Set correct error code 2004-08-19 08:03:54 +02:00
joreland@mysql.com
fe118d628f wl2025 - fix suma & backup
pluse remove "first_batch_size" and instead put
batch_size on next_scan_req
2004-08-19 07:43:06 +02:00
mskold@mysql.com
47214454b6 Minor cosmetic fix 2004-08-19 07:33:35 +02:00
bar@mysql.com
3f75d2bd3e field.cc:
Serg's typo fix :)
2004-08-19 10:28:40 +05:00
serg@serg.mylan
3bac9dd7db 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
serg@serg.mylan
3f2210c064 after merge fixes 2004-08-19 03:02:09 +02:00
serg@serg.mylan
754fafd28f copied new my_vsnprintf from 4.1. use "ul" when merging 2004-08-19 02:35:59 +02:00
paul@ice.snake.net
d08183d648 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-18 18:42:01 -05:00
guilhem@mysql.com
c31d49d540 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
guilhem@mysql.com
f5228a60e6 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.
2004-08-19 01:03:43 +02:00
guilhem@mysql.com
6f8f231c35 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-19 00:43:48 +02:00
guilhem@mysql.com
42d30b758b 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().
2004-08-19 00:29:11 +02:00
rburnett@build.mysql.com
a22cdab9e9 BUG# 4466 - Nothing in .err when mysql service ends because of malformed my.ini options
mysqld.cc:
  Changed option_error_reporter to match new function header that includes LOGLEVEL enum
mysql_priv.h:
  Removed the MY_ERROR style bitmask.  Changed function headers to use new LOGLEVEL enum
log.cc:
  Changed print_buffer_to_log to print_buffer_to_file.  Remove the timestamp bool and now all log entries written to stderr are timestamped.  Removed some unused commented code.  changed to use the new LOGLEVEL enum.  
my_getopt.c:
  Changed functions to use the new LOGLEVEL enum and changed the included error reporter to be default_reporter.  This reporter is used in handle_options if a reporter is not given
my_getopt.h:
  changed typedefs to use better naming convention.  Moved error bitmask into the LOGLEVEL enum and included it here.
2004-08-18 22:31:01 +02:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
mskold@mysql.com
3e1493b84b Fix for WL#1731 Handler: multiple databases 2004-08-18 19:13:39 +02:00
tomas@poseidon.(none)
7c69afaf15 Added some explicit templates 2004-08-18 14:26:39 +00:00
serg@serg.mylan
8ce92878a2 Bug 4937: different date -> string conversion when using
SELECT ... UNION and INSERT ... SELECT ... UNION
2004-08-18 14:46:31 +02:00
tomas@poseidon.(none)
8706d60b53 Added some explicit templates 2004-08-18 12:15:02 +00:00
tomas@poseidon.(none)
4fe6ab1fc6 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
tomas@poseidon.(none)
5a9533bbf3 bug#5076 bug#5077 2004-08-18 10:10:50 +00:00
joreland@mysql.com
1965bb01e5 Merge joreland@bk-internal.mysql.com:/users/mronstrom/wl2025
into mysql.com:/home/jonas/src/wl2025
2004-08-18 12:04:21 +02:00
mronstrom@mysql.com
995ac87734 Added configuration parameters for batch size, batch byte size
and max scan batch size
Removed some debug printouts
2004-08-18 11:55:37 +02:00
joreland@mysql.com
e402f9ee3b Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025
2004-08-18 11:18:56 +02:00
mronstrom@mysql.com
607f7a6ebd 18 bits didn't fit into Uint16 2004-08-18 09:44:25 +02:00
serg@serg.mylan
a17f968954 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
bar@mysql.com
e0731bad9e func_like.result:
LIKE crashed mysqld for binary collations in some cases
2004-08-18 12:11:26 +05:00
bar@mysql.com
1cd108ff97 Many files:
LIKE crashed mysqld for binary collations in some cases
2004-08-18 12:07:54 +05:00
joreland@mysql.com
d7ecb3ff47 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
heikki@hundin.mysql.fi
6feb6ea545 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)
2004-08-18 01:48:01 +03:00
sergefp@mysql.com
83dc887b9d Renamed Arg_comparator::compare_int -> compare_int_signed 2004-08-18 02:37:31 +04:00
joreland@mysql.com
029ce2f08f 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
joreland@mysql.com
26a30a7331 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-18 00:24:11 +02:00
joreland@mysql.com
51b696ebbc Make sure registers is 64-bit aligned 2004-08-18 00:19:47 +02:00
sergefp@mysql.com
f60b356f5f 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