mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
13522 commits 2778 branches 343 tags 1.6 GiB
Commit graph

13522 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
9778a2c98d ha_ndbcluster.h, ha_ndbcluster.cc: 
compile fix for gcc-2.95


sql/ha_ndbcluster.cc:
  compile fix for gcc-2.95
sql/ha_ndbcluster.h:
  compile fix for gcc-2.95
 2004-07-29 10:44:53 +02:00
unknown
805f5aa186 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2004-07-28 14:52:31 -05:00
unknown
a58f826acf Fix some variable misorderings. 2004-07-28 14:52:04 -05:00
unknown
e194353980 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2004-07-28 21:47:51 +02:00
unknown
ce838346d8 Casted all macro arguments, 
used a common style with array subscripts,
improved the line-up, wrapped long lines.
 2004-07-28 21:46:22 +02:00
unknown
2137dff8e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2004-07-28 10:02:38 -07:00
unknown
b620ae298a MgmtSrvr.hpp: 
make subclass friend for gcc-2.95 et al [dup push]


ndb/src/mgmsrv/MgmtSrvr.hpp:
  make subclass friend for gcc-2.95 et al
 2004-07-28 18:55:17 +02:00
unknown
9aa6d52a94 Fixing MYSQL_CHEKC_ZLIB_DIR to take into account user settings (in case there 
are such)
 2004-07-28 09:34:06 -07:00
unknown
8269f8acff Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-07-28 11:05:27 +02:00
unknown
99dfeddbef Fix 64-bit issue in ConfigValues 2004-07-28 11:05:00 +02:00
unknown
0cf30d26c2 Added order by to make the test output from ndb_basic and ndb_lock predicatble 
mysql-test/r/ndb_basic.result:
  Added order by to some selects
mysql-test/r/ndb_lock.result:
  Added order by to some selects
mysql-test/t/ndb_basic.test:
  Added order by to some selects
mysql-test/t/ndb_lock.test:
  Added order by to some selects
 2004-07-28 10:28:30 +02:00
unknown
52d3dbd091 Order of libs is important when building an optimized library: put ZLIB last 
in the list.
 2004-07-27 21:59:28 -07:00
unknown
ddb6fe7ef5 acinclude.m4: 
another spelling mistake fixed


acinclude.m4:
  another spelling mistake fixed
 2004-07-27 10:05:57 -07:00
unknown
5217955d1a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-zlib


configure.in:
  Auto merged
 2004-07-27 10:05:56 -07:00
unknown
6a371e242b WL#1518 "make bundled zlib usable for unix builds", post review fixes: 
- comment for AC_DEFINE(HAVE_COMPRESS) fixed
- build convenience library from zlib: we need to compile it into both
  libmysqlclient.a and libmysqlclient.so
- --with-zlib-dir=bundled configure option


acinclude.m4:
  - MYSQL_CHECK_ZLIB_WITH_COMPRESS: added support for 
  --with-zlib-dir=bundled
  - AC_DEFINE comment fixed
tools/Makefile.am:
  - uncomment bin_PROGRAMS (typo fixed)
zlib/Makefile.am:
  - build libtool convenience library, not static one: we need libz objects
    to be compiled in libmysqlclient.so shared version
 2004-07-27 10:05:55 -07:00
unknown
906ad26dc5 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-07-27 18:46:58 +05:00
unknown
ac43db9c7d A small fix to understand 4.1.0 format. 2004-07-27 18:43:40 +05:00
unknown
cc8920c8ff Merge 
ndb/test/ndbapi/Makefile.am:
  SCCS merged
 2004-07-27 13:02:50 +02:00
unknown
1325c4678e Merge problem 
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Remove comma
 2004-07-27 12:07:47 +02:00
unknown
41f3a2dcf2 Merge 
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  SCCS merged
 2004-07-27 11:57:04 +02: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
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
c1f273a6c1 - typo fix: protocoll -> protocol 2004-07-26 12:32:04 +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
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
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