serg@serg.mylan
618d01e788
bad merge fixed
2005-01-10 16:03:06 +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
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
paul@kite-hub.kitebird.com
7585b5cb61
set_var.cc:
...
Whack duplicate variable line. (Affects SHOW VARIABLES.)
2005-01-08 19:43:15 -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
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
serg@sergbook.mylan
e98e64cea8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-08 21:27:22 +01:00
serg@sergbook.mylan
247052fecc
few harmless warnings from automated code-checking tools fixed
2005-01-08 21:25:31 +01:00
jimw@mysql.com
3b1b5edde5
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-08 21:16:51 +01:00
pekka@mysql.com
50c3a883b2
ndb - wl-1442 fix Time ordering
2005-01-08 19:28:44 +01:00
pekka@mysql.com
0462ccfe3c
ndb - wl-1442 fix Date ordering
2005-01-08 16:57:51 +01:00
pekka@mysql.com
7ef7580bb7
ndb - wl-1442 updated ndb_index_ordered.result
2005-01-08 15:18:24 +01:00
pekka@mysql.com
3e37933c7f
ndb - wl-1442 bug#7725 datetime ordering
2005-01-08 13:59:57 +01:00
jimw@mysql.com
6d03688422
Fix unportable 'tr' usage in libedit build process. (Bug #7669 )
2005-01-08 05:32:47 +01:00
paul@kite-hub.kitebird.com
76b823cebe
set_var.cc:
...
Reorder variables to properly alphabetize SHOW VARIABLES output.
2005-01-07 14:17:08 -06:00
jimw@mysql.com
c2eb3bf9f6
Correctly truncate integers inserted into field and double columns
...
with a number of decimals specified. (Bug #7361 )
2005-01-07 17:44:18 +01:00
serg@sergbook.mysql.com
77bc68f99d
Many files:
...
Change mode to -rw-rw----
2005-01-07 14:32:05 +02:00
serg@sergbook.mysql.com
8f104ea838
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-07 14:14:37 +02:00
lenz@mysql.com
d4a62b9c2a
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-01-07 12:32:39 +01:00
lenz@mysql.com
cd451c0cc2
- Updated Do-pkg to include the MySQL Preference Pane into the Mac OS X
...
installation disk images
2005-01-07 12:29:15 +01:00
joreland@mysql.com
000c676059
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-07 11:48:08 +01:00
joreland@mysql.com
7829053491
bug#7690 - ndb startup with shm, use sigaction to escape SA_RESETHAND
2005-01-07 11:47:01 +01:00
shuichi@mysql.com
18609a1e99
Added test data, test case and test result files for Japanese characters test.
...
I have put the tests into a separate "suite", the first one actually.
Currently this can only be run by the Perl version of mysql-test-run
that is not quite finished. It should, or at least will, be able to
be run with the line
./mysql-test-run.pl --suite=jp
2005-01-07 00:48:38 -08:00
shuichi@mysql.com
af9a4cf5e1
Added test case files
2005-01-07 00:40:29 -08:00
shuichi@mysql.com
3b635f0e3f
Added test data and test case files.
2005-01-07 00:32:31 -08:00
mwagner@here.mwagner.org
2131786204
Bootstrap:
...
Made the default --mail address to be <build@mysql.com>.
2005-01-06 22:30:23 -06:00
jimw@mysql.com
f520e72c72
Skip client_test when testing embedded server
2005-01-07 04:53:05 +01:00
guilhem@mysql.com
263f249a19
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-06 23:59:15 +01:00
guilhem@mysql.com
60f5a69160
2 small fixes for binlog (sorry for grouping them - I won't do it again):
...
WL#2335 (wait if binlog or binlog index file hits disk full or quota exceeded),
fix for BUG#7236 ("--expire_logs_days does not apply if all statements
happen in transactions"), and a behaviour change: abort if mysqld can't start
binlog at startup (if running with --log-bin of course).
2005-01-06 23:53:58 +01:00
jimw@mysql.com
54f0a85b97
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 21:48:51 +01:00
jimw@mysql.com
85eb6e84b3
Merge mysql.com:/home/jwinstead2/mysql-4.1-7539
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 21:47:52 +01:00
guilhem@mysql.com
927c4b73bf
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-06 21:35:50 +01:00
guilhem@mysql.com
1f6c72ccf1
Merge mysql.com:/home/mysql_src/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-06 21:31:47 +01:00
guilhem@mysql.com
4b2d003bf1
Fix for BUG#7714 "if disk full, sometimes MyISAM doesn't wait for free space, corrupts table"
...
This happened only if my_write() couldn't write even one byte.
I cannot easily add a .test for this, but I tested by hand before and after the change.
2005-01-06 21:30:39 +01:00
jimw@mysql.com
03578cd6bf
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 21:26:07 +01:00
jimw@mysql.com
b1eab7097c
Make sure all char columns in the mysql.* tables have the proper width in
...
mysql_fix_privilege_tables.sql, or they may get truncated during conversion
to utf8. (Bug #7539 )
2005-01-06 20:42:06 +01:00
jimw@mysql.com
488170d38c
Merge mysql.com:/home/jwinstead2/mysql-4.1-7021
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 20:03:06 +01:00
jimw@mysql.com
4149e1116a
Merge mysql.com:/home/jwinstead2/mysql-4.1-6964
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 20:01:18 +01:00
jimw@mysql.com
2acb738784
Add comment to make code for option-stripping in mysql_config more clear
2005-01-06 19:57:02 +01:00
bell@sanja.is.com.ua
a8861fe9ec
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2005-01-06 20:49:27 +02:00
bell@sanja.is.com.ua
d944dc9a78
postreview changes
2005-01-06 20:47:08 +02:00
bell@sanja.is.com.ua
779c33a5e7
fixed comparation with string constant on some platform (BUG#7651)
2005-01-06 19:13:58 +02:00
jimw@mysql.com
d4b236fe8f
Merge mysql.com:/home/jwinstead2/mysql-4.1-7451
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 17:27:48 +01:00
jimw@mysql.com
e3abb95228
Merge mysql.com:/home/jwinstead2/mysql-4.1-7249
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 17:24:47 +01:00
jimw@mysql.com
dee59e57fe
Merge mysql.com:/home/jwinstead2/mysql-4.1-7524
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 17:23:52 +01:00