database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-06 13:10:12 +03:00
Code Activity
21,744 Commits 3,261 Branches 1,092 Tags
a47bc28876dfe34839c2bc76c33e1639eda075d7
Commit Graph

6356 Commits

Author SHA1 Message Date
dean@mysql.com
b64fdf882a Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
 2005-02-16 19:15:08 -06:00
kent@mysql.com
75b0b945ca Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-02-17 02:11:03 +01:00
dean@mysql.com
2f7595ea84 Merge mysql.com:/home/dellis/bkl/bug-4.1 
into mysql.com:/home/dellis/bkl/bug-5.0
 2005-02-16 17:35:00 -06:00
guilhem@mysql.com
18ecaae189 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-xa
 2005-02-16 23:27:20 +01:00
guilhem@mysql.com
f314564451 Fixes after 4.1->5.0 merge. 2005-02-16 23:23:20 +01:00
mskold@mysql.com
96188c81e9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-16 23:16:02 +01:00
mskold@mysql.com
63a19c4791 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-16 21:29:19 +01:00
pekka@mysql.com
338f75a49d ndb - fix new decimal type mysql vs. ndb 2005-02-16 21:19:42 +01:00
guilhem@mysql.com
0987d81ae6 Merge 2005-02-16 21:03:58 +01:00
tomas@poseidon.ndb.mysql.com
334d92db03 reuse nodeid if ndbd is restarted 2005-02-16 20:46:34 +01:00
tomas@poseidon.ndb.mysql.com
6e53d8f75d Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
 2005-02-16 18:41:58 +01:00
serg@serg.mylan
5ddb6354a5 after merge fixes 2005-02-16 17:34:02 +01:00
tomas@poseidon.ndb.mysql.com
27538f49e3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
 2005-02-16 17:27:58 +01:00
pekka@mysql.com
c32fc95769 ndb - temp: comment out decimal tests t/ndb* 2005-02-16 17:10:17 +01:00
pem@mysql.com
25a9717a03 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-02-16 16:12:52 +01:00
pem@mysql.comhem.se
de2b28c1ad Fixed BUG#8540: Local variable overrides an alias. 2005-02-16 16:06:41 +01:00
pekka@mysql.com
c177f9fc4a Merge 2005-02-16 13:14:21 +01:00
mskold@mysql.com
5d23cdb591 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-16 13:13:13 +01:00
pekka@mysql.com
0d03304294 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
 2005-02-16 12:48:38 +01:00
pekka@mysql.com
7c9a155c4a ndb - fix old decimal type mysql vs ndb 2005-02-16 12:45:59 +01:00
kent@mysql.com
b32f693ee4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-02-16 12:10:13 +01:00
mskold@mysql.com
37301115c3 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-16 11:17:14 +01:00
dean@mysql.com
e7f410a14a Merge 2005-02-16 04:04:34 -06:00
msvensson@neptunus.homeip.net
e4ad041abf Fix ndb_autodiscover 2005-02-16 11:02:48 +01:00
gluh@gluh.mysql.r18.ru
638dc7d9e9 Fix for bug#7915: crash,JOIN VIEW, subquery, SELECT .. FROM INFORMATION_SCHEMA.COLUMNS 2005-02-16 13:00:03 +03:00
dean@mysql.com
87718094aa fulltext.test, fulltext.result: 
Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().
 2005-02-16 03:13:29 -06:00
guilhem@mysql.com
8e93873d5b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-02-16 10:02:54 +01:00
guilhem@mysql.com
bbcc1464d5 rpl_multi_query.test: disable ps-protocol as PS don't support multi-queries 2005-02-16 10:01:05 +01:00
igor@rurik.mysql.com
3100f891d2 Manual merge 2005-02-15 21:03:17 -08:00
igor@rurik.mysql.com
d9f66a261b Merge rurik.mysql.com:/home/igor/mysql-4.0 
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
 2005-02-15 18:48:04 -08:00
igor@rurik.mysql.com
d4779d3534 delete.result, delete.test: 
Added a test case for bug #8392.
sql_delete.cc:
  Fixed bug #8392.
  The bug caused a crash for a delete statement with ORDER BY
  that explicitly referred to the modified table.
 2005-02-15 18:45:42 -08:00
jimw@mysql.com
a6afab6a55 Always lowercase database names from 'host' and 'db' grant tables when they 
are loaded and lower_case_table_names is set, but issue a warning when it is
done. (Bug #7989)
 2005-02-15 13:36:46 -08:00
jimw@mysql.com
dee9795b5b Merge 2005-02-15 12:19:01 -08:00
patg@krsna.patg.net
7396fa1d11 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.patg.net:/home/patg/mysql-5.0
 2005-02-15 11:54:55 -08:00
dlenev@brandersnatch.localdomain
0a96ef4c90 Temporary disabling part of test which fails in --ps-protocol mode. 2005-02-15 22:17:44 +03:00
monty@mysql.com
71e4859389 After merge fixes 2005-02-15 19:25:42 +02:00
kent@mysql.com
50fe0ccbea Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-02-15 16:13:03 +01:00
monty@mysql.com
38d1a42481 Merge with 4.1 2005-02-15 17:12:13 +02:00
monty@mysql.com
410e51c854 Fixed failing test cases 'row.test' when running with --ps-protocol 
Simple optimzations done while reviewing code
 2005-02-15 16:45:00 +02:00
guilhem@mysql.com
a8380942bf Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-02-15 14:12:26 +01:00
monty@mysql.com
788a2658a3 Better bug fix for #5569: "Incorrect "Access Denied" error with SAME login DIFFERENT host" 
This fixes also the reverse lookup bug introduced by the previous patch
 2005-02-15 14:42:13 +02:00
mskold@mysql.com
fdbcad3eaf Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-15 12:06:29 +01:00
mskold@mysql.com
d32c3d6940 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-15 11:38:00 +01:00
jimw@mysql.com
3d7a384d00 Allow hostnames that are IP addresses with a netmask even when 
running with --skip-name-resolve. (Bug #8471)
 2005-02-14 20:33:14 -08:00
kent@mysql.com
8244a65bea Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-02-15 00:19:04 +01:00
guilhem@mysql.com
55fb16a7a6 1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores" 
and fixing it another way (per Monty; a simpler solution which does not increase the number
of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
thd->query_length to the length of the query being executed, not counting the next queries
if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.
 2005-02-14 23:47:17 +01:00
mskold@mysql.com
62a08929fa Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-14 22:30:01 +01:00
serg@serg.mylan
fd828e5b4d manually merged 2005-02-14 21:50:09 +01:00
sergefp@mysql.com
c30f7feba1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug8218
 2005-02-14 23:49:01 +03:00
sergefp@mysql.com
919f2f2364 Merge mysql.com:/home/psergey/mysql-4.1-bug8218 
into mysql.com:/home/psergey/mysql-5.0-bug8218
 2005-02-14 23:47:31 +03:00