unknown
14c99fccc9
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
sql/mysqld.cc:
Auto merged
2004-07-27 12:44:15 +03:00
unknown
2bd64bde34
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/orca/space/pekka/ndb/version/my41-blobs
2004-07-27 10:32:08 +02:00
unknown
cd10133261
NdbSqlUtil.cpp, NdbSqlUtil.hpp:
...
add NdbSqlUtil::cmp for missing datatypes
ndb/include/util/NdbSqlUtil.hpp:
add NdbSqlUtil::cmp for missing datatypes
ndb/src/common/util/NdbSqlUtil.cpp:
add NdbSqlUtil::cmp for missing datatypes
2004-07-27 10:31:10 +02:00
unknown
5fbf11ba9b
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb
ndb/test/ndbapi/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
2004-07-27 09:59:26 +02:00
unknown
e4668ff1d2
testOIBasic
...
Make sure not to fiddle with state, if not waiting for scan
ndb/src/ndbapi/Ndbif.cpp:
Make sure not to fiddle with state, if not waiting for scan
2004-07-27 01:01:16 +02:00
unknown
b66a13eeb8
safemalloc always resets the free'd memory, not only when PEDANTIC_SAFEMALLOC
2004-07-26 21:33:42 +02:00
unknown
2d667dc37f
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
2004-07-26 17:42:14 +03:00
unknown
d2aaa0f817
Added info about new --log-warnings option.
2004-07-26 17:41:52 +03:00
unknown
0c6d41a86e
tux - remove obsolete signals tux->tup
...
BitKeeper/deleted/.del-TupAccess.cpp~5273de82afd8d7d0:
Delete: ndb/src/common/debugger/signaldata/TupAccess.cpp
BitKeeper/deleted/.del-TupAccess.hpp~a9b722c1d6fa1442:
Delete: ndb/include/kernel/signaldata/TupAccess.hpp
2004-07-26 12:35:05 +02:00
unknown
c1f273a6c1
- typo fix: protocoll -> protocol
2004-07-26 12:32:04 +02:00
unknown
a0f0f3853a
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-26 08:37:33 +03:00
unknown
f6457ce5be
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/irix
2004-07-26 00:58:23 +02:00
unknown
5ed830f694
tux optim 13 - replace read keys & query th signals tux->tup by methods
2004-07-25 16:41:11 +02:00
unknown
108864ed3b
WL#1518, "make bundled zlib usable for unix builds":
...
required autotools macro written and deployed in all apropriate Makefile.ams.
Use cases checked:
- linux, standard location of zlib, no ndb
- linux, standard locatoin of zlib, with ndb
- linux, non-standard location of zlib, no ndb
- hpux11, use of bundled zlib, no ndb
The only non-checked case is non-standard location of zlib (or use of bundled
zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts
like AIX52 or HPUX11, where such a check is possible. It didn't compile
there before as these systems dont't have installed zlib, so nothing got broken ;)
Makefile.am:
WL#1518 "make bundled zlib usable for unix builds", part 2:
- zlib dir should be built only if there is no system zlib available;
with introducing of DIST_SUBDIRS goal, os2, BUILD and SSH now only entered
if make dist
acinclude.m4:
WL#1518, "make bundled zlib usable for unix builds":
- actual implementation of the check for various zlib usage options
configure.in:
WL#1518, "make bundled zlib usable for unix builds":
- MYSQL_CHECK_ZLIB_WITH_COMPRESS deployed
libmysql/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
libmysql_r/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
libmysqld/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
myisam/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib binary dir added
mysys/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
sql/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir and library dir added
tools/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
- copyright added
2004-07-24 03:30:11 -07:00
unknown
2be1b5cf6a
Final touch: add compile-hpux11-parisc2-aCC to source distribution
2004-07-23 23:02:57 -07:00
unknown
d1aa16979a
A small fix to let building of debug versions on HP-UX11
2004-07-23 20:28:54 -07:00
unknown
54f425198b
BUILD/compile-hpux11-parisc2-aCC: a handy script to compile on HP-UX11
2004-07-23 20:21:49 -07:00
unknown
886522e4ff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-warnings
2004-07-23 18:52:42 -07:00
unknown
cc20f757a7
All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
...
Use of acconfig.h is deprecated in modern autotools (a cleaner patch).
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
Delete: acconfig.h
acinclude.m4:
All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
Use of acconfig.h is deprecated in modern autotools.
configure.in:
All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
Use of acconfig.h is deprecated in modern autotools.
2004-07-23 18:52:25 -07:00
unknown
129bc589e1
Fix for stored procedures BUG#4726: Stored procedure crash when looping over SELECT with complex WHERE's.
...
sql/sql_prepare.cc:
Cleanup cond items too. (Fix for stored procedures.)
2004-07-23 18:42:24 +02:00
unknown
929d1a1616
Bug #4555 ALTER TABLE crashes mysqld with enum column collated utf8_unicode_ci
2004-07-23 19:10:06 +05:00
unknown
410c7b3323
Fixed merge problems, optimized bulk insert
2004-07-23 15:46:56 +02:00
unknown
6c73e4d98c
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/space/pekka/ndb/version/my41-tux
2004-07-23 14:16:08 +02:00
unknown
9d670dfab5
sql_db.cc:
...
mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
Bug#4646
sql/sql_db.cc:
mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
Bug#4646
2004-07-23 17:11:45 +05:00
unknown
9628ff1a8e
ha_ndbcluster.cc:
...
merge
sql/ha_ndbcluster.cc:
merge
2004-07-23 13:41:38 +02:00
unknown
d5ff3eca53
Merge
...
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster.cc:
merge
2004-07-23 13:27:26 +02:00
unknown
a3b71309d7
ha_ndbcluster.cc:
...
ndb_supported_type, include all types in switch
sql/ha_ndbcluster.cc:
ndb_supported_type, include all types in switch
2004-07-23 13:21:39 +02:00
unknown
206cc88b69
Changed bulk insert to only be statement wise
2004-07-23 13:13:50 +02:00
unknown
3cf19c3af5
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1
2004-07-23 10:40:27 +02:00
unknown
564b2736a4
Fixes after code review of WL#1791 Handler: support update of primary key
2004-07-23 10:33:51 +02:00
unknown
fea015fff0
Add include of signal.h to Emulator.cpp
...
ndb/src/kernel/vm/Emulator.cpp:
Added signal.h to include header for signal
2004-07-23 10:32:23 +02:00
unknown
25a54005ae
Cosmetic fix
2004-07-22 19:14:05 +02:00
unknown
cf4cfab216
WL#1791 Handler: support update of primary key
2004-07-22 18:35:51 +02:00
unknown
8efee937c9
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/space/pekka/ndb/version/my41-tux
2004-07-22 13:16:02 +02:00
unknown
d1e7ef7927
ha_ndb blobs 2
2004-07-22 12:38:09 +02:00
unknown
9864327a61
ha_ndb blobs
2004-07-22 12:33:14 +02:00
unknown
e2145c1e79
Added missing error message to estonian/errmsg.txt.
...
sql/share/estonian/errmsg.txt:
Added missing error message.
2004-07-22 11:32:12 +02:00
unknown
0ac2de0163
Adding *.hpp files for testScan and testScanInterpreter to sources
...
Removing old directories for test/ using bk rmdir
BitKeeper/deleted/.del-Makefile~14c4cd8063f58fea:
Delete: ndb/test/ndbapi/bank/old_dirs/bankTimer/Makefile
BitKeeper/deleted/.del-Makefile~82b2fd7fe466962:
Delete: ndb/test/ndbapi/bank/old_dirs/bankMakeGL/Makefile
BitKeeper/deleted/.del-Makefile~95fdc210ddf553f6:
Delete: ndb/test/ndbapi/bank/old_dirs/bankSumAccounts/Makefile
BitKeeper/deleted/.del-Makefile~96d101a498089452:
Delete: ndb/test/ndbapi/bank/old_dirs/bankCreator/Makefile
BitKeeper/deleted/.del-Makefile~e4bdeda89cd7e97a:
Delete: ndb/test/ndbapi/bank/old_dirs/bankTransactionMaker/Makefile
BitKeeper/deleted/.del-Makefile~1e0c3a31ef7c20c:
Delete: ndb/test/ndbapi/bank/old_dirs/src/Makefile
BitKeeper/deleted/.del-Makefile~3766e52c58c4799a:
Delete: ndb/test/ndbapi/bank/old_dirs/testBank/Makefile
BitKeeper/deleted/.del-Makefile~eb4584f8f3d806a8:
Delete: ndb/test/ndbapi/bank/old_dirs/bankValidateAllGLs/Makefile
ndb/test/ndbapi/Makefile.am:
Adding *.hpp files for testScan and testScanInterpreter to sources
2004-07-22 09:37:55 +02:00
unknown
1224c0ecd6
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-22 08:56:23 +03:00
unknown
fff5b17961
a line left from manual merge removed
2004-07-21 19:20:22 -07:00
unknown
9fe0a2fa8d
First step of implementation of WL#1518 "make bundled zlib
...
usable for unix builds": zlib 1.2.1 imported
BitKeeper/deleted/.del-Make_vms.com~95dd9cc7505c3153:
Delete: zlib/Make_vms.com
BitKeeper/deleted/.del-Makefile.riscos~f85c6493d3e51733:
Delete: zlib/Makefile.riscos
BitKeeper/deleted/.del-Makefile.pup~b0e9ed99224cc5f4:
Delete: zlib/amiga/Makefile.pup
BitKeeper/deleted/.del-Makefile.sas~be103e936c85b66a:
Delete: zlib/amiga/Makefile.sas
BitKeeper/deleted/.del-README.contrib~2924ba28ef1f9fab:
Delete: zlib/contrib/README.contrib
BitKeeper/deleted/.del-gvmat32.asm~edf721a2de30e964:
Delete: zlib/contrib/asm386/gvmat32.asm
BitKeeper/deleted/.del-visual-basic.txt~859fcbcb668ffbb3:
Delete: zlib/contrib/visual-basic.txt
BitKeeper/deleted/.del-gvmat32c.c~2e97d7d65dd59113:
Delete: zlib/contrib/asm386/gvmat32c.c
BitKeeper/deleted/.del-mkgvmt32.bat~5a92cf0febe3dc81:
Delete: zlib/contrib/asm386/mkgvmt32.bat
BitKeeper/deleted/.del-zlibvc.def~67961fa7815b9267:
Delete: zlib/contrib/asm386/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp~a3323c77bcd12995:
Delete: zlib/contrib/asm386/zlibvc.dsp
BitKeeper/deleted/.del-match.s~51b8fef5136642ed:
Delete: zlib/contrib/asm586/match.s
BitKeeper/deleted/.del-readme.586~cb1bb7136b0803bb:
Delete: zlib/contrib/asm586/readme.586
BitKeeper/deleted/.del-zlibvc.dsw~e3dca9d8f342e64e:
Delete: zlib/contrib/asm386/zlibvc.dsw
BitKeeper/deleted/.del-match.s~e4bbe1fa486d1c6c:
Delete: zlib/contrib/asm686/match.s
BitKeeper/deleted/.del-readme.686~98a220c13809fce5:
Delete: zlib/contrib/asm686/readme.686
BitKeeper/deleted/.del-zlib.mak~70f7c5f6947fd807:
Delete: zlib/contrib/delphi/zlib.mak
BitKeeper/deleted/.del-d_zlib.bpr~cefb1beee520d6e8:
Delete: zlib/contrib/delphi2/d_zlib.bpr
BitKeeper/deleted/.del-d_zlib.cpp~62dff1931881afa6:
Delete: zlib/contrib/delphi2/d_zlib.cpp
BitKeeper/deleted/.del-zlibdef.pas~780244c8d12b6c53:
Delete: zlib/contrib/delphi/zlibdef.pas
BitKeeper/deleted/.del-readme.txt~8222e54ca00f2729:
Delete: zlib/contrib/delphi2/readme.txt
BitKeeper/deleted/.del-zlib.bpg~fbd9308275ad8e3:
Delete: zlib/contrib/delphi2/zlib.bpg
BitKeeper/deleted/.del-zlib.bpr~fe8bf5d1c4a2ce5a:
Delete: zlib/contrib/delphi2/zlib.bpr
BitKeeper/deleted/.del-zlib.cpp~bb0c3df062410f5c:
Delete: zlib/contrib/delphi2/zlib.cpp
BitKeeper/deleted/.del-zlib.pas~1d5285e2449b50a3:
Delete: zlib/contrib/delphi2/zlib.pas
BitKeeper/deleted/.del-zlib32.bpr~c2a9f0aa47a1d9ad:
Delete: zlib/contrib/delphi2/zlib32.bpr
BitKeeper/deleted/.del-test.cpp~4480297b204dc360:
Delete: zlib/contrib/iostream/test.cpp
BitKeeper/deleted/.del-zfstream.cpp~943ecbd558e86dde:
Delete: zlib/contrib/iostream/zfstream.cpp
BitKeeper/deleted/.del-zlib32.cpp~bbb4a200d2fe6497:
Delete: zlib/contrib/delphi2/zlib32.cpp
BitKeeper/deleted/.del-ChangeLogUnzip~a3ae0ba899cadd:
Delete: zlib/contrib/minizip/ChangeLogUnzip
BitKeeper/deleted/.del-zfstream.h~71ee057bdc6366ac:
Delete: zlib/contrib/iostream/zfstream.h
BitKeeper/deleted/.del-zstream.h~a6f6be5634962c81:
Delete: zlib/contrib/iostream2/zstream.h
BitKeeper/deleted/.del-zstream_test.cpp~e471b51e7fb553ec:
Delete: zlib/contrib/iostream2/zstream_test.cpp
BitKeeper/deleted/.del-miniunz.c~9da181975b3a48:
Delete: zlib/contrib/minizip/miniunz.c
BitKeeper/deleted/.del-minizip.c~4a49a0addb97272b:
Delete: zlib/contrib/minizip/minizip.c
BitKeeper/deleted/.del-readme.txt~174eb00680149f6b:
Delete: zlib/contrib/minizip/readme.txt
BitKeeper/deleted/.del-unzip.c~662c5ba4edbb3a19:
Delete: zlib/contrib/minizip/unzip.c
BitKeeper/deleted/.del-unzip.def~8a0ad6f745ee5cd4:
Delete: zlib/contrib/minizip/unzip.def
BitKeeper/deleted/.del-unzip.h~d5e800088a368c32:
Delete: zlib/contrib/minizip/unzip.h
BitKeeper/deleted/.del-zip.c~9750c19a123f3057:
Delete: zlib/contrib/minizip/zip.c
BitKeeper/deleted/.del-zip.def~4ffe888e9fd7b5aa:
Delete: zlib/contrib/minizip/zip.def
BitKeeper/deleted/.del-zip.h~4c72b8fcc492f055:
Delete: zlib/contrib/minizip/zip.h
BitKeeper/deleted/.del-zlibvc.def~dd272b3ed71647ba:
Delete: zlib/contrib/minizip/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp~ad83fb048811e2d2:
Delete: zlib/contrib/minizip/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw~c66b33a2d52f37c5:
Delete: zlib/contrib/minizip/zlibvc.dsw
BitKeeper/deleted/.del-makefile.w32~6507530fa1b017c:
Delete: zlib/contrib/untgz/makefile.w32
BitKeeper/deleted/.del-untgz.c~4e8f1a3a2c145373:
Delete: zlib/contrib/untgz/untgz.c
BitKeeper/deleted/.del-Makefile.os2~8ab058477b24d1ff:
Delete: zlib/os2/Makefile.os2
BitKeeper/deleted/.del-zlib.def~385b56ed82784ff3:
Delete: zlib/os2/zlib.def
BitKeeper/deleted/.del-Makefile.b32~10ffaac6cc41847a:
Delete: zlib/msdos/Makefile.b32
BitKeeper/deleted/.del-Makefile.bor~121b2bc837b6367:
Delete: zlib/msdos/Makefile.bor
BitKeeper/deleted/.del-Makefile.dj2~a069623cad6ce7f4:
Delete: zlib/msdos/Makefile.dj2
BitKeeper/deleted/.del-Makefile.emx~11a9e6c8a719ba60:
Delete: zlib/msdos/Makefile.emx
BitKeeper/deleted/.del-Makefile.msc~ba5ad7709ff22aab:
Delete: zlib/msdos/Makefile.msc
BitKeeper/deleted/.del-Makefile.tc~d1398368648e8836:
Delete: zlib/msdos/Makefile.tc
BitKeeper/deleted/.del-Makefile.w32~921a473e873d94d1:
Delete: zlib/msdos/Makefile.w32
BitKeeper/deleted/.del-Makefile.wat~b2b51cbc2c2bc2f4:
Delete: zlib/msdos/Makefile.wat
BitKeeper/deleted/.del-zlib.def~189fba701e5e4b9c:
Delete: zlib/msdos/zlib.def
BitKeeper/deleted/.del-zlib.rc~e5ce22c7c915ec00:
Delete: zlib/msdos/zlib.rc
BitKeeper/deleted/.del-Makefile.emx~b5fa0633cbe6fe01:
Delete: zlib/nt/Makefile.emx
BitKeeper/deleted/.del-Makefile.gcc~7fcd3dd326341fa0:
Delete: zlib/nt/Makefile.gcc
BitKeeper/deleted/.del-Makefile.nt~9910c98f5da056de:
Delete: zlib/nt/Makefile.nt
BitKeeper/deleted/.del-zlib.dnt~8160c636eb3eeed7:
Delete: zlib/nt/zlib.dnt
BitKeeper/deleted/.del-zlib.dsp~a8abac2fb721276e:
Delete: zlib/zlib.dsp
BitKeeper/deleted/.del-zlib.html~2e74efd497dcd4d0:
Delete: zlib/zlib.html
BitKeeper/deleted/.del-minigzip.c~1f21a5863f457cb0:
Delete: zlib/minigzip.c
BitKeeper/deleted/.del-example.c~5ea43c929ccd2a4f:
Delete: zlib/example.c
BitKeeper/deleted/.del-descrip.mms~51cd5d1792d76b9c:
Delete: zlib/descrip.mms
BitKeeper/deleted/.del-infblock.h~7d4f40c3a1d4cdf8:
Delete: zlib/infblock.h
BitKeeper/deleted/.del-infblock.c~3c866934e0f44c43:
Delete: zlib/infblock.c
BitKeeper/deleted/.del-infutil.c~43d2340436244b52:
Delete: zlib/infutil.c
BitKeeper/deleted/.del-infutil.h~a6bd0dcbbdc187ac:
Delete: zlib/infutil.h
BitKeeper/deleted/.del-infcodes.h~c9f64a612c2cc56a:
Delete: zlib/infcodes.h
BitKeeper/deleted/.del-infcodes.c~7ed73df8a54d6d55:
Delete: zlib/infcodes.c
BitKeeper/deleted/.del-maketree.c~846b8b96ac6872d8:
Delete: zlib/maketree.c
VC++Files/zlib/zlib.dsp:
Modified to suit zlib upgrade.
mysys/my_crc32.c:
Modified to suit zlib upgrade.
zlib/ChangeLog:
zlib 1.2.1 imported
zlib/FAQ:
zlib 1.2.1 imported
zlib/INDEX:
zlib 1.2.1 imported
zlib/README:
zlib 1.2.1 imported
zlib/adler32.c:
zlib 1.2.1 imported
zlib/algorithm.txt:
zlib 1.2.1 imported
zlib/compress.c:
zlib 1.2.1 imported
zlib/crc32.c:
zlib 1.2.1 imported
zlib/deflate.c:
zlib 1.2.1 imported
zlib/deflate.h:
zlib 1.2.1 imported
zlib/gzio.c:
zlib 1.2.1 imported
zlib/inffast.c:
zlib 1.2.1 imported
zlib/inffast.h:
zlib 1.2.1 imported
zlib/inffixed.h:
zlib 1.2.1 imported
zlib/inflate.c:
zlib 1.2.1 imported
zlib/inftrees.c:
zlib 1.2.1 imported
zlib/inftrees.h:
zlib 1.2.1 imported
zlib/trees.c:
zlib 1.2.1 imported
zlib/uncompr.c:
zlib 1.2.1 imported
zlib/zconf.h:
zlib 1.2.1 imported
zlib/zlib.3:
zlib 1.2.1 imported
zlib/zlib.h:
zlib 1.2.1 imported
zlib/zutil.c:
zlib 1.2.1 imported
zlib/zutil.h:
zlib 1.2.1 imported
2004-07-21 17:36:26 -07:00
unknown
2f26571fdc
Export the stmt functions on Embedded Server
2004-07-21 19:29:08 -04:00
unknown
062ac038df
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-21 22:48:05 +03:00
unknown
ff4aa03dc5
LEX initialization fixed
2004-07-21 22:44:12 +03:00
unknown
1cd522ec04
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-21 19:17:50 +02:00
unknown
cb35648ec8
fixed ORDER BY ?
...
new tests to ensure that prepared statement *really* work
(and that MySQL not picks up some number from arbitrary location
that happens to match the parameter's value)
mysql-test/include/ps_query.inc:
new tests to ensure that prepared statement *really* work
(and that MySQL not picks up some number from arbitrary location
that happens to match the parameter's value)
mysql-test/r/ps_2myisam.result:
results updated
mysql-test/r/ps_3innodb.result:
results updated
mysql-test/r/ps_4heap.result:
results updated
mysql-test/r/ps_5merge.result:
results updated
mysql-test/r/ps_6bdb.result:
results updated
sql/sql_select.cc:
don't shortcut - it backfires!
(in particular - when itemptr is Item_param :)
2004-07-21 19:17:07 +02:00
unknown
8df1bf6b42
Final patch for WL#1600(warn if max_allowed_packet used)
...
mysql-test/r/func_str.result:
test fixed
mysql-test/r/packet.result:
test fixed
sql/item_geofunc.cc:
error message fixed
sql/item_strfunc.cc:
error message fixed
sql/share/czech/errmsg.txt:
error message fixed
sql/share/danish/errmsg.txt:
error message fixed
sql/share/dutch/errmsg.txt:
error message fixed
sql/share/english/errmsg.txt:
error message fixed
sql/share/estonian/errmsg.txt:
error message fixed
sql/share/french/errmsg.txt:
error message fixed
sql/share/german/errmsg.txt:
error message fixed
sql/share/greek/errmsg.txt:
error message fixed
sql/share/hungarian/errmsg.txt:
error message fixed
sql/share/italian/errmsg.txt:
error message fixed
sql/share/japanese/errmsg.txt:
error message fixed
sql/share/korean/errmsg.txt:
error message fixed
sql/share/norwegian-ny/errmsg.txt:
error message fixed
sql/share/norwegian/errmsg.txt:
error message fixed
sql/share/polish/errmsg.txt:
error message fixed
sql/share/portuguese/errmsg.txt:
error message fixed
sql/share/romanian/errmsg.txt:
error message fixed
sql/share/russian/errmsg.txt:
error message fixed
sql/share/serbian/errmsg.txt:
error message fixed
sql/share/slovak/errmsg.txt:
error message fixed
sql/share/spanish/errmsg.txt:
error message fixed
sql/share/swedish/errmsg.txt:
error message fixed
sql/share/ukrainian/errmsg.txt:
error message fixed
2004-07-21 21:27:45 +05:00
unknown
c5fc0d433a
Merging
...
mysql-test/r/func_str.result:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
2004-07-21 19:10:37 +05:00
unknown
d8a914d431
ndb_lock.test, ndb_lock.result:
...
new file
2004-07-21 12:06:46 +02:00
unknown
2d74872cf8
Fix for bug#4669, Scans do not ignore uncommitted inserts (instead hang on lock)
2004-07-21 11:46:14 +02:00