Commit graph

27,155 commits

Author SHA1 Message Date
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
30d81f0041 Merge mysqldev@production.mysql.com:my/mysql-4.1-release
into  mysql.com:/usr/home/ram/work/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged
2005-10-07 20:34:40 +05:00
unknown
d1e71faf61 Populate t1 in order to get more predictable explain results. 2005-10-07 20:14:34 +05:00
unknown
d40a0f423f Copy zlib.a and valgrind.supp if exists.
Copy disabled.def
(Backport of Kent's change from the main tree to the 4.1.15 build clone.
Original changeset:  2005/10/07 13:08:07+02:00 kent@mysql.com )


scripts/make_binary_distribution.sh:
  Copy zlib.a and valgrind.supp if exists.
  Copy disabled.def
  (Backport of Kent's change from the main tree to the 4.1.15 build clone.)
2005-10-07 16:37:53 +02:00
unknown
c533a6bf04 make_binary_distribution.sh:
Copy zlib.a and valgrind.supp if exists
  Copy disabled.def


scripts/make_binary_distribution.sh:
  Copy zlib.a and valgrind.supp if exists
2005-10-07 13:08:07 +02:00
unknown
7d3044fc80 Merge
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2005-10-07 12:55:00 +02:00
unknown
8b1936fa12 Increase the version number. 2005-10-07 12:50:29 +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
c657d5a72f ctype_utf8.result, ctype_utf8.test:
Adding test case.
item_func.cc:
  Bug#13751 find_in_set: Illegal mix of collations.
  Character set conversion was forgotten in find_in_set.


sql/item_func.cc:
  Bug#13751 find_in_set: Illegal mix of collations.
  Character set conversion was forgotten in find_in_set.
mysql-test/t/ctype_utf8.test:
  Adding test case.
mysql-test/r/ctype_utf8.result:
  Adding test case.
2005-10-07 09:52:15 +05:00
unknown
0ecbc17ccc Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-10-07 04:02:53 +03:00
unknown
0559483cec Fix use of "%*s" *printf() specifiers that were really meant to be
"%.*s". (Bug #13650)


sql/sp.cc:
  Fix print specifiers for strings. %*s sets the minimum width of the
  string from a variable, %.*s sets the maximum width.
sql/sp_cache.cc:
  Fix print specifiers for strings. %*s sets the minimum width of the
  string from a variable, %.*s sets the maximum width.
sql/sp_head.cc:
  Fix print specifiers for strings. %*s sets the minimum width of the
  string from a variable, %.*s sets the maximum width.
2005-10-06 17:37:24 -07:00
unknown
3dcf205664 Review of new code since last pull
- Use %lx instead of %p as %p is not portable
- Don't replace ROW item with Item_null


myisam/mi_rkey.c:
  Use %lx instead of %p as %p is not portable
myisam/mi_search.c:
  Use %lx instead of %p as %p is not portable
mysql-test/r/select.result:
  More test for ROW comparison
mysql-test/t/select.test:
  More test for ROW comparison
sql/item.cc:
  We can't replace a ROW item with Item_null because:
  - Arg_comparator is still using the orignal row items and it's not good to have args[0] different from what is actually compared
  - If we are using the <=> comparator, NULL can still be compared as true
  - We would break things if we would ever use resolve_const_item() for operators like >, < etc.
2005-10-07 03:12:15 +03: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
041123bade Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619)
mysql-test/r/func_crypt.result:
  Add new results
mysql-test/t/func_crypt.test:
  Add new regression test
sql/item_strfunc.cc:
  Handle NULL result from call to crypt().
2005-10-06 16:15:53 -07: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
c807724f36 Review of code pushed since last 5.0 pull:
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code



BUILD/FINISH.sh:
  Ensure that ccache is also used for C programs
BUILD/SETUP.sh:
  Ensure that ccache is also used for C programs
client/mysql.cc:
  More debugging
  Ensure that 'delimiter' works the same way in batch mode as in normal mode.
  Compare 'delimiter' command case-insensitive.
  The above fixes the delimiter bugs so that we can now use ;; as a trigger/SP function delimiter in mysqldump.
client/mysqldump.c:
  Indentation fixes
  Use ;; as a delmimiter for stored procedures and triggers instead of //
client/mysqltest.c:
  Indentation fixes
include/my_sys.h:
  Remove not needed MY_UNIX_PATH parameter
mysql-test/r/alter_table.result:
  Better to reuse mysqltest database (test didn't properly delete mysqltest1 at start)
mysql-test/r/func_str.result:
  More testing of CONV() (to ensure that longlong2str() works correctly)
mysql-test/r/information_schema.result:
  Drop all used tables and views
  Rename view tables to 'v#' to ensure that if this test fails, not a lot of other test fails
mysql-test/r/information_schema_inno.result:
  Drop all used tables
mysql-test/r/multi_statement.result:
  Drop used tables
mysql-test/r/mysql.result:
  Add error messages to result
mysql-test/r/mysqldump.result:
  ;; is now used as SP/trigger delimiter
mysql-test/r/mysqlshow.result:
  Drop used tables
mysql-test/r/temp_table.result:
  Drop used views
  Rename views to v#
mysql-test/t/alter_table.test:
  Better to reuse mysqltest database (test didn't properly delete mysqltest1 at start)
mysql-test/t/func_str.test:
  More testing of CONV() (to ensure that longlong2str() works correctly)
mysql-test/t/information_schema.test:
  Drop all used tables and views
  Rename view tables to 'v#' to ensure that if this test fails, not a lot of other test fails
mysql-test/t/information_schema_inno.test:
  Drop all used tables
mysql-test/t/multi_statement.test:
  Drop used tables
mysql-test/t/mysql.test:
  Add error messages to result
mysql-test/t/mysqlshow.test:
  Drop used tables
mysql-test/t/temp_table.test:
  Drop used views
  Rename views to v#
mysys/mf_format.c:
  Remove not needed MY_UNIX_PATH parameter
  (This goes against how fn_format() is supposed to work and also conflicts with other options like MY_RETURN_REAL_PATH)
sql/ha_federated.cc:
  Removed extra empty line
sql/item.cc:
  Use 'str_value' instead of 'str_value_ptr' to hold result for Item_splocal
  Remove some calls to 'thd' in Item_splocal by making 'thd' a class variable
  One doesn't have to set 'null_value' when calling 'is_null()'
sql/item.h:
  Add THD as a class variable to Item_splocal
  Use 'str_value' instead of 'str_value_ptr' to hold temp result
  Fixed bug in Item_hex when used in CAST()
sql/item_func.cc:
  Optimize new code
sql/log_event.cc:
  Move 'to_unix_path()' out of fn_format()
sql/opt_range.cc:
  Simplify code
sql/sp_head.cc:
  Ensure that Item_splocal has thd set before we call '->this_item()'
sql/sql_class.cc:
  Return error if Statement::insert() fails in either hash_insert()
sql/sql_parse.cc:
  Remove 'current_db_used' as we can trivially check if db table qualifier was used without this.
  Simplify code
sql/sql_prepare.cc:
  Use enum instead of const int, to avoid ugly code for VC++
sql/structs.h:
  Remove compiler warnings when using STRING_WITH_LEN() with constant strings.
sql/table.cc:
  Fixed indentation
sql/table.h:
  Remove not needed current_db_used
strings/decimal.c:
  Simplify code
strings/longlong2str-x86.s:
  A bit faster longlong2str.
  (Took some ideas from Peter Gulutzan's code)
strings/my_strtoll10.c:
  Simplify code for MetroWerks compiler
2005-10-06 17:54:43 +03: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
399caa6d79 Fixed BUG#13616: "CALL <dbname>.<procedurename>" executes properly, but
displays error
    When returning to the old database (which may be ""), don't do
    access check - mysql_change_db() would then generate the error
    "No database selected".
    Note: No test case added; it seems a db is always selected when running
    tests.


sql/sp_head.cc:
  Don't do access check when returning to db after a call.
2005-10-05 16:39:37 +02: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
f8efbcefca Bug#12476 Some big5 codes are still missing.
ctype-big5.c:
  Adding extra cp950 characters into Unicode mapping.
ctype_big5.result, ctype_big5.test:
  Adding test case


strings/ctype-big5.c:
  Bug#12476 Some big5 codes are still missing.
  Adding extra cp950 characters into Unicode mapping.
mysql-test/t/ctype_big5.test:
  Adding test case
mysql-test/r/ctype_big5.result:
  Adding test case
2005-10-05 19:20:49 +05:00
unknown
99ca39dee4 item_cmpfunc.cc:
sorry, another wrong variable


sql/item_cmpfunc.cc:
  sorry, another wrong variable
2005-10-05 17:45:23 +05: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