Commit graph

6751 commits

Author SHA1 Message Date
unknown
67570b8b1b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-08-05 14:19:18 -07:00
unknown
9919574acf Cleanup in mysql_time.h/my_time.h headers. The first is used in mysql.h,
the second is for the rest of time declarations in mysys.


include/my_time.h:
  New declarations moved from mysql_time.h
include/mysql_time.h:
  New declarations moved to my_time.h.
sql/tztime.cc:
  Enforcing Monty's approach to header files.
sql/tztime.h:
  Enforcing Monty's approach to header files: everything is included in
  one place.
2004-08-05 14:16:43 -07:00
unknown
432e469746 Merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  SCCS merged
2004-08-05 22:32:25 +02:00
unknown
e223c07eb1 Merge joreland@bk-internal.mysql.com:irix
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/test/ndbapi/testBasic.cpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-05 22:19:52 +02:00
unknown
c0cc90c2e5 mysqld.cc, mysql_test_run.c:
Changed URL in error message, page has moved


netware/mysql_test_run.c:
  Changed URL in error message, page has moved
sql/mysqld.cc:
  Changed URL in error message, page has moved
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-05 17:05:21 +02:00
unknown
94a1e48232 BUG#4892 TRUNCATE TABLE returns error 156
Added NDBCLUSTER to table types which does not support generate. 
Added test case for truncate.


sql/handler.h:
  Add NDBCLUSTER to table types that does not support generate.
2004-08-04 11:28:36 +02:00
unknown
92498f81db BUG#4818 DELETE FROM tab LIMIT
Check if there are any operations pending that needs to be taken over to the updating/deleting transaction before closing the scan 


sql/ha_ndbcluster.cc:
  Check ops_pending if there are operations to take over before closing the scan
2004-08-04 10:54:42 +02:00
unknown
ac8b4881c1 Merge 4.1 with jonas irix clone
BitKeeper/etc/logging_ok:
  auto-union
ndb/include/kernel/NodeState.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/include/util/Bitmask.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CpcClient.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/include/NDBT_Table.hpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoOperations.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
ndb/test/src/NDBT_Tables.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-03 14:16:16 +02:00
unknown
4e2137fabf Fix duplicate declaration in NDB cluster handler
sql/ha_ndbcluster.cc:
  Fix duplicate declaration
2004-08-03 13:54:55 +02:00
unknown
ea8ac8ab98 hang in dummy natural join (no common columns) Bug #4807 2004-08-02 11:12:11 +02:00
unknown
3c1327021a followup to SET PASSWORD fix 2004-08-01 17:21:55 +02:00
unknown
12bdc04b29 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-01 16:35:35 +02:00
unknown
95da1ff0fc apply in SET PASSWORD same checks as in GRANT, to let only valid hashes through 2004-07-30 22:05:08 +02:00
unknown
979126224b ha_innodb.cc:
ha_innobase::create(): pass the query string as UTF-8
  to row_table_add_foreign_constraints()  (Bug #4649)


sql/ha_innodb.cc:
  ha_innobase::create(): pass the query string as UTF-8
  to row_table_add_foreign_constraints()  (Bug #4649)
2004-07-30 16:08:19 +03:00
unknown
5e3a68892a Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-30 14:25:18 +02:00
unknown
864405db7d no_auto_value_on_zero + alter table bug 2004-07-30 14:17:12 +02:00
unknown
80de371ea3 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-07-30 14:03:16 +02:00
unknown
d249218105 - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link
flags to enable static linking (to avoid having a shared lib
   dependency in the Linux RPMs)
 - Disabled OpenSSL in the Max RPM


sql/Makefile.am:
   - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link
     flags to enable static linking (to avoid having a shared lib
     dependency in the Linux Server RPMs)
support-files/mysql.spec.sh:
   - Disable OpenSSL in the Max RPM
2004-07-30 13:52:44 +02:00
unknown
d130406c6d Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-30 14:11:56 +03:00
unknown
7790856f1a Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-30 09:50:37 +02:00
unknown
e452548352 auto_value_on_zero bug test
mysql-test/r/auto_increment.result:
  bug test
mysql-test/t/auto_increment.test:
  bug test
sql/sql_base.cc:
  cleanup
2004-07-30 09:47:56 +02:00
unknown
3f636aa379 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4492
2004-07-30 11:01:29 +04:00
unknown
252030e094 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-30 08:28:04 +03:00
unknown
2be153efbe Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717


client/mysqlbinlog.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2004-07-29 23:28:28 +02:00
unknown
88e3aead85 WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position
options for mysqlbinlog, with a test file.
This enables user to say "recover my database to how it was this morning at 10:30"
(mysqlbinlog "--stop-datetime=2003-07-29 10:30:00").
Using time functions into client/ made me move them out of sql/ into sql-common/.
+ (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
cannot accept 2 binlogs" (that is, on command line).


client/client_priv.h:
  new options for mysqlbinlog
client/mysqlbinlog.cc:
  WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position.
  (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
   cannot accept 2 binlogs".
include/my_time.h:
  importing time functions so that client/ files can use them.
include/mysql_time.h:
  importing time types so that client/ files can use them.
sql-common/my_time.c:
  importing time functions so that client/ files can use them.
sql/mysql_priv.h:
  moving time functions out of sql/ into sql-common/
sql/time.cc:
  moving time functions out of sql/ into sql-common/
sql/tztime.h:
  moving time functions out of sql/ into sql-common/
2004-07-29 23:25:58 +02:00
unknown
3f4e7a910d Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-07-29 13:15:25 +02:00
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
96d0e46bcb Fixed a copy-and-paste error: mysql_create_frm() should have
its own enter string.
2004-07-29 10:33:33 +02:00
unknown
b2f54294c5 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-07-29 09:04:50 +03:00
unknown
a58f826acf Fix some variable misorderings. 2004-07-28 14:52:04 -05:00
unknown
a5e453e608 Fix for bug #4492.
TIMESTAMP columns should be unsigned to preserve compatibility with 4.0
(Or else InnoDB will return different internal TIMESTAMP values when user upgrades to 4.1).

Altough this fix will introduce problems with early 4.1 -> 4.1 upgrades (tables with 
TIMESTAMP field should be reloaded using mysqldump) it will allow easy 4.0 -> 4.1 
upgrade (which is more important since 4.1 is still beta).


mysql-test/r/metadata.result:
  TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_2myisam.result:
  TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_3innodb.result:
  TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_4heap.result:
  TIMESTAMP should be UNSIGNED as in 4.0.
mysql-test/r/ps_5merge.result:
  TIMESTAMP should be UNSIGNED as in 4.0.
sql/field.cc:
  TIMESTAMP should be UNSIGNED to preserve compatiblity with 4.0.
  (Or else InnoDB will return different internal TIMESTAMP values when user upgrades to 4.1).
2004-07-28 10:49:21 +04:00
unknown
54d12591a8 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-28 09:00:59 +03: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
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
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
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
b66a13eeb8 safemalloc always resets the free'd memory, not only when PEDANTIC_SAFEMALLOC 2004-07-26 21:33:42 +02:00
unknown
d2aaa0f817 Added info about new --log-warnings option. 2004-07-26 17:41:52 +03: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
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
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
564b2736a4 Fixes after code review of WL#1791 Handler: support update of primary key 2004-07-23 10:33:51 +02:00