Commit graph

3466 commits

Author SHA1 Message Date
hf@deer.(none)
7ce60487d9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2004-10-05 21:21:27 +05:00
hf@deer.(none)
ee3b6340b0 Fix for #5730 (Query cache crashes server)
Recusive part leads to stack overflow
2004-10-05 21:19:40 +05:00
marko@hundin.mysql.fi
8ade0f9a14 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-05 17:12:16 +03:00
marko@hundin.mysql.fi
42f3c0eb5b Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-05 15:15:45 +03:00
Sinisa@sinisa.nasamreza.org
19c112dfb5 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-10-05 14:54:40 +03:00
Sinisa@sinisa.nasamreza.org
2ffb87f6a5 Fix for wrongly calculated Examined_rows in 4.0 UNION's. 2004-10-05 14:47:10 +03:00
ingo@mysql.com
ca6533dbae Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0
2004-10-05 12:05:13 +02:00
joerg@mysql.com
1b39262a8b Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0 2004-10-05 11:33:57 +02:00
ingo@mysql.com
c546074e21 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug4286
2004-10-05 11:33:13 +02:00
vva@eagle.mysql.r18.ru
91e8afac37 patch fixing after review on patch-fixing of
Bug #5492 
"set @@session.read_rnd_buffer_size=33554432" crashes server on query

1. added warning comments for uint3korr (need one more byte allocated)
2. unsigned long in uint3korr was replaced by unsigned int to 
   avoid problems on 64-bits platforms
3. shorten warning comments in init_rr_cache in sql/records.cc
2004-10-04 23:26:42 +05:00
vva@eagle.mysql.r18.ru
d3dc011844 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_5492/mysql-4.0
2004-10-04 21:30:45 +05:00
marko@hundin.mysql.fi
c0531d70f6 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-04 15:17:32 +03:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
d67cd1af90 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug4118
2004-10-03 00:25:51 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
b36a565931 Merge ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/staff/repositories/mysql-4.0
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug4118
2004-10-03 00:25:09 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
2973a047ea Bug#4118: multi-table UPDATE takes WRITE lock on read table
Ensures that WRITE lock is not obtained on all tables referenced.
2004-10-03 00:20:47 +01:00
joerg@mysql.com
b7f35f00cb Solve compile problem for 4.0.22 on hpita2. (Backport of a 4.1 change) 2004-09-30 19:05:33 +02:00
rburnett@build.mysql.com
476705df18 Merge build.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0
2004-09-27 23:22:08 +02:00
dlenev@mysql.com
4ff9f1f558 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg4131-3
2004-09-27 00:50:29 +04:00
dlenev@mysql.com
263b33e12d Fix for bug #4131 "TIMESTAMP columns missing minutes and seconds when
using GROUP BY"
Now we are setting Field_timestamp::field_length to 19 in open_table()
if we are in new mode (and we are restoring it back when we are coming
back to normal mode). This also should solve potential problems with
some of LOAD DATA INFILE and SELECT * INTO in this mode.
2004-09-27 00:50:00 +04:00
rburnett@build.mysql.com
2bff96e291 Bug #5539 SHOW DATABASES LIKE and symlinks
sql_show.cc:
  Made change suggested by Serge. REmoved else in mysql_find_files so symlink files fall through to the wildcard check
2004-09-25 18:43:07 +02:00
ingo@mysql.com
e47decfa7f BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S).
BUG#4335 - one name can be handler open'ed many times.
Reworked the HANDLER functions and interface.
Using a HASH to store information on open tables that
survives FLUSH TABLE.
HANDLER tables alias names must now be unique, though it
is allowed in 4.0 to qualify them with the database name
of the base table.
2004-09-24 18:39:25 +02:00
guilhem@mysql.com
53d0daa3a0 Fix for BUG#3248 "Doc says MyISAM warns if disk full but it does not":
we force the message to the error log, and we make it more informative;
we treat EDQUOT like ENOSPC.
2004-09-24 11:54:37 +02:00
rburnett@build.mysql.com
de9a058bfe Bug #5539 SHOW DATABASES LIKE and symlinks
sql_show.cc:
  Added wild card check to symdir block in mysql_find_files
2004-09-24 09:00:14 +02:00
guilhem@mysql.com
c163a67a4d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-09-23 17:56:21 +02:00
guilhem@mysql.com
564b8edb45 Fix for BUG#5711 "replication SQL thread does not abort on SQL syntax error":
in net_printf(), we fill net->last_* variables for the slave SQL thread to know the error.
2004-09-23 14:43:31 +02:00
ram@gw.mysql.r18.ru
5cf8e9d769 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5415
2004-09-19 16:15:54 +05:00
ram@gw.mysql.r18.ru
62a42f7f57 A fix (Bug #5415: Table marked as crashed after DELETE queries). 2004-09-19 16:15:01 +05:00
konstantin@mysql.com
704e0968d2 Change www.mysql.com -> dev.mysql.com in a reference to
how to resolve stack trace documentation.
2004-09-19 14:48:41 +04:00
ingo@mysql.com
c6dc339647 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2831
2004-09-18 20:34:49 +02:00
ingo@mysql.com
7afb03b7ed bug#2831 - --extenral-locking does not fully work with --myisam-recover.
Changed the semantics of open_count so that it is decremented
at every unlock (if it was incremented due to data changes).
So it indicates a crash, if it is non-zero after a lock.
The table will then be repaired.
2004-09-18 20:33:39 +02:00
gluh@gluh.mysql.r18.ru
276622c92d Fix for bug #5595: NULLIF() IS NULL returns false if NULLIF() returns NULL 2004-09-18 13:06:44 +04:00
marko@hundin.mysql.fi
c03049dfd9 InnoDB: Corrected typos in DBUG_ statements 2004-09-17 17:16:02 +03:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
0b6dc49388 Bug#5553 - Multi table UPDATE IGNORE fails on dup key
We don't want the update to abort when IGNORE is specified
2004-09-17 12:07:59 +01:00
vva@eagle.mysql.r18.ru
e58c9579fe Fixed Bug #5492 "set @@session.read_rnd_buffer_size=33554432"
crashes server on query

incremented size of allocated buffer in the init_rr_cache(sql/records.cc)
(
We are going to read the last three bytes of the buffer via uint3korr
This macro reads actually 4 bytes (for speed)
So, we have to allocate one more byte at the end of the buffer 
to avoid memory assertion fault
)
2004-09-16 16:10:14 +05:00
ram@gw.mysql.r18.ru
e5a0524fe6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5498
2004-09-14 13:08:54 +05:00
heikki@hundin.mysql.fi
d6b4c4f90e row0mysql.h:
Improve the comment on stored_select_lock_type
ha_innodb.cc:
  Let InnoDB remember select_lock_type inside LOCK TABLES, also over plain consistent read SELECTs; fix Bug #5538 : assertion failure when using mysqldump with the -l option; in MERGING this patch to 4.1, there may be PROBLEMS; that is because previous patch was never merged to 4.1; Heikki Tuuri has to polish the code in 4.1 after this patch has been merged.
2004-09-13 19:05:39 +03:00
ram@gw.mysql.r18.ru
2488b827de A fix (bug #5498 TRIM fails with LEADING or TRAILING if remstr = str). 2004-09-13 14:25:43 +05:00
brian@brian-akers-computer.local
df461bdeab Updating the headers on a few files to include GPL header. 2004-09-08 18:26:19 -07:00
igor@rurik.mysql.com
9bafeecb24 Merge rurik.mysql.com:/home/igor/mysql-4.0
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2004-09-07 10:08:17 -07:00
guilhem@mysql.com
168e4c9c6b when we update thd->db in replication, it's safer to update thd->db_length too.
This does not fix any known bug, but is still a good idea.
2004-09-07 14:57:54 +02:00
jani@rhols221.adsl.netsonic.fi
e04e50b6b7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
2004-09-07 11:40:48 +03:00
jani@rhols221.adsl.netsonic.fi
56b4c31633 Fixed Bug#3645, "PROCEDURE ANALYSE() recommends illegal
FLOAT columns".
2004-09-07 11:40:27 +03:00
ram@gw.mysql.r18.ru
04fd903157 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2631
2004-09-07 12:53:12 +05:00
guilhem@mysql.com
de5d1e780e Fix of previous push. 2004-09-06 23:20:33 +02:00
guilhem@mysql.com
f25d3fca92 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0-opt
2004-09-06 22:47:50 +02:00
guilhem@mysql.com
99444c3311 Replacing class Disable_binlog by macros. Patch already approved by Monty. 2004-09-06 22:47:26 +02:00
guilhem@mysql.com
e2aca8cbea Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-09-06 22:30:58 +02:00
guilhem@mysql.com
01ad1bb569 Dependency fix. We observed that doing any change to class THD in sql_class.h resulted in mysqld going crazy (parsing errors,
query cache errors in query_cache.test). This is because sql_yacc.cc depends on several .h files but those were not listed in
the dependencies of sql_yacc.o. The present patch does fix the issue; but my auto*-expert colleagues may have a better one.
2004-09-06 22:30:16 +02:00
serg@serg.mylan
130d2fd57f bug#5389 merge.test fails on qnx - uninitalized variable in myrg_open() 2004-09-06 22:20:40 +02:00
paul@kite-hub.kitebird.com
38f462ae6f sql_yacc.yy:
Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
2004-09-03 10:56:55 -05:00