Commit graph

22301 commits

Author SHA1 Message Date
pem@mysql.comhem.se
281c0a8130 Fixed BUG#8408: Stored procedure crash if function contains SHOW
We simply have to disallow any kind of result set being sent back
  from a function. Can't see any way to make that to work.
2005-04-26 17:31:59 +02:00
jimw@mysql.com
fcc04b2ffd Merge changes to acinclude.m4 that are now in config/ac-macros/misc.m4 2005-04-26 08:23:42 -07:00
jimw@mysql.com
ef5ad50ccc Merge mysql.com:/home/jimw/my/mysql-4.1-9063
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-04-26 08:20:51 -07:00
jimw@mysql.com
a296ccfd28 Fix typo in include file name (Bug #9063) 2005-04-26 08:20:00 -07:00
heikki@hundin.mysql.fi
f12cd8c708 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-26 17:57:15 +03:00
ramil@mysql.com
5624641cb0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b9489
2005-04-26 19:57:15 +05:00
jani@ua141d10.elisa.omakaista.fi
005c447183 Added a check for config-file. 2005-04-26 17:57:14 +03:00
jani@ua141d10.elisa.omakaista.fi
cdda50acbb Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-04-26 17:47:19 +03:00
ramil@mysql.com
db2b729c73 A fix (bug #10176: problem with varchar keys). 2005-04-26 19:46:52 +05:00
jani@ua141d10.elisa.omakaista.fi
c98b90bbfb Fixed Bug#9834, "mysqld_multi --config-file parameter requires
absolute path".
2005-04-26 17:46:43 +03:00
gbichot@quadita2.mysql.com
bc7856cd1e Merge quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-04-26 16:09:04 +02:00
gbichot@quadita2.mysql.com
a95571875c checking that statements get into binlog even when they were affecting
no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).
2005-04-26 15:52:04 +02:00
jani@ua141d10.elisa.omakaista.fi
d4d0f9c126 Fixed Bug#6221, "mysqld_multi doesn't read the init_connect
option in my.cnf correctly"
2005-04-26 16:16:38 +03:00
jani@ua141d10.elisa.omakaista.fi
a82c7bea66 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-04-26 14:29:20 +03:00
jani@ua141d10.elisa.omakaista.fi
7810721f40 Fixed Bug#9835: mysqld_multi --help won't output help if there are
parameter problems.
2005-04-26 14:28:22 +03:00
joerg@mysql.com
74fdb2663c Final fix for NPTL configuration (bug#2173, bug#5871, and bug#9497). 2005-04-26 13:15:20 +02:00
ramil@mysql.com
cfa24e3d64 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-04-26 16:02:17 +05:00
jani@ua141d10.elisa.omakaista.fi
0ca934de63 Improved client internal help.
Doc fix for Bug#9870.
2005-04-26 14:02:16 +03:00
ramil@mysql.com
12d14eb96c Test case (bug #9756: mysql client failing on dumps containing certain \ sequences). 2005-04-26 15:48:16 +05:00
ramil@mysql.com
7882cd32bc A fix (bug #9756: mysql client failing on dumps containing certain \ sequences). 2005-04-26 15:43:20 +05:00
joerg@mysql.com
1523119091 Post-merge fix of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497). 2005-04-26 12:16:12 +02:00
joerg@mysql.com
49ac2dac3e Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
Post-merge fix will follow.
2005-04-26 12:03:37 +02:00
msvensson@neptunus.(none)
8d370fbcf9 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
- Implemented ha_archive::rename_table
 - Added testcases for rename
2005-04-26 11:35:52 +02:00
jimw@mysql.com
93ff028f9d Fix compile issues in Intel C/C++ compiler (Bug #9063) 2005-04-25 18:02:03 -07:00
sergefp@mysql.com
b890c05b4d Merge 5.0-build -> 5.0 : keep NDB_VERSION_BUILD=6 2005-04-26 02:24:37 +04:00
sergefp@mysql.com
a27e830385 BUG#10037: A proper fix: Add 0.01 to cost of 'range' scans, don't add 0.01 to cost of the 'index' scan. 2005-04-26 01:56:10 +04:00
reggie@mdk10.(none)
a22ec942ac regerror.c:
Changed function signature to fix compile errors with Whidbey
2005-04-25 16:53:47 -05:00
lenz@mysql.com
83c289665f - fixed NDB_VERSION_BUILD in configure.in to have the correct number (4->5) 2005-04-25 13:28:07 +02:00
lenz@mysql.com
83978acd5a - update NDB_VERSION_BUILD, too 2005-04-25 13:18:44 +02:00
lenz@mysql.com
cd10a69be2 - bumped up version number in configure.in to 5.0.6 now that engineering branched off for the 5.0.5 builds
- tagged ChangeSet 1.1882 as the "clone-5.0.5-build" branchoff point
2005-04-25 12:58:03 +02:00
msvensson@neptunus.(none)
e0edc9a630 BUG#2596 MySQL Client Segmentation Fault on Solaris 9
- Print readline or libedit version
2005-04-25 12:05:13 +02:00
joreland@mysql.com
ab7446d75a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 12:02:34 +02:00
joreland@mysql.com
004ec3838d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 11:59:50 +02:00
joreland@mysql.com
280bef1845 bug#9749 - ndb lock upgrade
post review fix.
  don't init hash value on restart operations
  make sure that lock mode is correct in entire que.
2005-04-25 11:59:00 +02:00
mskold@mysql.com
1589bdf3dc Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-25 11:55:27 +02:00
mskold@mysql.com
93498bdf5a Post review fix of ndbcluster_drop_database, typo 2005-04-25 11:54:00 +02:00
mskold@mysql.com
2fd313de2f Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-25 11:47:39 +02:00
mskold@mysql.com
4649d5c30f Post review fix of ndbcluster_drop_database, print error 2005-04-25 11:34:47 +02:00
mskold@mysql.com
3a9af0553b Post review fix of ndbcluster_drop_database 2005-04-25 11:31:16 +02:00
dlenev@mysql.com
814d4bf3e8 Merge mysql.com:/home/dlenev/src/mysql-4.1-bg10040
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-04-25 11:35:30 +04:00
dlenev@mysql.com
71c7c0d341 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg10040
2005-04-25 11:26:20 +04:00
dlenev@brandersnatch.localdomain
a4a4c5cb69 Fix for func_sapdb failures on 64-bit platforms (aka Bug #10040
"'func_sapdb' fails on 64bit build hosts")
2005-04-25 11:25:40 +04:00
joreland@mysql.com
b57eab4377 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 08:44:05 +02:00
joreland@mysql.com
12e0d4f588 ndb - autotest
add more tests to verify correctness of backups
2005-04-25 08:43:16 +02:00
joreland@mysql.com
c4d44841c4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 08:38:28 +02:00
joreland@mysql.com
763d835a3c bug#9924 - ndb backup
remove incorrect assertion
2005-04-25 08:35:18 +02:00
sergefp@mysql.com
db6cc1ed17 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8490-2
2005-04-25 04:25:32 +04:00
guilhem@mysql.com
fd4b0af169 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-04-24 22:39:42 +02:00
guilhem@mysql.com
3022cbc60c Informing of deprecation of mysql_tableinfo by INFORMATION_SCHEMA (and
I'm thinking of removing the script in 5.1).
2005-04-24 22:37:43 +02:00
joreland@mysql.com
e1e050432d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-24 20:38:53 +02:00