Commit graph

32901 commits

Author SHA1 Message Date
unknown
bf6e47f8c4 Test failure when compiled without innodb
Disable warnings around the create table statements, we want to use innodb when possible but they work just fine without.


mysql-test/t/ctype_utf8.test:
  Disable warnings around the create table statements, we want to use innodb when possible but they work just fine without.
2006-10-25 15:41:32 +02:00
unknown
e402af83f5 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-25 14:57:06 +02:00
unknown
7596e12bbe Update the binlog format parse routine to only be avaliable in 5.1 and allow for any binlog_format to be specified 2006-10-25 14:56:36 +02:00
unknown
5b29efafa5 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
tests/mysql_client_test.c:
  Use local in 5.0
2006-10-25 14:39:29 +02:00
unknown
870ed0c3f5 Add valgrinding support for mysql_client_test
Fix two memory leaks in mysql_client_test


mysql-test/mysql-test-run.pl:
  Add valgrinding support for mysql_client_test
tests/mysql_client_test.c:
  Fix two memory leaks
2006-10-25 14:34:18 +02:00
unknown
4a9f71aef4 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-25 12:41:34 +02:00
unknown
379809f40e Set flag opt_skip_ndbcluster_slave if no slaves are being used.
Add comments
Deperlify
2006-10-25 12:40:33 +02:00
unknown
0a7a2b8f66 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/mysql-test-run.pl:
  Auto merged
2006-10-24 23:40:11 +02:00
unknown
4da54b4769 Adapt mysql-test-run.pl to mysqld in 5.1 using "mixed" binlog format by default 2006-10-24 23:39:46 +02:00
unknown
47b1c7f9a5 Update the reference file for mysql API/ABI for 5.0
include/mysql_h_abi.ic:
  Update the reference file for mysql API/ABI
2006-10-24 22:00:08 +02:00
unknown
80bd3e3856 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
include/Makefile.am:
  Merge, SUPERCLEANFILES and CLEANFILES has dissapeared in 5.0
2006-10-24 21:05:35 +02:00
unknown
f89efeb5f6 Pass --core-file option to mysqld when bootstrapping
BitKeeper/etc/ignore:
  Added mysql-test/r/blackhole.log to the ignore list
2006-10-24 21:02:04 +02:00
unknown
c84d4bfad6 Merge neptunus.(none):/home/msvensson/mysql/bug23427/my41-bug23427
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-24 20:41:48 +02:00
unknown
9c9bf0aff2 WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks
BUG#23427 incompatible ABI change in 5.0.26?
   - Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file 


BitKeeper/etc/ignore:
  Added include/check_abi include/mysql_h.ic to the ignore list
configure.in:
  Look for icheck in configure
include/Makefile.am:
  Add rule to build mysql_h.ic if icheck is avaliable
  Add rule to compare mysql_h.ic to the version
  controlled reference file mysql_h_abi.ic
include/mysql.h:
  Add comment about taking care when editing mysql.h
  Add example how to add reserved fiels in the structs to
  allow for features to be added without breaking ABI
include/mysql_h_abi.ic:
  Add new file describing the libmysqlclient ABI used as a reference to detect ABI breakage
2006-10-24 20:32:07 +02:00
unknown
fa6d7c505c 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-24 19:22:48 +02:00
unknown
c7cedcd645 Remove debug printout 2006-10-24 19:22:27 +02:00
unknown
7941fdd027 Bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table"
- Fix check in mysql_client_test to reflect the change of datatype
   for DEFAULT column


tests/mysql_client_test.c:
  Update check of datatype for field DEFAULT returned from "explain"
  as datatype has changed after patch for bug 23037
2006-10-24 19:16:18 +02:00
unknown
01290beefb 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
tests/mysql_client_test.c:
  Remove the fflush(NULL) and instead explicitly fflush stdout and then stderr
2006-10-24 18:51:07 +02:00
unknown
297d968a8c Run mysql_client_test without --silent
Flush both stdout and stderr before abort'ing mysql_client_test


mysql-test/mysql-test-run.pl:
  Run mysql_client_test wihtout --silent flag
tests/mysql_client_test.c:
  Before aborting mysql_client_test in die, make sure
  to first flush stdout and finally after the error message 
  has been printed also fflush stderr
2006-10-24 18:49:19 +02:00
unknown
0dac6c35c9 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-24 18:08:38 +02:00
unknown
1023e01058 Fix spelling errors in test files
mysql-test/r/mysqldump-max.result:
  Update test result after fix of spelling error
mysql-test/r/rpl_trigger.result:
  Update test result after fix of spelling error
mysql-test/r/type_newdecimal.result:
  Update test result after fix of spelling error
mysql-test/t/mysqldump-max.test:
  Fix spelling error "disable_warnings"
  Write shorter "drop table..."
mysql-test/t/rpl_trigger.test:
  Fix spelling error, there is no --ignore_warnings
mysql-test/t/type_newdecimal.test:
  Fix spelling error
2006-10-24 17:54:45 +02:00
unknown
e3936b1065 Add analyze_testcase_failure which is called when mysqltest has failed
with error 1 and we are running with --force
The specific "analyze" code is enclosed in a .test file fwich can easily
be modified to be more advanced 


mysql-test/mysql-test-run.pl:
  Attempt to run some quick queries to analyze the failure when mysqltest returns 1 indicating test has failed
  Initially only code to analyze "could not sync with master" is added as that is a blackbox
  and all problems looks the same
mysql-test/include/analyze_failure_sync_with_master.test:
  New BitKeeper file ``mysql-test/include/analyze_failure_sync_with_master.test''
2006-10-24 17:36:46 +02:00
unknown
c9ef0344f8 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/mysql-test-run.pl:
  Auto merged
2006-10-24 16:00:42 +02:00
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
7e1fcb649f Enable the ATTRIBUTE_FORMAT macros to check format of variable arg parameters 2006-10-24 13:34:10 +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
f9ff7472a2 Avoid matching the trailing carriage return when parsing the mysqld.spec file
This fixes problem where --replace_result failed in rpl000015 because the MYSQL_TCP_PORT variable was "3306\r"


mysql-test/mysql-test-run.pl:
  Avoid matching the trailing carriage return when parsing the mysqld.spec file
2006-10-23 20:36:44 +02:00
unknown
13c55f3c17 The vardir trick can only bge used on platforms with native symlinks - otherwise opt_vardir need to be set to default value. 2006-10-23 16:51:48 +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
edf668e8fa Don't use the "4.1 vardir trick" on OS that does not have native symlink(i.e windows) 2006-10-23 13:32:20 +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