Commit graph

19910 commits

Author SHA1 Message Date
acurtis@pcgem.rdg.cyberkinetica.com
fdee674124 Merge Bug#7310 from 4.0 2005-02-04 17:33:53 +00:00
tulin@mysql.com
d017a604fe Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-04 17:32:18 +01:00
kent@mysql.com
d1abda58b3 mysql-test-run.sh:
USE_RUNNING_SERVER should be set to 0 or 1
2005-02-04 17:24:18 +01:00
serg@serg.mylan
fab6f51faa Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-04 17:15:09 +01:00
hf@deer.(none)
40fe0b3971 Embedded version of test fixed 2005-02-04 19:12:15 +04:00
serg@serg.mylan
47f354bca7 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-04 15:31:39 +01:00
marko@hundin.mysql.fi
6c43fb504b InnoDB: Exclude code from InnoDB Hot Backup builds
by adding #ifndef UNIV_HOTBACKUP and adjusting some function
declarations.
2005-02-04 16:25:13 +02:00
serg@serg.mylan
cc1ee6475f indexless boolean fulltext search was depending on default_charset_info - Bug#8159
ftbw->off wasn't cleared on reinit - Bug#8234
2005-02-04 15:24:06 +01:00
marko@hundin.mysql.fi
96bbd613c9 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-02-04 16:13:46 +02:00
msvensson@neptunus.homeip.net
c9d7cd043b Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
2005-02-04 15:13:45 +01:00
msvensson@neptunus.homeip.net
94978c214a Updated after review. 2005-02-04 15:08:08 +01:00
marko@hundin.mysql.fi
bf5cacf85f InnoDB: A small cleanup: remove two duplicate rec_get_offsets() calls 2005-02-04 15:44:09 +02:00
tulin@mysql.com
2339b328fc ha_ndbcluster.cc:
fixed change in struct in 4.1->5.0 merge
2005-02-04 14:33:08 +01:00
mats@mysql.com
f6caefef2d Bug#7853 (mysqlbinlog does not accept input from stdin)
The utility 'mysqlbinlog' now accepts input from stdin. It can 
  now be used to read the output from, e.g., 'zcat' or other utility.
2005-02-04 14:29:54 +01:00
mysqldev@mysql.com
753ea29f86 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-04 14:29:52 +01:00
mysqldev@mysql.com
e09f50d752 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-04 14:29:46 +01:00
mysqldev@mysql.com
abf7837fbb resolved merge conflict 2005-02-04 14:27:09 +01:00
tomas@poseidon.ndb.mysql.com
27a69e573a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-04 14:27:08 +01:00
tomas@poseidon.ndb.mysql.com
7fd685ffe8 added test to trigger drifferent fragmentations in ndb
corrected documentation on fragmentation
    set "fragmentation medium" to mean 2 fragments per node instead of 1
    set default fragmentation to small instead of medium
    bug#8284 adjust fragmentation to max_rows
2005-02-04 14:25:08 +01:00
gluh@gluh.mysql.r18.ru
b0bf195064 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
2005-02-04 16:24:00 +03:00
guilhem@mysql.com
bb37aab73a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-02-04 13:55:08 +01:00
guilhem@mysql.com
cb23d3d064 Proposal to fix this problem: when using libmysqlclient, you must call mysql_server_end() to nicely free memory at the end of your program; it however
sounds weird to call a function named *SERVER_end* when you're the CLIENT (you're not ending the server, you're ending your ability to talk to servers).
So here I add two defines which should be more generic names. This was longly discussed with Konstantin, Serg, Brian. The problem started from
a post on valgrind-users list: http://sourceforge.net/mailarchive/forum.php?thread_id=5778035&forum_id=32038 ; our manual mentions these functions
only for libmysqld API so needs some fixing, and then we can close BUG#8099 and BUG#6149.
2005-02-04 13:53:16 +01:00
gluh@gluh.mysql.r18.ru
e9ce96c5cd Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
2005-02-04 15:47:12 +03:00
gluh@gluh.mysql.r18.ru
34915f7a91 A fix: bug#6931: Date Type column problem when using UNION-Table
bug#7833:  Wrong datatype of aggregate column is returned
2005-02-04 15:31:36 +03:00
ramil@mysql.com
0d7228fff2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1
2005-02-04 15:53:14 +04:00
ramil@mysql.com
f76ccd63cb type_float.result.es updated. 2005-02-04 15:35:08 +04:00
timour@mysql.com
922084c1ec Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/timka/mysql/src/4.1-virgin
2005-02-04 12:39:59 +02:00
ramil@mysql.com
2442a2d729 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-02-04 14:39:36 +04:00
ramil@mysql.com
f271a75414 type_ranges.result.es updated. 2005-02-04 14:35:56 +04:00
kent@mysql.com
68aefd155c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-04 11:00:34 +01:00
ramil@mysql.com
611e0e3e82 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/usr/home/ram/work/4.0
2005-02-04 13:59:13 +04:00
timour@mysql.com
e6150c7289 Merge mysql.com:/home/timka/mysql/src/4.1-dbg
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
2005-02-04 11:58:59 +02:00
msvensson@neptunus.homeip.net
e54ea9189d Merge of query cache from 4.1 to 5.0 2005-02-04 10:56:53 +01:00
ramil@mysql.com
7a00d082cf Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-02-04 13:55:13 +04:00
ramil@mysql.com
e8ed450e15 type_float.result.es updated 2005-02-04 13:51:37 +04:00
gluh@gluh.mysql.r18.ru
11435fdfad Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-04 12:37:18 +03:00
pekka@mysql.com
8e4fca2a55 Merge 2005-02-04 10:35:09 +01:00
kent@mysql.com
b436e0fa8c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-04 08:59:58 +01:00
sergefp@mysql.com
38339e1c51 Fix for BUG#7716: in in_string::set() take into account that the value returned
by item->val_str() may be a substring of the passed string. 
Disallow string=its_substring assignment in String::operator=().
2005-02-04 09:14:22 +03:00
joreland@mysql.com
fcdbaf1071 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-04 06:10:56 +01:00
joreland@mysql.com
58e336764a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-04 06:09:43 +01:00
jimw@mysql.com
f32c61fbaf Handle backslashes correctly in strings that also have doubled quotes when
we are using the NO_BACKSLASH_ESCAPES SQL mode. (Bug #6368)
2005-02-03 16:14:02 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
9eacf61dcb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057
2005-02-03 23:41:58 +00:00
jimw@mysql.com
c2f3764ddc Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-03 15:41:07 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
b823638f38 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug6726
2005-02-03 23:14:47 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
d794406f64 Bug#6726 - failure to parse NOT BETWEEN
Fix and test for parse bug
2005-02-03 23:08:43 +00:00
pekka@mysql.com
a802291474 ndb - sol9x86: cc -xO3: fix optimizer error. 2005-02-03 23:56:13 +01:00
jimw@mysql.com
183d1327f0 Copy *.result.es files for binary distribution so embedded tests can be run 2005-02-03 14:21:16 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
1cb1dcb0f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057
2005-02-03 21:16:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b8ceaa4a1f Bug#8057
Fix crash with LAST_INSERT_ID() in UPDATE,
  Tests included,
2005-02-03 21:11:12 +00:00