Commit graph

18040 commits

Author SHA1 Message Date
unknown
baf121de4f Clean up InnoDB testing with embedded server.
BitKeeper/deleted/.del-innodb.result.es~ba2a97747fd41a3a:
  Delete: mysql-test/r/innodb.result.es
mysql-test/mysql-test-run.sh:
  Remove innodb tests from list of tests automatically skipped
  with embedded server
mysql-test/r/innodb.result:
  Update results
mysql-test/t/innodb-deadlock.test:
  Skip with embedded server
mysql-test/t/innodb-lock.test:
  Skip with embedded server
mysql-test/t/innodb.test:
  Move test of replace delayed to new test file, add to --replace_result
  to clean up path
2005-03-29 16:10:43 -08:00
unknown
ff9a1bd225 Shift skipping of some tests with embedded server from within
mysql-test-run to the tests themselves.


mysql-test/t/bdb-deadlock.test:
  Don't run this test with embedded server
mysql-test/mysql-test-run.sh:
  Remove tests from being skipped with embedded server
mysql-test/t/connect.test:
  Skip test under embedded server
mysql-test/t/flush_block_commit.test:
  Skip test under embedded server
mysql-test/t/grant.test:
  Skip test under embedded server
mysql-test/t/grant2.test:
  Skip test under embedded server
mysql-test/t/grant_cache.test:
  Skip test under embedded server
2005-03-29 15:50:16 -08:00
unknown
3e2f7ed4f5 Fedora now defines read(2)/write(2) as macros.
Argh!
2005-03-29 23:31:56 +02:00
unknown
ce3253cfd1 typo fixed 2005-03-29 23:03:36 +02:00
unknown
2c4a99d084 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/r/ps_7ndb.result:
  Auto merged
2005-03-29 20:16:35 +02:00
unknown
328781c959 Merge
configure.in:
  Auto merged
acinclude.m4:
  SCCS merged
2005-03-29 19:25:55 +02:00
unknown
1a960df7ab Post-review fix: Drop the duplicate assignment. 2005-03-29 18:55:47 +02:00
unknown
1d3e1bdbbe Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-29 18:53:44 +02:00
unknown
01ba6b1d09 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-29 18:48:31 +02:00
unknown
344e0a2d78 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-29 17:56:34 +02:00
unknown
34cebb7176 Introduce "configure" support for a new '-with-big-tables' option that can replace
the current way of passing '-DBIG_TABLES' to the compilers.

This is needed even in 4.0, as 'Do-compile-all' must use this new approach for
all "max" builds in 4.0, 4.1, and up.


acinclude.m4:
  Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option 
  and set the CPP symbol 'BIG_TABLES' accordingly.
configure.in:
  Call the new 'MYSQL_CHECK_BIG_TABLES' macro.
2005-03-29 16:34:33 +02:00
unknown
a7b6b20c1e New test result 2005-03-29 15:36:02 +02:00
unknown
9dc90a162d Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started 2005-03-29 15:15:28 +02:00
unknown
fd5c0aff66 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-29 14:56:11 +02:00
unknown
f38d7d6d8d update results 2005-03-29 13:57:15 +02:00
unknown
0b45706c3b ctype-utf8.c, ctype-sjis.c:
Safer and mode readable way.


strings/ctype-sjis.c:
  Safer and mode readable way.
strings/ctype-utf8.c:
  Safer and mode readable way.
2005-03-29 16:23:44 +05:00
unknown
db5bb0c46c ctype-big5.c:
More readable and safer way.


strings/ctype-big5.c:
  More readable and safer way.
2005-03-29 16:19:31 +05:00
unknown
7bd6ddc046 Better error message.
Bugs#9057: Incorrect errormsg for too-large char field in table definition
2005-03-29 15:43:00 +05:00
unknown
dfc8b3aecc Remove redundant my_security_attr_free() from
handle_connections_shared_memory (double free spotted by Monty).


sql/mysqld.cc:
  Remove excessive my_security_attr_free()
2005-03-29 14:30:34 +04:00
unknown
2c546db390 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-29 12:08:14 +02:00
unknown
19027609f5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
2005-03-29 12:00:43 +02:00
unknown
9b6d32d6a3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2005-03-29 14:49:33 +05:00
unknown
13b47b5e43 Adding Cybozu's patch.
Not active by default.
One need to pass -DHAVE_CYBOZU_COLLATION to 
activate it.


mysys/charset-def.c:
  Adding Cybozu's patch.
  Not active by default.
strings/ctype-utf8.c:
  Adding Cybozu's patch.
  Not active by default.
2005-03-29 14:48:47 +05:00
unknown
50c6e343e0 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/cps/mysql/trees/mysql-4.1
2005-03-29 11:58:34 +04:00
unknown
346d02419a mysql-test-run.pl:
Corrected typo
mtr_diff.pl:
  A simplified unified diff in Perl
  new file


mysql-test/lib/mtr_diff.pl:
  A simplified unified diff in Perl
mysql-test/mysql-test-run.pl:
  Corrected typo
2005-03-29 07:29:38 +02:00
unknown
5fb5282784 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2005-03-28 22:56:40 +02:00
unknown
4a6411003f ndb - set up long key page vars in ACC_LOCKREQ (bug#????)
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  set up long key page vars in ACC_LOCKREQ
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  set up long key page vars in ACC_LOCKREQ
2005-03-28 22:55:32 +02:00
unknown
22f6c58bb1 Fix for bug #8894 "TIMESTAMP values scrambled/misaligned when using --new".
Fixed Field_timestamp::val_int() so now it works correctly in --new mode
(or for TIMESTAMP(19) columns). 
Also removed unused Field_timestamp::fill_and_store() method.


mysql-test/r/type_timestamp.result:
  Added test for bug #8894 "TIMESTAMP values scrambled/misaligned when 
  using --new".
mysql-test/t/type_timestamp.test:
  Added test for bug #8894 "TIMESTAMP values scrambled/misaligned when 
  using --new".
sql/field.cc:
  Field_timestamp::fill_and_store() 
    Removed unused method.
  Field_timestamp::val_int()
    Even in --new mode integer representation of TIMESTAMP value should
    not exceed 14 digits.
sql/field.h:
  Removed unused Field_timestamp::fill_and_store() method.
2005-03-28 23:36:25 +04:00
unknown
633207b549 Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent'
My code in get_actual_tablename was not checking to make sure SHOW TABLES LIKE % was returning rows.  Now I check that the resultset is not null and has at least 1 row before I process the table.

mysqldump.c:
  Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows


client/mysqldump.c:
  Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows
2005-03-28 13:06:43 -06:00
unknown
92db4a838f Fix reconnect when using prepared statements, and add
--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866)


client/mysqltest.c:
  Add support for --disable_reconnect and --enable_reconnect
mysql-test/r/kill.result:
  Update results
mysql-test/t/kill.test:
  Fix test to actually verify that killing a connection is working,
  and that automatic reconnect is working as desired.
sql-common/client.c:
  Clean up MYSQL->stmts on reconnect by invalidating statements
  not in the MYSQL_STMT_INIT_DONE state, and reconnecting others
  to the new MYSQL object.
2005-03-28 09:59:41 -08:00
unknown
b9c6c48268 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-28 13:56:27 +02:00
unknown
e674f4594f ndb - make printSchemaFile available (compile manually)
BitKeeper/deleted/.del-Makefile~b03e75f2bff8d72:
  Delete: ndb/src/kernel/blocks/dbdict/printSchemafile/Makefile
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  compile manually
2005-03-28 11:51:31 +02:00
unknown
e62a32a3a5 union.test:
Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
  Prove that this problem was fixed with bug9425 fix too.


mysql-test/t/union.test:
  Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
  Prove that this problem was fixed with bug9425 fix too.
2005-03-28 14:17:47 +05:00
unknown
f80b366f40 Bug#9425 A user variable doesn't always have implicit coercibility
Coercibility fixes for numeric types and not defined values were done.
2005-03-28 14:01:57 +05:00
unknown
8fa1f65afe Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-28 10:20:41 +02:00
unknown
949875cb7b func_system.test, ctype_utf8.test, func_system.result, ctype_utf8.result:
Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.


mysql-test/r/ctype_utf8.result:
  Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.
mysql-test/r/func_system.result:
  Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.
mysql-test/t/ctype_utf8.test:
  Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.
mysql-test/t/func_system.test:
  Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.
2005-03-28 12:24:12 +05:00
unknown
d5a7484a76 more wild_compare tests 2005-03-27 15:46:06 +02:00
unknown
ca5845ea16 merged
myisam/mi_create.c:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  merged with ul
2005-03-26 20:15:18 +01:00
unknown
68717638d5 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


acinclude.m4:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
2005-03-26 19:49:24 +01:00
unknown
606ee28d2a Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-03-26 19:49:17 +01:00
unknown
7f7f4f30b3 fixes for "backport wild_compare fix from 4.1 - bug#3924"
sql/sql_acl.cc:
  don't use acl_cache for GRANT
sql/sql_parse.cc:
  fixed backporting error in "backport wild_compare fix from 4.1 - bug#3924"
2005-03-26 19:46:42 +01:00
unknown
3fd639493a A fix for Bug#8226 "Cannot connect via shared memory":
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts. 
Post review fixes.


VC++Files/mysys/mysys.dsp:
  Add my_windac.c to mysys.lib
include/my_sys.h:
  Declarations for SECURITY_ATTRIBUTES create/destroy functions.
mysys/Makefile.am:
  Add my_windac.c to the list of compiled files.
sql-common/client.c:
  Lower requested access rights for events as the server won't 
  provide clients with ALL access in order to prevent denial
  of service attack.
sql/mysqld.cc:
  Set proper security attributes for the kernel objects to make them
  usable when mysqld is running as a Windows service.
2005-03-26 01:21:52 +03:00
unknown
0310e2a770 Fixing blackhole support in libmysqld
libmysqld/Makefile.am:
  Adding ha_blackhole.cc
2005-03-25 14:09:19 -08:00
unknown
fdd4cb8fb8 Fix upgrade/downgrade issue.
mysql-test/r/ps_1general.result:
  Fix test case.
sql/handler.h:
  Added federated to the list so that any beta users won't end up with a mismatch for table enum
2005-03-25 12:36:04 -08:00
unknown
2506bfe8a3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1
2005-03-25 12:34:07 -08:00
unknown
3785d2188f Merge mysql.com:/home/jimw/my/mysql-4.1-9323
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-25 09:45:58 -08:00
unknown
ad869ebda4 Merge mysql.com:/home/jimw/my/mysql-4.1-8499
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-25 09:45:30 -08:00
unknown
e4c529d9b5 mysql_client_test.c:
Don't run GBK test if not GBK support was compiled.


tests/mysql_client_test.c:
  Don't run GBK test if not GBK support was compiled.
2005-03-25 17:30:51 +04:00
unknown
90aa6e00a7 Allow inserting of extra HKSCS and cp950 characters into a Big5 column. 2005-03-25 16:08:54 +04:00
unknown
2a33129a49 Post-review fixes for "!include" patch originating from Yahoo! (the whole patch is recommitted)
mysys/default.c:
  Post-review fixes for "!include" patch originating from Yahoo!
2005-03-25 04:13:30 +03:00