bar@mysql.com
|
6ef93274b0
|
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0.fresh
|
2005-02-18 16:14:28 +04:00 |
|
bar@mysql.com
|
47b85939a5
|
Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
Backporting Monty's fix for 5.0 into 4.1.
|
2005-02-18 16:10:12 +04:00 |
|
hf@deer.(none)
|
68a1ba2562
|
Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-5.0.clean
|
2005-02-18 15:57:39 +04:00 |
|
hf@deer.(none)
|
8b2fc991cd
|
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
|
2005-02-18 15:52:59 +04:00 |
|
hf@deer.(none)
|
93e0107050
|
Fix for the bug #7344 (multiple server_init/server_end lead to crash)
Some variable wasn't moved to the initial state during mysql_server_end
|
2005-02-18 15:51:55 +04:00 |
|
msvensson@neptunus.(none)
|
3d0883bb05
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583
|
2005-02-18 11:02:21 +01:00 |
|
msvensson@neptunus.(none)
|
4ebbb92054
|
BUG#8583 ndb_...multi tests fail in 5.0.3
- the variable MASTER_MY_PORT1 was used from the script, but it was not set to the port where the second server was started
|
2005-02-18 10:57:10 +01:00 |
|
bar@mysql.com
|
dcb0f52e9a
|
Merge: don't add this into configure in as it is already in
config/ac-macros/character_sets.m4
|
2005-02-18 13:21:30 +04:00 |
|
bar@mysql.com
|
fe8c9e498e
|
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.fresh
|
2005-02-18 13:16:17 +04:00 |
|
bar@mysql.com
|
c926e43f65
|
A way not to compile UCA collations
|
2005-02-18 12:58:16 +04:00 |
|
jimw@mysql.com
|
e9a5b7d500
|
Clean up merge from 4.1, including making several enum fields
in the grant tables case-insensitive and updating test results.
|
2005-02-17 18:07:14 -08:00 |
|
jimw@mysql.com
|
7eb8c130f7
|
Merge
|
2005-02-17 16:16:58 -08:00 |
|
jimw@mysql.com
|
613e09a92a
|
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
|
2005-02-17 15:58:45 -08:00 |
|
jimw@mysql.com
|
3c700572b4
|
Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 15:23:28 -08:00 |
|
acurtis@pcgem.rdg.cyberkinetica.com
|
36c146c732
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3
|
2005-02-17 21:57:36 +00:00 |
|
jimw@mysql.com
|
e3ff1bf326
|
Merge mysql.com:/home/jimw/my/mysql-4.1-8303
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:54:05 -08:00 |
|
jimw@mysql.com
|
9de31feab9
|
Merge mysql.com:/home/jimw/my/mysql-4.1-7617
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:53:35 -08:00 |
|
jimw@mysql.com
|
219e29d7ae
|
Merge mysql.com:/home/jimw/my/mysql-4.1-8471
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:53:07 -08:00 |
|
acurtis@pcgem.rdg.cyberkinetica.com
|
4b4a5659df
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3
|
2005-02-17 21:53:05 +00:00 |
|
jimw@mysql.com
|
45d8283f1a
|
Merge
|
2005-02-17 13:52:39 -08:00 |
|
jimw@mysql.com
|
08624c0061
|
Merge mysql.com:/home/jimw/my/mysql-4.1-8355
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:48:34 -08:00 |
|
jimw@mysql.com
|
ca6dda8daa
|
Merge mysql.com:/home/jimw/my/mysql-4.1-5672
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:47:59 -08:00 |
|
jimw@mysql.com
|
9df11a3c5e
|
Merge mysql.com:/home/jimw/my/mysql-4.1-7989
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:47:14 -08:00 |
|
jimw@mysql.com
|
7e499384b4
|
Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:46:33 -08:00 |
|
jimw@mysql.com
|
4decbce5ea
|
Merge mysql.com:/home/jimw/my/mysql-4.0-no-merge-spam
into mysql.com:/home/jimw/my/mysql-4.0-clean
|
2005-02-17 13:45:20 -08:00 |
|
jimw@mysql.com
|
9d5b721c7e
|
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
|
2005-02-17 13:42:18 -08:00 |
|
joerg@mysql.com
|
bbafcd4972
|
Fix a compile error (missing return value).
|
2005-02-17 22:32:21 +01:00 |
|
jimw@mysql.com
|
cc1e805c0b
|
Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
|
2005-02-17 13:22:16 -08:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
6890b0aa5e
|
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
|
2005-02-17 23:04:13 +02:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
a6106a0a67
|
Fixed Bug#7838, "pipe_sig_handler should be static".
|
2005-02-17 23:00:48 +02:00 |
|
marko@hundin.mysql.fi
|
15ddb5c4ca
|
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
|
2005-02-17 21:45:14 +02:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
3bc92ed9f5
|
Fixed Bug#7783, "mysql_free_result removes all resultsets (multi statements)".
|
2005-02-17 21:45:13 +02:00 |
|
marko@hundin.mysql.fi
|
e1d4e17b4c
|
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
|
2005-02-17 20:58:49 +02:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
de40cf0178
|
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
|
2005-02-17 20:21:29 +02:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
d378dbe83d
|
Fixed Bug#7873.
|
2005-02-17 20:20:48 +02:00 |
|
acurtis@pcgem.rdg.cyberkinetica.com
|
35f772c2bd
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3
|
2005-02-17 17:53:05 +00:00 |
|
acurtis@pcgem.rdg.cyberkinetica.com
|
10ab9e982f
|
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1
|
2005-02-17 17:52:49 +00:00 |
|
svoj@mysql.com
|
ed6c4ec925
|
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/svoj/devel/mysql/mysql-4.1
|
2005-02-17 21:40:13 +04:00 |
|
acurtis@pcgem.rdg.cyberkinetica.com
|
647eaaea1d
|
Bug#8147
Merge from 4.1
|
2005-02-17 17:38:13 +00:00 |
|
heikki@hundin.mysql.fi
|
173e200c65
|
innodb.test, innodb.result:
Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
|
2005-02-17 19:20:13 +02:00 |
|
marko@hundin.mysql.fi
|
baffd9ad2d
|
After review fixes (Bug #5682)
|
2005-02-17 18:40:45 +02:00 |
|
marko@hundin.mysql.fi
|
612e06617c
|
InnoDB: Make CREATE TABLE return error when the minimum row length
exceeds the maximum record size. (Bug #5682)
|
2005-02-17 17:15:29 +02:00 |
|
msvensson@neptunus.(none)
|
55824f59b7
|
Merged test case
|
2005-02-17 14:45:52 +01:00 |
|
msvensson@neptunus.homeip.net
|
a004533a76
|
BUG#8547: Wrong errormessage when dropping table that does not exist in NDB
- Added tescases
- Added handling of HA_ERR_NO_SUCH_TABLE in mysql_rm_table_part2 so that
error messages now are consistent
|
2005-02-17 14:22:44 +01:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
10ab1c5582
|
Fixed a result file. Some redundant notes printing had been removed from source
code, because a warning was given also.
|
2005-02-17 15:12:49 +02:00 |
|
jani@ua141d10.elisa.omakaista.fi
|
36998b7cb7
|
Fixed Bug#8042, "mysqld crashes on sighup".
|
2005-02-17 14:07:28 +02:00 |
|
pekka@mysql.com
|
e2268e55c3
|
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/pekka/ndb/version/my50
|
2005-02-17 12:13:17 +01:00 |
|
pekka@mysql.com
|
f789749757
|
ndb - accept ps_7ndb.result
|
2005-02-17 12:13:16 +01:00 |
|
svoj@mysql.com
|
349112292f
|
bug#6958
Fixed that negative arguments to certain integer options wrap around.
|
2005-02-17 15:04:04 +04:00 |
|
lenz@mysql.com
|
ab2a4c4d54
|
Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
|
2005-02-17 11:09:35 +01:00 |
|