Commit graph

32874 commits

Author SHA1 Message Date
unknown
752e5f1ec7 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 14:32:31 +02:00
unknown
8b3f82322e Use same type for local variables as arguments, avoid compile error on NetWare 2006-10-24 13:52:50 +02:00
unknown
b062643180 Replace all refernces to .la libraries with direct references
to their .libs/*.a library
Add comment describing why mwldnlm is called with "x" flag


configure.in:
  Replace references to yassl .la libraries with direct reference to
  the .a libraries
netware/BUILD/mwldnlm:
  Add comment about why mwldnlm is called with the "x" flag and how
  to avoid it
2006-10-24 13:12:34 +02:00
unknown
375b04b9fe Temporary fixes for building from source dist in pushbuild
netware/BUILD/compile-netware-END:
  If running as user pushbuild don't run autotools again
netware/BUILD/mwenv:
  Set ARFLAGS to value of AR_FLAGS
2006-10-24 11:16:53 +02:00
unknown
0b381c94cb When using yaSSL on NetWare some of the OpenSSL specifix hacks can be skipped
vio/viossl.c:
  No need for special code to switch from WinSock to BSD sockets when using yaSSL
vio/viosslfactories.c:
  The OpenSSL port to NetWare has added some extra functions to free up memory, no need
  to call them when using yaSSL
2006-10-24 10:43:15 +02:00
unknown
7cd0f1a629 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  example.com:/work/bug23037/my50


sql/sql_show.cc:
  Auto merged
2006-10-23 15:21:23 +02:00
unknown
394b27b6b4 Netware uses size_t as socklen_t 2006-10-23 13:26:04 +02:00
unknown
29947efc62 Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table"
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.


mysql-test/r/information_schema.result:
  Update result
  
  Because the length of I_S.COLUMNS.COLUMN_DEFAULT was increased to
  65535 the column changed it's type from varchar(64) to longtext
  The type is longtext if the length is > 65532 (the max varchar len)
mysql-test/t/information_schema.test:
  test case for bug#23037: Bug in field "Default" of
  query "SHOW COLUMNS FROM table"
  
  Both SHOW COLUMNS and I_S.COLUMNS is TESTED as well the
  value returned by both. Using --replace_regex is unfeasible
  as the repetition value cannot be > 255.
  --replace_regex /A{256}/VALUE/ doesn't work, not to talk about
    /A{65532}/VALUE/
  /(A{255}){255}/VALUE/ is awfully slow. Thus, simple function with
  cursor is used to extract the value.
sql/sql_show.cc:
  Default value can have TIMESTAMP, CHAR, VARCHAR, ENUM
  VARCHAR can have the longest value, up to 65535. However, because
  of table handler limitations the actual limit is 65532 characters,
  latin1 charset. However, here is used MAX_FIELD_VARCHARLENGTH macro,
  because there could be a storage engine without such limitation.
2006-10-23 13:12:30 +02:00
unknown
88e5b3166d When looking for libc the path need to be converted from wine to unix format before test that directory exists 2006-10-23 12:56:25 +02:00
unknown
6ef7516f3e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-23 12:19:52 +02:00
unknown
67bd2842bb Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-23 12:17:15 +02:00
unknown
788968a61b If "var" is a symlink which does not point to anything, remove it before creating real var
mysql-test/mysql-test-run.pl:
  If "var" is a symlink which does not point to anything, remove it
2006-10-23 12:16:40 +02:00
unknown
e78a193179 As both ndb and im are components that may be disabled as well as the binaries may not exist. Look for
their binaries in a separate function and produce test casea failures for the test thet needs these components
2006-10-23 12:02:56 +02:00
unknown
f9223bc7e8 Copy *.cnf file from std_data/ when doing a binary distribution 2006-10-23 10:56:13 +02:00
unknown
6597ef1fed Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
2006-10-23 13:25:24 +05:00
unknown
1b7b43f399 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
2006-10-23 13:18:56 +05:00
unknown
9809dbeda8 Merge mysql.com:/usr/home/ram/work/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
2006-10-23 12:58:20 +05:00
unknown
95d64ee3cb Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
2006-10-23 12:44:25 +05:00
unknown
d415b0d405 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-20 16:02:48 -06:00
unknown
338c36c6e2 Merge zippy.cornsilk.net:/home/cmiller/emergency/mysql-5.0.26a-release
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-10-20 17:30:28 -04:00
unknown
a71a524eeb Bug #23427: incompatible ABI change in 5.0.26?
Revert 1 June change enough to restore ABI compatibility with previous
versions.


include/mysql.h:
  Revert patch that breaks ABI compatibility
libmysqld/lib_sql.cc:
  Remove useless assignment.
2006-10-20 17:17:24 -04:00
unknown
5a88282ec0 Merge siva.hindu.god:/usr/home/tim/m/bk/inno/50
into  siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-20 13:28:47 -06:00
unknown
7c7ea371cd Apply InnoDB snapshot ss923
Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION


sql/ha_innodb.cc:
  Apply InnoDB snapshot ss923
  
  Revision r922:
  ha_innobase::store_lock(): When downgrading table locks, do not
  check thd->in_lock_tables but test if
  thd->lex->sql_command == SQLCOM_LOCK_TABLES
  instead.  Otherwise, stored functions will use table locks.  (Bug #18077)
2006-10-20 12:34:31 -06:00
unknown
12c43f4f15 Init some variables that changes between test cases direclty in run_testcase
This can not be done in run_testcase_start_servers as embedded never starts a server
Add error if mysqld_start is called in embedded mode
2006-10-20 17:09:07 +02:00
unknown
680cce24b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-10-20 14:49:35 +04:00
unknown
5e3a54c7f3 Merge polly.local:/tmp/maint/bug23256/mysql-5.0-maint
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-10-20 14:45:34 +04:00
unknown
b9112d2642 Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-10-20 14:44:22 +04:00
unknown
2987771441 Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint
into  polly.local:/tmp/maint/bug23256/mysql-5.0-maint


sql/stacktrace.c:
  Auto merged
2006-10-20 14:32:31 +04:00
unknown
dd18eb1bfc Fix for bug #23256 "doesn't build on alpha"
- compilation on the Alpha platform was broken because the Alpha-specific code was not updated after replacing the SIGRETURN_FRAME_COUNT constant with a variable
2006-10-20 14:31:47 +04:00
unknown
b1016d640a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/sql_class.cc:
  Auto merged
2006-10-19 23:26:43 +02:00
unknown
61e3438fe2 Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-19 23:13:32 +02:00
unknown
801368e755 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-19 20:34:28 +02:00
unknown
fc9cf7f45d Adapt to running from "binary dist"
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd


mysql-test/lib/mtr_misc.pl:
  Add function mtr_exe_maybe_exists
mysql-test/mysql-test-run.pl:
  Adapt to running from binary dist
  Add function mtr_exe_maybe_exists to look for binaries that is optional
  Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
2006-10-19 20:33:32 +02:00
unknown
9ee7178742 Fix problem running rpl_timezone on powermacg5, it was not popular to set TZ to "" so now it's set
to a value wich is not our default
2006-10-19 20:29:33 +02:00
unknown
83196ad860 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
2006-10-19 17:15:49 +02:00
unknown
cd06481d65 Add command "exit" to mysqltest, it will stop processing any more
commands and go directly to result file processing


client/mysqltest.c:
  Add command "exit" to mysqltest
mysql-test/r/mysqltest.result:
  Add command "exit" to mysqltest
mysql-test/t/mysqltest.test:
  Add command "exit" to mysqltest
2006-10-19 13:34:09 +02:00
unknown
68c2a008a1 Merge mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732


sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/range.result:
  SCCS merged
mysql-test/t/range.test:
  SCCS merged
2006-10-19 16:15:30 +05:00
unknown
32b3846c9c Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqldump.c:
  Auto merged
sql/sql_class.cc:
  Auto merged
2006-10-19 12:36:40 +02:00
unknown
33d9c05a6c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  example.com:/work/bug23379/my50-bug23379


sql/sql_class.cc:
  Auto merged
2006-10-19 11:52:35 +02:00
unknown
ac7b0a7b3b Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  example.com:/work/bug23379/my41-bug23379


sql/sql_class.cc:
  Auto merged
2006-10-19 11:50:28 +02:00
unknown
04c8b8d15c Merge example.com:/work/bug23379/my41-bug23379
into  example.com:/work/bug23379/my50-bug23379


sql/sql_class.cc:
  Auto merged
2006-10-19 11:39:19 +02:00
unknown
ca817b49cf Fix for bug#23379 "wrong time value in SHOW PROCESSLIST"
The value taken to be shown in SHOW PROCESSLIST is not
initialized when THD is created and will be random for
unauthenticated connections.
  
To the documentor: Random value, instead of NULL, was shown,
in SHOW PROCESSLIST for still non-authenticated connections.


sql/sql_class.cc:
  Initialize time_after_lock.
  It is used from SHOW PROCESSLIST's code. If not initialized
  random value is shown for connected but still unauthenticated
  clients in the column Time.
2006-10-19 11:37:07 +02:00
unknown
123275321f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqldump.c:
  Auto merged
mysql-test/include/have_lowercase0.inc:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/mysql_protocols.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_drop_db.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysys/my_read.c:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/r/rpl000015.result:
  C
mysql-test/r/rpl_log.result:
  ul
mysql-test/r/rpl_max_relay_size.result:
  ul
mysql-test/r/rpl_replicate_do.result:
  ul
mysql-test/t/rpl000015.test:
  ul
2006-10-19 11:35:10 +02:00
unknown
b273af0eff Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-19 11:31:12 +02:00
unknown
f30cb12707 Backport test cases fixes from 5.0
client/mysqldump.c:
  fflush stderr after printing of error message
mysql-test/include/have_lowercase0.inc:
  Remove extra ;
mysql-test/r/rpl000015.result:
  Update result
mysql-test/r/rpl_change_master.result:
  Update result
mysql-test/r/rpl_error_ignored_table.result:
  Update result
mysql-test/r/rpl_loaddata.result:
  Update result
mysql-test/r/rpl_log.result:
  Update result
mysql-test/r/rpl_max_relay_size.result:
  Update result
mysql-test/r/rpl_replicate_do.result:
  Update result
mysql-test/t/lowercase_table3.test:
  Backport from 5.0
mysql-test/t/mysql_protocols.test:
  Backport from 5.0
mysql-test/t/rpl000015.test:
  Backport from 5.0
mysql-test/t/rpl_change_master.test:
  Backport from 5.0
mysql-test/t/rpl_drop_db.test:
  Backport from 5.0
mysql-test/t/rpl_error_ignored_table.test:
  Backport from 5.0
mysql-test/t/rpl_loaddata.test:
  Backport from 5.0
mysql-test/t/rpl_log-master.opt:
  Use --force-restart command in master.opt to force a restart for this test case
mysql-test/t/rpl_log.test:
  Backport from 5.0
mysql-test/t/rpl_max_relay_size.test:
  Backport from 5.0
mysql-test/t/rpl_replicate_do.test:
  Backport from 5.0
2006-10-19 10:54:23 +02:00
unknown
57ff1cb8c4 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  example.com:/work/bug23379/my41-bug23379
2006-10-19 10:31:46 +02:00
unknown
da7af481cd Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
We miss some records sometimes using RANGE method if we have
partial key segments.
Example:
  Create table t1(a char(2), key(a(1)));
  insert into t1 values ('a'), ('xx');
  select a from t1 where a > 'x';
We call index_read() passing 'x' key and HA_READ_AFTER_KEY flag
in the handler::read_range_first() wich is wrong because we have
a partial key segment for the field and might miss records like 'xx'.

Fix: don't use open segments in such a case.


mysql-test/r/range.result:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - test result.
mysql-test/t/range.test:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - test case.
sql/opt_range.cc:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - check if we have a partial key segment for a Item_func::GT_FUNC;
      if so, don't set NEAR_MIN flag in order to use HA_READ_KEY_OR_NEXT
      instead of HA_READ_AFTER_KEY.
sql/opt_range.h:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - key segment 'flag' slot added.
sql/sql_select.cc:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - test (HA_PART_KEY_SEG | HA_NULL_PART) as we split it in the sql/table.cc
sql/table.cc:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - set HA_NULL_PART flag instead of HA_PART_KEY_SEG in order not to mix them.
2006-10-19 12:52:37 +05:00
unknown
3cb0a19dd0 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


client/mysqldump.c:
  Auto merged
2006-10-18 19:27:14 -04:00
unknown
15a86d185d Merge neptunus.(none):/home/msvensson/mysql/bug22436/my50-bug22436
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/r/create.result:
  Merge
mysql-test/t/create.test:
  Merge
mysql-test/t/view.test:
  Remove the disable_warnings part as engine=innodb has been removed
2006-10-19 01:01:54 +02:00
unknown
54fadc5b88 Change the ssl related variables to loose so they work also when the server is compiled without ssl 2006-10-19 00:53:01 +02:00