lars@mysql.com
26fae36137
BUG#9123: If a table name is given with an underscore,
...
then this must be properly quoted when sent to
SHOW TABLES LIKE ...
2005-03-15 16:23:02 +01:00
msvensson@neptunus.(none)
3f8a66cbea
Merged WL#2269 to mysql-5.0
2005-03-15 15:22:40 +01:00
monty@mysql.com
05acaf060c
Merge with global tree
2005-03-15 16:21:08 +02:00
monty@mysql.com
dd4db08438
Code cleanups during review of pushed code
2005-03-15 16:07:28 +02:00
msvensson@neptunus.(none)
2bdd710d3c
WL#2269 Enable query cache for NDB part 2
...
-This is mostly fixes for correct behaviour when using query cache + transactions + the thread that
fetches commit count from NDB at regular intervals. The major fix is to add a
list in thd_ndb, that keeps a list of NDB_SHARE's that were modified by
transaction and then "clearing" them in ndbcluster_commit.
2005-03-15 15:03:25 +01:00
konstantin@mysql.com
021f8d2170
Cleanup
2005-03-15 16:54:11 +03:00
bar@mysql.com
c6c887b990
# Bug#8785 Problem with nested concats and
...
character set conversion of a string constant.
2005-03-15 17:15:47 +04:00
marko@hundin.mysql.fi
cedaeb4b7c
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-15 14:48:09 +02:00
lenz@mysql.com
50a6dc4e71
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-03-15 13:48:08 +01:00
marko@hundin.mysql.fi
37905eea50
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-03-15 14:47:22 +02:00
lenz@mysql.com
49e7ca8364
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-03-15 13:47:21 +01:00
lenz@mysql.com
a5d1a98d69
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2005-03-15 13:44:55 +01:00
marko@hundin.mysql.fi
c5478c4f25
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-03-15 14:40:16 +02:00
joerg@mysql.com
281af2f9bc
Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX).
2005-03-15 12:40:28 +01:00
ramil@mysql.com
04328c3dfa
A fix (bug #8799 : Killed filesorts can fail inited==RND assertion in ha_rnd_end).
2005-03-15 15:32:11 +04:00
lenz@mysql.com
945aad6b49
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0
2005-03-15 12:28:43 +01:00
lenz@mysql.com
c7506fa5f9
- Build fix for Do-solaris-pkg: fixed package name matching regex to be satisfied with
...
"mysql-pro-gpl-cert" packages as well (thanks to Kent for the suggestion)
2005-03-15 12:27:44 +01:00
lenz@mysql.com
2714f176fb
Applied some changes to the mysql.server init script that are already shipped as an additional patch
...
in the 4.1.10a RPMs for SLES9/RHEL3:
- small improvement: use LSB functions to display startup success and failure, if available.
Fall back to more primitive builtin functions otherwise.
- joined two pieces of code performing the same functionality into one "wait_for_pid" function
- added a "reload" function (LSB requirement)
2005-03-15 12:23:14 +01:00
pekka@mysql.com
d8d8cf1f72
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2005-03-15 12:06:29 +01:00
pekka@mysql.com
23355a3c95
ndb - valgrind/compile fix Transporter.cpp: missing return
2005-03-15 12:01:41 +01:00
joerg@mysql.com
74708ae075
Avoid compilation error: On IRIX, identifiers with loop scope still need to be unique
...
at function level.
2005-03-15 11:55:27 +01:00
ramil@mysql.com
ec775b65f5
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b8799
2005-03-15 14:13:44 +04:00
joerg@mysql.com
ba8d7edb5f
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-03-15 11:12:55 +01:00
marko@hundin.mysql.fi
2729e866df
dict0load.c:
...
dict_load_table(): Remove unused label that was accidentally introduced
in a 4.0->4.1->5.0 merge.
2005-03-15 11:50:44 +02:00
ramil@mysql.com
46613bafbe
A fix (bug #8489 : Strange auto_increment behaviour with HEAP table).
2005-03-15 13:32:12 +04:00
marko@hundin.mysql.fi
6dba591d0b
After merge fixes
2005-03-15 11:22:20 +02:00
marko@hundin.mysql.fi
dd20809e32
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-15 11:14:57 +02:00
patg@krsna.
d0603db72a
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.:/home/patg/test/mysql-5.0
2005-03-15 00:36:38 -08:00
patg@krsna.
24bc862456
This changeset contains changes approved in code review by
...
Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully
tested on both my own workstation (Suse 9.0) and production.mysql.com.
2005-03-15 00:32:21 -08:00
sergefp@mysql.com
ce564b2d7f
Updated tests results for BUG#8510
2005-03-15 10:27:44 +03:00
heikki@hundin.mysql.fi
9967ee9d28
buf0flu.c:
...
Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user
2005-03-15 08:33:47 +02:00
sergefp@mysql.com
1e1a1b1f82
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug8510
2005-03-15 09:33:46 +03:00
sergefp@mysql.com
62465a98e2
Merge mysql.com:/home/psergey/mysql-4.1-bug8510
...
into mysql.com:/home/psergey/mysql-5.0-bug8510
2005-03-15 09:29:54 +03:00
paul@snake-hub.snake.net
d5296c39eb
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
2005-03-14 20:22:15 -06:00
paul@snake-hub.snake.net
4db8986006
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1
2005-03-14 19:59:59 -06:00
paul@snake-hub.snake.net
4af3c8a23a
mysql.1.in:
...
Fix path that needs no parameterization.
2005-03-14 19:59:00 -06:00
sergefp@mysql.com
e7e2a8c8eb
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug8510
2005-03-15 04:09:41 +03:00
konstantin@mysql.com
6a2ef5577c
WL#926 "AVG(DISTINCT) and other distincts", part 2 (out of 3): clean up
...
Item_sum_count_distinct, and
deploy Unique for use with COUNT(DISTINCT) if there is no blob
column in the list of DISTINCT arguments.
2005-03-15 03:46:19 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
98e83555a5
Merge 4.1 - 5.0
2005-03-15 01:14:59 +02:00
reggie@mdk10.(none)
75e1b9e765
Bug #6660 mysqldump creates bad pathnames on Windows
...
This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows. However, this patch fixes the bug in mysqldump.c
mysqldump.c:
Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows
2005-03-14 16:47:35 -06:00
serg@serg.mylan
57adc4d740
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-14 20:45:10 +01:00
serg@serg.mylan
f04bef8faf
merged
2005-03-14 18:46:30 +01:00
serg@serg.mylan
3613f8c262
sql/log.cc
...
don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs
sql/sql_repl.cc
clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave
2005-03-14 17:53:24 +01:00
gluh@gluh.mysql.r18.ru
354a93842f
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-14 19:47:46 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
9ec8d87328
Updated error message to be more informative. Previous error message
...
"Access denied to database mysql" was actually not just misleading, but
also wrong.
Bug#7905.
2005-03-14 16:59:09 +02:00
mskold@mysql.com
f2db341abe
Removed unnecessary current_thd
2005-03-14 15:53:44 +01:00
gluh@gluh.mysql.r18.ru
ee434e5cc9
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-14 17:27:10 +03:00
mskold@mysql.com
7092c7dec2
WL#2353 EXPLAIN support for condition pushdown
2005-03-14 15:26:10 +01:00
serg@serg.mylan
dba1e0889a
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-14 14:47:51 +01:00
mskold@bk-internal.mysql.com
ca3391c7e7
Removed files that disabled ndb tests
2005-03-14 12:27:02 +01:00