Commit graph

13438 commits

Author SHA1 Message Date
unknown
12e9f0103a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-06-30 13:12:24 +00:00
unknown
e28b793213 see respective file
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  fix SHM config + cosmetics
ndb/src/common/mgmcommon/LocalConfig.cpp:
  use autoptr
ndb/src/common/transporter/SHM_Transporter.cpp:
  fixed SHM transporter setup
ndb/src/common/transporter/SHM_Transporter.hpp:
  fixed SHM transporter setup
ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  fixed SHM transporter setup
ndb/src/kernel/vm/Configuration.cpp:
  removed check of connectstring
2004-06-30 12:29:53 +00:00
unknown
79f7645b5b Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-06-30 14:19:31 +02:00
unknown
667c74144b Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-06-30 14:02:32 +02:00
unknown
c2668e106b - fixed server RPM postinstall (mysql_install_db was called with the
wrong parameter)
2004-06-30 14:01:31 +02:00
unknown
ee88811146 ctype-uca.c:
mbminlen was wrong for UTF8.


strings/ctype-uca.c:
  mbminlen was wrong for UTF8.
2004-06-30 14:45:08 +05:00
unknown
c80c619f7b Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/handler.h:
  Auto merged
2004-06-30 11:26:49 +02:00
unknown
7b1b7bc666 fowwlowup fixes for index_flags() 2004-06-30 10:40:15 +02:00
unknown
f671a1339b Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-29 21:33:05 -05:00
unknown
0193768acd Reword some client error messages. 2004-06-29 12:28:45 -05:00
unknown
c46e4aca66 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-29 18:20:06 +03:00
unknown
d90a88a55b Apply patch from Novell
netware/init_db.sql:
  Add time_zone tables
netware/mysql_test_run.c:
  Portability fix (log -> log_msg)
2004-06-29 18:19:35 +03:00
unknown
64c81b9dfd fixed compile of shm transporter
ndb/src/mgmsrv/Services.cpp:
  changed getsockname to getpeername
2004-06-29 14:56:02 +00:00
unknown
a1ef616c32 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41
2004-06-29 14:57:31 +02:00
unknown
ac5a2ead92 wl1822: verify locks are flushed 2004-06-29 14:53:15 +02:00
unknown
0a1381e05b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4089


mysql-test/r/bdb.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/handler.h:
  Auto merged
2004-06-29 13:51:35 +05:00
unknown
f9b7537eb6 a fix (bug #4304: TRUNCATE <table of type BDB> , wrong result). 2004-06-29 13:49:50 +05:00
unknown
7b6712a061 my_md5sum:
Added code to use locally installed perl modules first


Build-tools/my_md5sum:
  Added code to use locally installed perl modules first
2004-06-29 02:13:24 -05:00
unknown
c7f0287985 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged
2004-06-28 23:30:37 -05:00
unknown
641455351b small bug fix 2004-06-28 20:02:16 +00:00
unknown
c43445e197 adopting mysql-test-run to new ndb config
+ added option to ndb_waiter to wait for NO CONTACT


mysql-test/mysql-test-run.sh:
  adopting mysql-test-run to new ndb config
mysql-test/ndb/ndbcluster.sh:
  adopting mysql-test-run to new ndb config
ndb/tools/waiter.cpp:
  added option to wait for NO CONTACT
2004-06-28 19:53:55 +00:00
unknown
700e94e19b Merge
mysql-test/ndb/ndb_config_2_node.ini:
  SCCS merged
mysql-test/ndb/ndbcluster.sh:
  SCCS merged
2004-06-28 18:27:31 +00:00
unknown
bc72cb6b8e updated mysql-test/ndb to make use of new default config options 2004-06-28 18:22:39 +00:00
unknown
834bde020d 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-06-28 20:53:08 +03:00
unknown
e2d3f7b079 several config fixes for ndb, see respective file
ndb/include/debugger/EventLogger.hpp:
  removed unused method
ndb/include/mgmcommon/ConfigRetriever.hpp:
  put NdbMgmHandle in ConfigRetriever to enable holding connection open until setup complete
ndb/include/mgmcommon/NdbConfig.h:
  moved naming of all "ndb" file into NdbConfig.c
ndb/include/ndb_global.h:
  introduced define NDB_BASE_PORT to control default port for ndb
ndb/src/common/debugger/EventLogger.cpp:
  removed unused method
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  introduced define NDB_BASE_PORT to control default port for ndb
  + added setting default Id's on nodes
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  put NdbMgmHandle in ConfigRetriever to enable holding connection open until setup complete
ndb/src/common/mgmcommon/IPCConfig.cpp:
  changed error message
ndb/src/common/mgmcommon/LocalConfig.cpp:
  introduced define NDB_BASE_PORT to control default port for ndb
ndb/src/common/mgmcommon/NdbConfig.c:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/common/transporter/TransporterRegistry.cpp:
  spelling errors
ndb/src/kernel/error/ErrorReporter.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/error/ErrorReporter.hpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/main.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/vm/Configuration.cpp:
  moved allocation of ConfigRetriever object to Configuration to enable holing "config" open until setup finished
ndb/src/kernel/vm/Configuration.hpp:
  moved allocation of ConfigRetriever object to Configuration to enable holing "config" open until setup finished
ndb/src/mgmclient/main.cpp:
  fix default port number
ndb/src/mgmsrv/MgmtSrvr.cpp:
  fix default port
ndb/src/mgmsrv/Services.cpp:
  added spec of transporter in get_nodeid
ndb/src/mgmsrv/main.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/ndbapi/TransporterFacade.cpp:
  moved allocation of ConfigRetriever object to TransporterFacade to enable holing "config" open until setup finished
ndb/src/ndbapi/TransporterFacade.hpp:
  moved allocation of ConfigRetriever object to TransporterFacade to enable holing "config" open until setup finished
2004-06-28 17:29:58 +00:00
unknown
50d4d61598 unused field removed 2004-06-28 20:01:11 +03:00
unknown
6893aff622 Message/comment touchup.
scripts/mysql_fix_privilege_tables.sh:
  Message touchup.
scripts/mysql_fix_privilege_tables.sql:
  Comment touchup.
2004-06-28 11:26:54 -05:00
unknown
dcb1d8ff63 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874


scripts/mysql_fix_privilege_tables.sh:
  Auto merged
2004-06-28 15:39:04 +02:00
unknown
7bd97ab764 Fix for BUG#4240 "mysql_fix_privilege_tables Does not use --password properly"
Pass password if it is NOT empty. Typo fixed.


scripts/mysql_fix_privilege_tables.sh:
  Pass password if it is NOT empty. Typo fixed.
2004-06-28 15:37:42 +02:00
unknown
cf8a6e52b7 s/\r\n/\n/ in mysql-test/*/system_mysql_db*
according to http://www.bitkeeper.com/Documentation.FAQS.Windows_NT.html


mysql-test/t/system_mysql_db.test:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_fix-master.opt:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_fix.test:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_refs.test:
  s/\r\n/\n/
mysql-test/r/system_mysql_db.result:
  s/\r\n/\n/
mysql-test/r/system_mysql_db_refs.result:
  s/\r\n/\n/
2004-06-28 15:53:49 +05:00
unknown
3b95283baa after merge fix 2004-06-28 11:06:22 +02:00
unknown
0c3d564aeb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-28 00:42:38 +03:00
unknown
6cf3092224 Added missing my_time.c file to mysqlclient project
Moved include <assert.h> to my_global.h


VC++Files/client/mysqlclient.dsp:
  Added missing my_time.c file to mysqlclient project
include/my_dbug.h:
  Moved include <assert.h> to my_global.h
  Removed NDEBUG as asserts should be indenpendent of if we are using DBUG or not
include/my_global.h:
  Added assert.h as this is included in a lot of places
sql/sql_table.cc:
  Initialize forgotten variable
2004-06-28 00:42:02 +03:00
unknown
af0c28ffeb portability fix 2004-06-27 20:30:48 +02:00
unknown
282e7f9b18 tell make how to create mysql_tzinfo_to_sql.cc 2004-06-27 20:17:32 +02:00
unknown
f90b266fa5 Ensure that we don't create long temporary .o file (breaks on qnx) 2004-06-27 20:07:21 +03:00
unknown
f37e8fb999 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-27 19:18:03 +03:00
unknown
16bb7f392e Merge with 4.0
configure.in:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
2004-06-27 19:17:24 +03:00
unknown
d72f90dbe0 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-06-27 18:21:14 +03:00
unknown
3eb5fd0f24 Fix to be able to cross-compile for modesto
scripts/make_win_src_distribution.sh:
  Change mode to -rw-rw-r--
2004-06-27 18:20:06 +03:00
unknown
6ffe0a5016 correct casting void->char 2004-06-27 17:16:05 +02:00
unknown
0112bd5e30 Merged
sql/ha_ndbcluster.h:
  Auto merged
2004-06-27 16:56:52 +02:00
unknown
3d5c2d1d31 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb


ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-06-27 16:00:48 +02:00
unknown
9ddffd2778 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-27 07:00:14 -05:00
unknown
404730a123 after merge fix
mysql-test/r/lowercase_table2.result:
  results updated
2004-06-27 13:16:19 +02:00
unknown
54f47f1ef6 make lowercase_table3 to work 2004-06-27 11:57:08 +02:00
unknown
68ff7025c0 memory leak in tz code closed
(table opened in my_tz_init, was removed from thd->open_tables in
tz_load_from_db w/o being unlocked, so it was stayng in open_cache
forever preventing the latter from being free'd in table_cache_free)
2004-06-27 01:32:52 +02:00
unknown
f7b9e75b15 removed using lex->select_lex.options is SHOW TABLE [STATUS] commands (BUG#4288)
mysql-test/r/func_group.result:
  fixed
mysql-test/r/ps.result:
  SHOW TABLE STATUS test
mysql-test/t/ps.test:
  SHOW TABLE STATUS test
sql/sql_parse.cc:
  Use lex->describe instead of lex->select_lex.options
sql/sql_yacc.yy:
  removed unneed initialization of lex->select_lex.options
2004-06-27 00:34:05 +02:00
unknown
1249934266 correct eq() method for Item_param (BUG#4233)
mysql-test/r/ps.result:
  eq() for parameters test
mysql-test/t/ps.test:
  eq() for parameters test
sql/item.h:
  correct eq() method for Item_param
2004-06-26 23:55:38 +02:00
unknown
f7b6cafb71 restored --all as an alias to --create-options for backward compatibility 2004-06-26 23:00:23 +02:00