Commit graph

12433 commits

Author SHA1 Message Date
magnus@neptunus.(none)
4d7edeff8e Updated ndb_basic test 2004-05-17 09:40:35 +02:00
hf@deer.(none)
5bca8fd46d Proposed fix for #3791 (embedded: mysql segfaults if cannot find
errmsg.sys)
2004-05-17 12:07:58 +05:00
hf@deer.(none)
c00bc7a803 Proposed fix for #3744 (embedded server, wrong error message if database is
missing)
2004-05-17 12:05:57 +05:00
monty@mysql.com
cd3dab49cc Merge with 4.0.20 2004-05-17 01:52:13 +03:00
monty@mishka.local
a79a3f5724 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
2004-05-16 14:49:32 +03:00
monty@mishka.local
314a8bf114 key_cmp -> key_cmp_if_same
New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys
2004-05-16 14:48:32 +03:00
Sinisa@sinisa.nasamreza.org
2d656181dc Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-05-15 18:30:04 +03:00
Sinisa@sinisa.nasamreza.org
0806214620 Optimising UNION ALL (WL 1687) 2004-05-15 16:13:08 +03:00
hf@deer.(none)
e18cd2ea9f Fixes for #3371, #3372, #3374, #3375, #3376 2004-05-15 17:07:44 +05:00
serg@serg.mylan
0dc8aacf7d merged 2004-05-15 11:26:58 +02:00
serg@serg.mylan
da63a927f2 bad old merge fixed 2004-05-15 11:20:42 +02:00
monty@mysql.com
9f171e7794 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-15 11:58:08 +03:00
monty@mysql.com
e0a4b51215 Better fix for bug #3749 (bug in deleting automatic generated foreign keys) 2004-05-15 11:57:40 +03:00
bell@sanja.is.com.ua
a785d16d8a results fix 2004-05-15 11:20:43 +03:00
bell@sanja.is.com.ua
693b075e50 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1
2004-05-15 10:15:44 +03:00
monty@mysql.com
1e860400f3 Extra safety fixes (probably not needed, but can't hurt) 2004-05-15 09:08:03 +03:00
guilhem@mysql.com
7bcb79e76b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-14 23:09:03 +02:00
guilhem@mysql.com
a039062ef3 Replication testsuite: making the master-slave synchronization less likely to fail,
by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
in sync_with_master and sync_slave_with_master.
The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
but may affect 4.x as well, so fixing it here. Note that I am also fixing
5.0 too, with the same exact patch, because I don't want to leave 5.0 broken
until the next 4.0->4.1->5.0 merge.
2004-05-14 23:08:03 +02:00
serg@serg.mylan
6a594c07c5 get rid of remaining strtolls - irix64 compatibility 2004-05-14 19:12:09 +02:00
hf@deer.(none)
e81c6e1763 CXX linker specified for client_test with libmysqld 2004-05-14 21:00:29 +05:00
bell@sanja.is.com.ua
712d379b5e check of item name presence in find_item_in_list (Bug #3752) 2004-05-14 18:55:24 +03:00
bell@sanja.is.com.ua
9432158831 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1
2004-05-14 16:57:21 +03:00
bell@sanja.is.com.ua
38d0d362c5 SELECT options print fixed 2004-05-14 16:56:47 +03:00
heikki@hundin.mysql.fi
02f51ccf2d Many files:
Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
2004-05-14 16:48:56 +03:00
marko@hundin.mysql.fi
a4489d39b5 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-14 16:07:21 +03:00
marko@hundin.mysql.fi
a5cca9df64 InnoDB cleanup: eliminate IB__FILE__ 2004-05-14 16:06:21 +03:00
bell@sanja.is.com.ua
bb34b56bfd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
2004-05-14 15:29:23 +03:00
bell@sanja.is.com.ua
a9501fd7aa after merge fix 2004-05-14 15:28:59 +03:00
bell@sanja.is.com.ua
3f6857112c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1
2004-05-14 14:45:27 +03:00
marko@hundin.mysql.fi
3c87eda7ee InnoDB: ut0mem: Remove ut_str_catenate(), add const qualifiers 2004-05-14 14:23:46 +03:00
marko@hundin.mysql.fi
3a9e590166 InnoDB: Disable file locking on FreeBSD 2004-05-14 14:11:13 +03:00
serg@serg.mylan
67f1c04ffc better fix for bug#3749 - do not consider already removed keys in key removal process 2004-05-14 12:49:18 +02:00
bell@sanja.is.com.ua
71a374dc13 Merge 2004-05-14 13:33:02 +03:00
bell@sanja.is.com.ua
8885ce0dd7 UNCACHEABLE_EXPLAIN is enough 2004-05-14 13:28:20 +03:00
marko@hundin.mysql.fi
b4ae2577f0 InnoDB: Remove unused function ut_str_catenate() 2004-05-14 12:26:12 +03:00
bell@sanja.is.com.ua
a71771788e Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-05-14 11:11:48 +03:00
bell@sanja.is.com.ua
8f957583f1 fixed flags of printed query 2004-05-14 11:09:57 +03:00
bar@bar.intranet.mysql.r18.ru
6ecea2fa93 Bug #3403 Wrong encoding in EXPLAIN SELECT output 2004-05-14 13:08:22 +05:00
bar@bar.intranet.mysql.r18.ru
2fc1d5c146 Bug #3403 Wrong encoding in SHOW GRANTS, EPLAIN SELECT output
This change fixes SHOW GRANTS problem, while EXPLAIN will be fixed
in a separate patch.
2004-05-14 12:16:27 +05:00
heikki@hundin.mysql.fi
9bf1be457a sql_table.cc:
Fix bug #3749: if there were several indexs that made an automatically generated FOREIGN KEY index redundant, then MySQL miscalculated the number of keys, and the AUTO_INCREMENT flag was forgotten by MySQL from a PRIMARY KEY. There were probably a multitude of other errors caused by this.
2004-05-14 09:02:06 +03:00
serg@serg.mylan
5981f5d107 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-14 01:25:08 +02:00
serg@serg.mylan
0d3b083800 compatibility fix for hp-ux 64bit (hpux compiler) and sun 64-bit (sun forte) 2004-05-14 01:24:17 +02:00
bell@sanja.is.com.ua
4c774e0c18 fixed flags of printed query 2004-05-13 23:47:20 +03:00
heikki@hundin.mysql.fi
d2649c110a ha_innodb.cc, trx0trx.h, lock0lock.c, trx0trx.c:
Reserve the MySQL LOCK_thread_count mutex when printing thd->query of
an arbitrary transaction; if we are printing thd->query of a transaction that
we know is currently executing inside InnoDB, then we know that MySQL cannot
meanwhile change thd->query, and no need to reserve the MySQL mutex; note
that this patch still leaves open the possibility of races in MySQL's
thd->query_len
2004-05-13 22:07:51 +03:00
mronstrom@mysql.com
64d9f1fe22 Snippet from the Internet:
Common Symbols

If you get errors in linking complaining about common symbols
ld: common symbols not allowed with MH_DYLIB format

Then it means that you've got a global variable in the library which has
not been assigned a value.

Got this problem with three globals in NdbDaemon.c
2004-05-13 19:49:10 +02:00
lenz@mysql.com
55e7775725 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-05-13 19:17:38 +02:00
heikki@hundin.mysql.fi
cafad010a6 ha_innodb.cc:
A flawed fix of the thd->query race in SHOW INNODB STATUS; see the comments in code about how to fix this properly; we cannot use LOCK_thread_count to protect thd->query, because that will cause a deadlock of threads
2004-05-13 20:02:05 +03:00
lenz@mysql.com
b3bbac2548 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2004-05-13 18:51:02 +02:00
lenz@mysql.com
b1f2932fff - make sure the binaries are executable before calling them during
make_binary_distribution (bug#2857)
2004-05-13 18:50:09 +02:00
tomas@mc05.(none)
0d307d344b portability fix 2004-05-13 15:58:28 +02:00