reggie@mdk10.(none)
cb4553b774
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-03-15 16:34:14 -06:00
reggie@mdk10.(none)
3bfcc5dd75
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-03-15 16:28:47 -06:00
reggie@mdk10.(none)
6c00af77a0
Bug #6660 mysqldump creates bad pathnames on Windows
...
sql_show.cc:
changed strdup to thd->memdup per Serg's advice
2005-03-15 16:24:37 -06:00
mskold@mysql.com
d40e154353
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-15 22:20:57 +01:00
mskold@mysql.com
057d78650e
Fix for bug#9166: Cluster compile failure on Solaris 10
2005-03-15 22:19:55 +01:00
petr@mysql.com
b5726acf93
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/im-fix-review
2005-03-15 23:21:49 +03:00
petr@mysql.com
28bf536411
IM setup patch. Enable IM instead of mysqld_safe in start/stop script.
...
Alter RPM to include mysqlmanger binary and config files.
2005-03-15 22:51:13 +03:00
kent@mysql.com
5749c537ed
mysql-test-run.sh:
...
Added feature to disable tests from a list in a file "disabled.def"
Moved down the code that disables, so that --do-test and --start-from
don't list the disabled tests not in range.
disabled.def:
List of test cases to temporarely disable
2005-03-15 19:48:42 +01:00
jimw@mysql.com
0a100d7464
Add support for showing table type to mysqlshow command. (Bug #5036 )
2005-03-15 10:46:43 -08:00
gluh@gluh.mysql.r18.ru
7a94c8c3e3
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-15 20:58:54 +03:00
gluh@gluh.mysql.r18.ru
fcd50af3c7
Fix for bug #8790:Test 'information_schema': 'Max_data_length' shows 10 * (2 giga - 1) + 9
2005-03-15 20:54:44 +03:00
serg@serg.mylan
ed9c9732c9
sun forte does not define __sun__, only __sun and sun (gcc defines all the three)
2005-03-15 18:45:29 +01:00
reggie@mdk10.(none)
aa395b3a45
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-03-15 11:42:31 -06:00
reggie@mdk10.(none)
ef86c0af65
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-03-15 11:37:14 -06:00
serg@serg.mylan
caa29b4776
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-15 18:33:43 +01:00
reggie@mdk10.(none)
887f2a53fe
Bug #6660 mysqldump creates bad pathnames on Windows
...
This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem. With this patch, data directory and index directory will use only forward slashes (/) when on Windows.
mysqldump.c:
Removed fixPaths routine. Was improper fix for bug #6660
sql_show.cc:
Changed append_directory to convert backslashes to foward slashes when on Windows.
2005-03-15 11:33:06 -06:00
serg@serg.mylan
10c06f257a
include/my_global.h
...
define _XOPEN_SOURCE=500 for solaris
include/my_sys.h
remove a cast
2005-03-15 18:31:56 +01:00
ramil@mysql.com
3f6fdabe4f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0
2005-03-15 20:06:37 +04:00
ramil@mysql.com
4ee9cc5a98
after merge fix
2005-03-15 19:43:32 +04:00
ramil@mysql.com
d5e3ba70f3
merging
2005-03-15 19:31:52 +04:00
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