paul@kite-hub.kitebird.com
8abb85a101
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-07 12:26:55 -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
marko@hundin.mysql.fi
52ebc04fc5
Introduce ROW_TYPE=REDUNDANT and ROW_TYPE=COMPACT for InnoDB table formats
2005-01-07 16:43:27 +02:00
serg@sergbook.mysql.com
a609bc45f2
merge
2005-01-07 15:02:25 +02: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
ea737638e3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-07 14:27:07 +02:00
serg@sergbook.mysql.com
98bfc75d6a
don't cast lvalue
2005-01-07 14:25:48 +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
joreland@mysql.com
013f9bbfb5
merge
2005-01-07 07:15:08 +01:00
joreland@mysql.com
f3baf38dbc
merge
2005-01-07 06:47:41 +01:00
jimw@mysql.com
f520e72c72
Skip client_test when testing embedded server
2005-01-07 04:53:05 +01:00
brian@zim.(none)
3be57f961b
This just fixes the compile issues for table structure changes.
...
The test case does not currently work (I am comitting this so that Patrick will have a working copy).
I am going to look at the test case next. It is suspected that it is failing do to a change in mysql_test_run.
2005-01-06 19:37:16 -08:00
brian@zim.(none)
2ee9d854b4
Updates for Monty's changes in the table structure. All tests pass currently.
...
Seems like such a short commit message...
2005-01-06 18:34:17 -08:00
brian@zim.(none)
75f282df27
Fix for compiling error in sql_parse
2005-01-06 16:31:18 -08: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
jimw@mysql.com
5010be1d8b
Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
...
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-06 21:39:57 +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
tulin@build.mysql.com
5157743357
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into build.mysql.com:/users/tulin/mysql-5.0
2005-01-06 21:03:09 +01:00
tulin@build.mysql.com
b8a1b9a438
main.cpp:
...
correcting 4.1 merge error
2005-01-06 21:01:32 +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
serg@sergbook.mysql.com
f472cec178
merged
2005-01-06 19:32:16 +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
serg@sergbook.mysql.com
15133e70ac
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-06 17:53:32 +02:00
jimw@mysql.com
7d568454fe
Merge
2005-01-06 16:50:34 +01:00
serg@sergbook.mysql.com
03f64a6343
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-06 17:40:00 +02:00
lenz@mysql.com
df323c0c4b
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-01-06 16:37:08 +01:00
bell@sanja.is.com.ua
421738e8ce
removed unused label
2005-01-06 17:08:38 +02:00
monty@mysql.com
0035397cb8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-01-06 17:00:59 +02:00
monty@mysql.com
ef74d8d898
Fixed a bug in prepared statements error handling
...
After merge fixes
2005-01-06 16:59:29 +02:00