1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00

22257 Commits

Author SHA1 Message Date
unknown
e31358aecb Merge
configure.in:
  SCCS merged
2005-04-29 15:44:24 +02:00
unknown
e28bf9ef5e WL#2286 Compile MySQL w/YASSL support
yaSSL-0.9.7 library bundled.


BUILD/Makefile.am:
  compile-pentium-debug-yassl added to distribution.
Makefile.am:
  Added yassl_dir to SUBDIRS. It contains path to yassl distribution if --with-yassl
  specified. It is empty otherwise.
configure.in:
  yaSSL CHECK-function call.
extra/Makefile.am:
  yaSSL added to distribution.
include/violite.h:
  YASSL_MYSQL_COMPATIBLE macro must be defined to make yassl headers compatible.
2005-04-28 18:23:27 +05:00
unknown
b890d3f508 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-27 11:43:00 +02:00
unknown
2821fa611b sql_repl.cc:
Remove printf's from semi-sync code in sql_repl.cc


sql/sql_repl.cc:
  Remove printf's from semi-sync code in sql_repl.cc
2005-04-27 03:18:54 +03:00
unknown
79d3149d3f Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0


innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
2005-04-27 03:02:25 +03:00
unknown
45baf2b5d9 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0


sql/mysqld.cc:
  Auto merged
2005-04-27 02:59:05 +03:00
unknown
705d163124 dict0dict.c, dict0dict.h, fil0fil.c:
Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names


innobase/fil/fil0fil.c:
  Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
innobase/include/dict0dict.h:
  Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
innobase/dict/dict0dict.c:
  Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
2005-04-27 02:57:19 +03:00
unknown
e5e73082b1 be sure to call top_level_item() on the new Item_cond_and,
that merges ON and WHERE (BUG#10162)


mysql-test/r/join_outer.result:
  BUG#10162 - ON is merged with WHERE, left join is convered to a regular join
mysql-test/t/join_outer.test:
  BUG#10162 - ON is merged with WHERE, left join is convered to a regular join
2005-04-27 01:32:44 +02:00
unknown
79b88ac4f7 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-26 10:30:27 -07:00
unknown
2bf1088b97 Merge mysql.com:/home/jimw/my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-clean


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  Auto merged
2005-04-26 10:29:58 -07:00
unknown
c0d3cacb63 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0 2005-04-26 19:18:05 +02:00
unknown
48f4fab6ae Merge of parallel fixes in 4.1 and 5.0 2005-04-26 19:16:18 +02:00
unknown
cb23a8537e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-04-26 19:11:54 +02:00
unknown
1faa742b86 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-26 08:56:29 -07:00
unknown
79953d9c65 Merge changes to acinclude.m4 that are now in config/ac-macros/misc.m4
config/ac-macros/misc.m4:
  Add detection of struct rlimit
2005-04-26 08:23:42 -07:00
unknown
557561bf77 Merge mysql.com:/home/jimw/my/mysql-4.1-9063
into mysql.com:/home/jimw/my/mysql-5.0-build


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-04-26 08:20:51 -07:00
unknown
cff8039064 Fix typo in include file name (Bug #9063)
acinclude.m4:
  Fix typo
2005-04-26 08:20:00 -07:00
unknown
194298265f Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-04-26 17:57:15 +03:00
unknown
e7243a9456 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b9489
2005-04-26 19:57:15 +05:00
unknown
0cb38f647a Added a check for config-file. 2005-04-26 17:57:14 +03:00
unknown
4e0dfceba4 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-04-26 17:47:19 +03:00
unknown
86d285197a A fix (bug #10176: problem with varchar keys).
myisam/mi_key.c:
  A fix (bug #10176: problem with varchar keys).
  Should skip key pack length for 'old' too.
2005-04-26 19:46:52 +05:00
unknown
7226989dc9 Fixed Bug#9834, "mysqld_multi --config-file parameter requires
absolute path".
2005-04-26 17:46:43 +03:00
unknown
0ba150c8f9 Merge quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita


mysql-test/r/blackhole.result:
  Auto merged
2005-04-26 16:09:04 +02:00
unknown
24caf249d3 checking that statements get into binlog even when they were affecting
no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).


mysql-test/r/blackhole.result:
  result update
mysql-test/t/blackhole.test:
  checking that statements get into binlog even when they were affecting
  no rows of the blackhold engine. So that this engine can serve as
  a binlog propagator (A->B->C replication where B has only blackhole tables,
  B receives binlog from A, applies it to blackhole tables, writes statements
  to its binlog which it sends to C; both A and C have non-blackhole tables). B is just a proxy.
2005-04-26 15:52:04 +02:00
unknown
5ac5febb1d Fixed Bug#6221, "mysqld_multi doesn't read the init_connect
option in my.cnf correctly"
2005-04-26 16:16:38 +03:00
unknown
f50739e1aa Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-04-26 14:29:20 +03:00
unknown
2f24a41c30 Fixed Bug#9835: mysqld_multi --help won't output help if there are
parameter problems.
2005-04-26 14:28:22 +03:00
unknown
910c305867 Final fix for NPTL configuration (bug#2173, bug#5871, and bug#9497).
include/my_global.h:
  As we have a new CPP symbol, this should be "undef"ed explicitly.
2005-04-26 13:15:20 +02:00
unknown
a88c92504c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-04-26 16:02:17 +05:00
unknown
e6675ed3ac Improved client internal help.
Doc fix for Bug#9870.
2005-04-26 14:02:16 +03:00
unknown
2929f984d7 Test case (bug #9756: mysql client failing on dumps containing certain \ sequences). 2005-04-26 15:48:16 +05:00
unknown
38360ef375 A fix (bug #9756: mysql client failing on dumps containing certain \ sequences).
mysys/charset.c:
  A fix (bug #9756: mysql client failing on dumps containing certain \ sequences).
  As 'to_end' points to the last position we should use '>' comparison 
  instead of '>=' there.
  'l' replaced with 'tmp_length' (in order not to mix 'l' with '1').
2005-04-26 15:43:20 +05:00
unknown
545063c30f Post-merge fix of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
config/ac-macros/openssl.m4:
  "Configure" variable 'IS_LINUX' renamed to 'TARGET_LINUX'.
  Manual merge: In 4.1, this was in 'acinclude.m4'.
include/my_global.h:
  As we have a new CPP symbol, this should be "undef"ed explicitly.
2005-04-26 12:16:12 +02:00
unknown
a783db511b Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
Post-merge fix will follow.


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Automerge / manual check.
configure.in:
  Automerge / manual check.
include/my_global.h:
  Automerge / manual check.
myisam/Makefile.am:
  Automerge / manual check.
scripts/Makefile.am:
  Automerge / manual check.
scripts/mysqld_safe.sh:
  Automerge / manual check.
support-files/Makefile.am:
  Automerge / manual check.
tools/mysqlmanager.c:
  Automerge / manual check.
2005-04-26 12:03:37 +02:00
unknown
ccfcfce6db Fix compile issues in Intel C/C++ compiler (Bug #9063)
acinclude.m4:
  Use AC_LANG_PUSH/POP instead of _SAVE/RESTORE
  Add test to get type of 'struct rlimit'
  Switch order of including stdlib.h and declaration being tested to
  match how it will be used in regular code.
configure.in:
  Call MYSQL_TYPE_STRUCT_RLIMIT macro
sql/mysqld.cc:
  Use STRUCT_RLIMIT for getting type of struct rlimit.
2005-04-25 18:02:03 -07:00
unknown
22311d2775 Merge 5.0-build -> 5.0 : keep NDB_VERSION_BUILD=6 2005-04-26 02:24:37 +04:00
unknown
09c3e18f24 BUG#10037: A proper fix: Add 0.01 to cost of 'range' scans, don't add 0.01 to cost of the 'index' scan. 2005-04-26 01:56:10 +04:00
unknown
c6c0665a1f regerror.c:
Changed function signature to fix compile errors with Whidbey


regex/regerror.c:
  Changed function signature to fix compile errors with Whidbey
2005-04-25 16:53:47 -05:00
unknown
ee5d8be5c0 - fixed NDB_VERSION_BUILD in configure.in to have the correct number (4->5)
configure.in:
  - fixed NDB_VERSION_BUILD to have the correct number (4->5)
2005-04-25 13:28:07 +02:00
unknown
26d95ae4a6 - update NDB_VERSION_BUILD, too 2005-04-25 13:18:44 +02:00
unknown
6427752d18 - bumped up version number in configure.in to 5.0.6 now that engineering branched off for the 5.0.5 builds
- tagged ChangeSet 1.1882 as the "clone-5.0.5-build" branchoff point


configure.in:
  - bumped up version number to 5.0.6 now that engineering branched off for the 5.0.5 builds
2005-04-25 12:58:03 +02:00
unknown
7e63da8335 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 12:02:34 +02:00
unknown
6815149b96 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
2005-04-25 11:59:50 +02:00
unknown
2c066230be bug#9749 - ndb lock upgrade
post review fix.
  don't init hash value on restart operations
  make sure that lock mode is correct in entire que.


ndb/test/ndbapi/testOperations.cpp:
  Test case also for abort case.
    (abort if not lock owner still fails!)
2005-04-25 11:59:00 +02:00
unknown
1179a88724 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-25 11:55:27 +02:00
unknown
86c75663b4 Post review fix of ndbcluster_drop_database, typo 2005-04-25 11:54:00 +02:00
unknown
2417cdbf63 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-25 11:47:39 +02:00
unknown
d490e4def8 Post review fix of ndbcluster_drop_database, print error 2005-04-25 11:34:47 +02:00
unknown
32d2b6ed04 Post review fix of ndbcluster_drop_database 2005-04-25 11:31:16 +02:00