Commit graph

26933 commits

Author SHA1 Message Date
unknown
931771422f - typo fix: rott->root in the file attributes for mysql_client_test of the RPM spec file
support-files/mysql.spec.sh:
  - typo fix: rott->root in the file attributes for mysql_client_test
2005-10-10 13:00:41 +02:00
unknown
a53386aaae Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmsrv/Services.cpp:
  Auto merged
2005-10-10 09:38:18 +02:00
unknown
20a6f1524a Remove protocol_cursor.cpp (no longer used) from sources
Fix a compile failure


BitKeeper/deleted/.del-protocol_cursor.cc~2a1ab8e023a166a4:
  Delete: sql/protocol_cursor.cc
VC++Files/libmysqld/libmysqld.dsp:
  Remove protocol_cursor.cpp (no longer used) from sources
VC++Files/sql/mysqld.dsp:
  Remove protocol_cursor.cpp (no longer used) from sources
sql/mysqld.cc:
  Fix a compile failure
2005-10-09 14:45:08 +04:00
unknown
eb4da9fda7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


server-tools/instance-manager/mysql_connection.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-10-08 16:59:41 +02:00
unknown
3a97babbc2 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/rpl_flush_tables.result:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-10-08 16:56:10 +02:00
unknown
0f60474f29 pthread_handler_decl() changed to be ctags-friendly
(and contain extern "C" when necessary)
2005-10-08 16:39:55 +02:00
unknown
51907576bd Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE"
don't allow STOP SLAVE if global read lock is in taken
2005-10-08 14:46:04 +02:00
unknown
63e7824fc2 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-10-07 20:40:09 +04:00
unknown
9cf3d4b4a5 fix compile failure (which shows up in cygwin environment)
server-tools/instance-manager/mysql_connection.cc:
  fix pragma statement
server-tools/instance-manager/user_map.cc:
  fix pragma statement
2005-10-07 20:25:51 +04:00
unknown
38a0e9130b added missing signal to VoidFs 2005-10-07 17:43:59 +02:00
unknown
7d3044fc80 Merge
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2005-10-07 12:55:00 +02:00
unknown
eb1b1e7721 after merge fix 2005-10-07 15:09:44 +05:00
unknown
a5ea2e5cab 4.1 -> 5.0 merge
client/mysql.cc:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/r/rpl_openssl.result:
  manual merge
2005-10-07 14:26:32 +05:00
unknown
9ea8ce72ff Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
allow select into outfile from I_S tables
  it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
  as we use 'any_db' for 'check_access' function in places where FILE_ACL is required


mysql-test/t/outfile.test:
  Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
    test case
2005-10-07 14:16:44 +05:00
unknown
a9363ce9c3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug13484


sql/ha_innodb.cc:
  Auto merged
mysql-test/r/index_merge_innodb.result:
  Auto merged
mysql-test/r/rowid_order_innodb.result:
  Auto merged
mysql-test/t/index_merge_innodb.test:
  Auto merged
2005-10-07 11:14:40 +04:00
unknown
2d017ee897 make_binary_distribution.sh:
Corrected platform name output
Services.cpp:
  Dont print null address (back port from 5.0)


ndb/src/mgmsrv/Services.cpp:
  Dont print null address (back port from 5.0)
scripts/make_binary_distribution.sh:
  Corrected platform name output
2005-10-07 01:56:11 +02:00
unknown
707a4b6539 make_binary_distribution.sh:
Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable


scripts/make_binary_distribution.sh:
  Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable
2005-10-06 22:57:13 +02:00
unknown
979446f356 Merge mysql.com:/home/dellis/mysqlab/bk/local_mysql-4.1
into  mysql.com:/home/dellis/mysqlab/bk/mysql-5.0
2005-10-06 15:52:01 -05:00
unknown
f306c37c86 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/dellis/mysqlab/bk/mysql-4.1
2005-10-06 15:42:35 -05:00
unknown
282e2c0245 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-10-06 22:29:31 +02:00
unknown
df4f034c65 ndbd exit code update after review 2005-10-06 22:23:35 +02:00
unknown
1b7de584bb Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-06 22:10:03 +03:00
unknown
598d642285 Fixed a bug in argument sending to get_one_option.
Fixed documentation for findopt().
Cleaned code a bit.
2005-10-06 22:09:15 +03:00
unknown
970150d14e don't "init" binlog if opt_bin_log is not set
(bug#13791 - mysqld crashes at startup in TC_LOG_MMAP::open)
2005-10-06 19:05:34 +02:00
unknown
78f5997ade make_binary_distribution.sh:
Replaced --machine with --platform
  General code cleanup


scripts/make_binary_distribution.sh:
  Replaced --machine with --platform
  General code cleanup
2005-10-06 18:00:23 +02:00
unknown
9b313efd54 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.13605
2005-10-06 19:58:51 +05:00
unknown
07daa79569 Fix for bug#13605 'rpl_openssl' test hangs 2005-10-06 19:51:08 +05:00
unknown
94a83fe295 Merge 2005-10-06 15:42:50 +02:00
unknown
df76450716 Merge msdesk.(none):/home/msvensson/mysql-4.1
into  msdesk.(none):/home/msvensson/mysql-5.0


BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
  Auto merged
innobase/os/os0sync.c:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_uca.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
client/mysql.cc:
  Sam change in both 4.1 and 5.0
mysql-test/r/ctype_uca.result:
  Merge
mysql-test/r/ctype_ujis.result:
  Merge
strings/ctype-mb.c:
  Merge
strings/ctype-tis620.c:
  Merge
2005-10-06 14:40:18 +02:00
unknown
e6ec5794f6 item_cmpfunc.cc:
Wrong variable.


sql/item_cmpfunc.cc:
  Wrong variable.
2005-10-06 15:26:59 +05:00
unknown
95b16dfa1d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmsrv/Services.cpp:
  Auto merged
2005-10-06 10:59:58 +02:00
unknown
6efe60124c ndb - prelim perl scripts to autotest
BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
  Delete: mysql-test/ndb/ndb_range_bounds.pl
2005-10-06 09:44:25 +02:00
unknown
3c2dca475d my_pthread.h:
Let pthread_mutex_init() macro return 0 on Windows
mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'


sql/mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'
include/my_pthread.h:
  Let pthread_mutex_init() macro return 0 on Windows
2005-10-06 03:49:14 +02:00
unknown
157e1fcb64 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-05 22:07:04 +02:00
unknown
99a806a9c8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-05 20:11:24 +02:00
unknown
fcc644fff7 Bug#12935 Local and XA transactions not mutually exclusive 2005-10-05 19:58:16 +02:00
unknown
7b54f5d633 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_table.cc:
  Auto merged
2005-10-05 19:37:02 +02:00
unknown
f1d7899e70 sql_table.cc:
fixed CHECKSUM TABLE to be independent from the first 'deleted' bit in the null bitmask (undefined in the InnoDB)
  bug#13710


sql/sql_table.cc:
  fixed CHECKSUM TABLE to be independent from the first 'deleted' bit in the null bitmask (undefined in the InnoDB)
  bug#13710
2005-10-05 19:36:20 +02:00
unknown
28a117f721 Merge mysql.com:/home/jimw/my/mysql-5.0-13071
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-05 10:07:04 -07:00
unknown
ab2cd8689d Fail when two messages exist for the same language for an error in the
server error messages file. (Bug #13071)


extra/comp_err.c:
  Fail when two messages for the same language are given for an error
2005-10-05 10:06:31 -07:00
unknown
07172cabdf Bug#13143 - formatID should not affect XID's uniqueness 2005-10-05 16:38:53 +02:00
unknown
e97a9d5990 Bug #11749 No message slogan found for Signal 8 received. (need better message)
+ revised error messages after feedback
+ revides classifications and status
+ removed all progError(..0..) to make sure all error invocations have an error code
+ added some new error codes to replace some generic usage of SYSTEM_ERROR
+ removed some unused codes


configure.in:
  Bug #11749  	No message slogan found for Signal 8 received. (need better message)
ndb/include/kernel/signaldata/SystemError.hpp:
  + removed some unused codes
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  + removed all progError(..0..) to make sure all error invocations have an error code
ndb/src/kernel/main.cpp:
  Bug #11749  	No message slogan found for Signal 8 received. (need better message)
2005-10-05 16:35:28 +02:00
unknown
3410309f26 Revert
BUILD/SETUP.sh:
  Remove -ansi
2005-10-05 14:37:42 +02:00
unknown
4a231e408c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12476
2005-10-05 17:35:42 +05:00
unknown
e484fdf5bf Revert
BUILD/SETUP.sh:
  Remov -ansi flag
2005-10-05 14:35:41 +02:00
unknown
068a15bb28 item_cmpfunc.cc:
wrong variable.


sql/item_cmpfunc.cc:
  wrong variable.
2005-10-05 17:33:39 +05:00
unknown
709f8556bf Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
2005-10-05 11:28:08 +05:00
unknown
625c9582e2 Make mysql_fix_privilege_tables.sh not dependent on the current directory.
scripts/mysql_fix_privilege_tables.sh:
  Make the script not dependent on the current directory.
2005-10-05 01:08:22 +04:00
unknown
ef16a04160 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
2005-10-04 21:43:56 +02:00
unknown
822b0737b9 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-04 21:37:51 +02:00