1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Commit Graph

20180 Commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
8d4142ee31 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-18 09:21:42 +01: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
stewart@mysql.com
dc5d2c1107 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
2005-02-18 08:43:19 +11: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
stewart@mysql.com
59b1588880 Fix Solaris build problem (jonas pointed out strerror_r is not available). 2005-02-18 07:06:02 +11:00
tomas@poseidon.ndb.mysql.com
9ca2c7c611 changed ndb dynamic port fetch sligtly to handle "not connected" cases better 2005-02-17 20:59:18 +01: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
tomas@poseidon.ndb.mysql.com
3f023ee3e8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-17 20:31:00 +01: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
tomas@poseidon.ndb.mysql.com
10919b51a6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-17 18:06:25 +01:00
marko@hundin.mysql.fi
baffd9ad2d After review fixes (Bug #5682) 2005-02-17 18:40:45 +02:00
pekka@mysql.com
7ef712ba7b ndb - TUP scan filter support for LIKE/NOT_LIKE 2005-02-17 17:12:36 +01: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
mskold@mysql.com
14c9ff5ce0 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-17 15:39:23 +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
tomas@poseidon.ndb.mysql.com
1b16f471b5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-17 14:04:59 +01: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
lenz@mysql.com
01180054fa - fixed a changelog entry in the RPM spec file (wrong author) 2005-02-17 11:07:33 +01:00
lenz@mysql.com
65e804612f Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-02-17 10:56:20 +01:00
lenz@mysql.com
61049dcb0a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-02-17 10:51:56 +01:00