mskold@mysql.com
082bd01572
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 14:21:58 +01:00
mskold@mysql.com
e72f9108ef
Removed compiler warnings
2005-01-11 14:06:44 +01:00
bar@mysql.com
691b3283d2
If VARCHAR strips only trailing spaces, then produce
...
a note, not a warning or error.
2005-01-11 16:49:45 +04:00
konstantin@mysql.com
a55cd1f1c4
Fixes for two compile-time failures.
2005-01-11 15:32:23 +03:00
konstantin@mysql.com
a0bc131743
Merge mysql.com:/home/kostja/work/mysql-4.1-7428
...
into mysql.com:/home/kostja/work/mysql-5.0-root
2005-01-11 14:47:12 +03:00
konstantin@mysql.com
4073c11a72
Followup: rename the declaration (hash_reset -> my_hash_reset)
2005-01-11 13:57:07 +03:00
konstantin@mysql.com
067d13f632
A fix for linking failure of MySQL client when linking with imap libraries
...
(Bug#7428) (renamed: hash_reset -> my_hash_reset)
2005-01-11 13:53:10 +03:00
joreland@mysql.com
d4e9719aff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-11 11:14:14 +01:00
konstantin@mysql.com
876a96cd02
make it compile with -ansi -pedantic
2005-01-11 13:12:52 +03:00
joreland@mysql.com
1a1e4ab9e7
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-11 11:12:46 +01:00
joreland@mysql.com
28f5a019c1
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-11 10:34:37 +01:00
tomas@poseidon.ndb.mysql.com
e88b292738
Bug#7477
2005-01-11 10:34:36 +01:00
mskold@mysql.com
20184b7047
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 10:31:31 +01:00
joreland@mysql.com
0cf3c1e5c1
bug#7765 - ndb startup on 64-bit, increase stack on 64-bit
2005-01-11 10:02:31 +01:00
jimw@mysql.com
64c04a4c26
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-11 05:11:42 +01:00
jimw@mysql.com
3d0e2e70c6
Merge
2005-01-11 05:10:08 +01:00
jimw@mysql.com
d5f18e63b3
Merge mysql.com:/home/jwinstead2/mysql-4.1-7556
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 02:57:47 +01:00
jimw@mysql.com
e173b24f75
Merge mysql.com:/home/jwinstead2/mysql-4.1-7762
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 01:25:46 +01:00
jimw@mysql.com
699cb2c066
Fix style nit
2005-01-11 01:01:35 +01:00
kent@mysql.com
feee6ee30b
field.h, field.cc:
...
Did some more split TABLE to TABLE and TABLE_SHARE
2005-01-11 00:17:21 +01:00
jimw@mysql.com
2347e386d7
Fix double-initalization of mutex in archive storage engine. (Bug #7762 )
2005-01-10 23:59:28 +01:00
mskold@mysql.com
fb5e3b7245
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-10 23:27:37 +01:00
mskold@mysql.com
fa2fd91a09
Recorded new result file
2005-01-10 21:45:35 +01:00
mskold@mysql.com
760b2a5f3b
Fix for failing INSERT IGNORE
2005-01-10 20:55:05 +01:00
guilhem@mysql.com
09b45d80d5
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-10 18:46:31 +01:00
guilhem@mysql.com
4195cfc2a8
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-10 18:42:07 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
c268628163
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/mysql-5.0
2005-01-10 16:27:16 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
b67a1f697a
Initialize lex->mqh structure. Fixes valgrind warnings.
2005-01-10 16:24:05 +00:00
lenz@mysql.com
442a3a98b0
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-5.0-build
2005-01-10 16:32:03 +01:00
lenz@mysql.com
af7dcec56d
- removed the mysql-test/suites/jp test suite and marked all files as gone
2005-01-10 16:19:01 +01:00
guilhem@mysql.com
b5a44aebbd
Merge mysql.com:/home/mysql_src/mysql-4.1-clean
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-10 15:15:49 +01:00
guilhem@mysql.com
b9926d71c0
A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE).
2005-01-10 15:13:33 +01:00
heikki@hundin.mysql.fi
59b9a5289a
os0file.c:
...
Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined
2005-01-10 15:26:33 +02:00
guilhem@mysql.com
da1d751b31
Merge mysql.com:/home/mysql_src/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-10 14:13:41 +01:00
guilhem@mysql.com
3439ce4ee3
Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]":
...
mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.
2005-01-10 13:52:32 +01:00
joreland@mysql.com
10f41d7cc4
merge
2005-01-10 11:49:58 +01:00
joreland@mysql.com
4ddd79fb69
bug#7761 - ndb does not autcommit - postreview fixes
2005-01-10 11:33:08 +01:00
joreland@mysql.com
6331241cb3
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-10 11:20:01 +01:00
joreland@mysql.com
c9f7f0ffcf
bug#7761 - ndb does not autocommit during alter table
2005-01-10 11:17:01 +01:00
joreland@mysql.com
b4c251134f
Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-09 11:01:47 +01:00
joreland@mysql.com
7b0748ed9a
ndb -
...
Fix ndb_limit, handle cmpDate of length 3
Remove ucs2 test as it requires one to configure --with-extra-charsets
2005-01-09 11:00:37 +01:00
joreland@mysql.com
75014076d6
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-09 05:03:33 +01:00
paul@kite-hub.kitebird.com
61041e55fe
Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-01-08 19:46:52 -06:00
paul@kite-hub.kitebird.com
7585b5cb61
set_var.cc:
...
Whack duplicate variable line. (Affects SHOW VARIABLES.)
2005-01-08 19:43:15 -06:00
paul@kite-hub.kitebird.com
8f12ea836e
sql_select.cc:
...
silence picky compiler warning.
2005-01-08 19:40:58 -06:00
jimw@mysql.com
0d8bfc5f92
Replace all sprintf() calls with my_snprintf() in client.c. All of the
...
format strings (in all languages) already included field limits on the
specifiers, so this is just protection against future mistakes. (Bug #7556 )
2005-01-09 02:19:42 +01:00
paul@kite-hub.kitebird.com
840dd7c764
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-01-08 18:42:48 -06:00
paul@kite-hub.kitebird.com
cbd56fce87
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2005-01-08 18:32:57 -06:00
pekka@mysql.com
cd4479a77a
ndb - wl-1442 merge fix 5.0 -> 5.0-ndb
2005-01-09 01:14:11 +01:00
pekka@mysql.com
51adbae299
Merge
2005-01-09 00:45:06 +01:00