1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Commit Graph

10619 Commits

Author SHA1 Message Date
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
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
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
unknown
329761e811 Merge mysql.com:/home/dlenev/src/mysql-4.1-bg10040
into mysql.com:/home/dlenev/src/mysql-5.0-merges


sql/item_timefunc.cc:
  Auto merged
2005-04-25 11:35:30 +04:00
unknown
20cf8f82ee Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg10040
2005-04-25 11:26:20 +04:00
unknown
b0d05dd9a3 Fix for func_sapdb failures on 64-bit platforms (aka Bug #10040
"'func_sapdb' fails on 64bit build hosts")


sql/item_timefunc.cc:
  calc_time_diff():
    Fixed yet another signedness problem.
2005-04-25 11:25:40 +04:00
unknown
c1d6b29c2a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8490-2
2005-04-25 04:25:32 +04:00
unknown
1bfb107050 Fix for BUG#10107: Memory leak in view over subquery:
In mysql_make_view when joining subquery lists, take into account that both lists
can have length > 1 (see also fix for BUG#8490) 
(note to bk trigger: this commit is about BUG#10107)


sql/sql_view.cc:
  Fix for BUG#10107: In mysql_make_view, when joining subquery lists, take into account 
  that both lists can have length > 1 (see also fix for BUG#8490)
2005-04-23 06:55:43 +04:00
unknown
f5c3843c37 Fixes for BUG#10039 "MEMORY engine is reported as HEAP",
BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs"



mysql-test/r/create.result:
  MEMORY, not HEAP
mysql-test/r/ps_1general.result:
  order changed in SHOW STORAGE ENGINES
mysql-test/r/variables.result:
  MEMORY, not HEAP
sql/handler.cc:
  the array of storage engine names is searched in index order, so we must put the preferred name
  before the alias so that the preferred name is printed by MySQL instead of the alias.
sql/log.cc:
  TC_LOG::open(): don't try to open if the index (relevant only for binlog TC log)
  could not be opened.
sql/set_var.cc:
  --log-update is deprecated and replaced by --log-bin so don't show log_update in SHOW VARIABLES.
2005-04-23 00:05:05 +02:00
unknown
8d44b2d3d7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8490-2
2005-04-23 00:52:33 +04:00
unknown
60496497df Fix for BUG#8490: In mysql_make_view for join algorithm views we need
to insert view's subqueries into select_lex->slave(->next)* chain. 
In case a join has several such views, don't add the same subqueries several times
(this forms a loop on the above chain which breaks many parts of the code)


mysql-test/r/view.result:
  Testcase for BUG#8490
mysql-test/t/view.test:
  Testcase for BUG#8490
2005-04-23 00:13:46 +04:00
unknown
c3e4d6a291 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-22 19:16:10 +02:00
unknown
af4c58e090 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-22 17:41:06 +02:00
unknown
179451fc2a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-22 17:40:19 +02:00
unknown
abc3a3609b Merge
sql/ha_ndbcluster.cc:
  Auto merged
2005-04-22 17:38:28 +02:00
unknown
ac6d9b2e50 Bug#7806 - insert on duplicate key and auto-update of timestamp
Merged fix for bugfix to 5.0.


sql/table.h:
  Auto merged
2005-04-22 17:13:18 +02:00
unknown
639d4295c6 Fix for Bug #9318 drop database does not drop ndb tables 2005-04-22 15:28:23 +02:00
unknown
c795511cf4 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-22 12:55:44 +02:00
unknown
83a8ee38e0 Fixed BUG#9004: Inconsistent behaviour of SP re. warnings
mysql-test/r/sp.result:
  New test case for BUG#9004.
  Also updated some other results, since formerly "invisible" (but correct)
  warnings now are visible.
mysql-test/t/sp.test:
  New test case for BUG#9004.
sql/sql_error.cc:
  Don't reset warnings while executing a stored routine.
sql/sql_parse.cc:
  Don't reset warnings while executing a stored routine.
2005-04-22 12:53:48 +02:00
unknown
3431b2179f Bug#7806 - insert on duplicate key and auto-update of timestamp
A fix of the original patch.
Correctly clear a bit from an enum value.
2005-04-22 12:30:09 +02:00
unknown
279880c2e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg9486


sql/sp_head.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-04-22 10:51:04 +04:00
unknown
7941c9af51 C99 Portability fix 2005-04-21 21:47:58 +02:00
unknown
264cf5c509 C99 Portability fix 2005-04-21 18:38:34 +01:00
unknown
4f1f0b670b Bug#8861
Correct previous bugfix
2005-04-21 15:36:10 +01:00
unknown
597f3dfa25 Merge
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-04-21 13:34:39 +01:00
unknown
62556b0023 Bug#8861 - If Return is a YEAR data type, value is not shown in year format
Bug partially fixed by 9775/9102 work on SP function return.


mysql-test/r/sp.result:
  Bug#8861
    Test for bug
mysql-test/t/sp.test:
  Bug#8861
    Test for bug
sql/protocol.cc:
  Bug#8861
    Requires change in assertion
2005-04-21 13:22:47 +01:00
unknown
da43c3cc6d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-21 13:12:59 +02:00
unknown
e2f5671064 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 13:10:05 +02:00
unknown
122a2fdaf1 Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert 2005-04-21 13:09:19 +02:00
unknown
bfe12fdb8d Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/export/space/pekka/ndb/version/my50
2005-04-21 12:55:19 +02:00
unknown
92fdd3b784 ndb - fix typo
sql/ha_ndbcluster.cc:
  typo, no effect
2005-04-21 12:53:40 +02:00
unknown
2f857c45d8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-04-21 12:43:12 +02:00
unknown
d1afca71d2 Merge mysql.com:/space/my/mysql-5.0
into mysql.com:/space/my/mysql-5.0-build
2005-04-21 10:39:15 +02:00
unknown
f26353f3b0 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


libmysql/libmysql.c:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-04-21 10:32:58 +02:00
unknown
e0d8dde3de After merge fix. 2005-04-21 10:29:05 +02:00
unknown
ab16339db2 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-04-21 10:27:37 +02:00
unknown
c1e0972879 Merge
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_cache.test:
  Auto merged
mysql-test/t/ndb_charset.test:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-04-21 10:26:14 +02:00
unknown
7f0f4c5875 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 09:27:20 +02:00
unknown
50ee81d5db Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-04-21 09:08:09 +02:00
unknown
53eb1b5b57 - manual merge
sql/share/Makefile.am:
  Auto merged
tools/Makefile.am:
  Auto merged
2005-04-21 08:30:59 +02:00
unknown
f79344100a Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


ndb/test/ndbapi/Makefile.am:
  Auto merged
2005-04-21 08:22:43 +02:00
unknown
714aa10a3c Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


ndb/test/ndbapi/Makefile.am:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-04-20 16:39:31 -07:00
unknown
2e33f4e2fb Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


sql/sql_select.cc:
  Auto merged
2005-04-20 15:08:22 -07:00
unknown
a52359e00c Fix for BUG#10037
* Add 0.01 to cost of 'range'+'using index' scan to avoid optimizer choice races with 
  'index' scan.


mysql-test/r/range.result:
  Update the test result after the changed cost
sql/opt_range.cc:
  Fix for BUG#10037
  * Add 0.01 to cost of 'range'+'using index' scan to avoid optimizer choice races with 
    'index' scan.
  * make QUICK_GROUP_MIN_MAX_SELECT handle the case where the source table is empty.
2005-04-21 01:55:33 +04:00
unknown
dafae91485 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


ndb/test/ndbapi/Makefile.am:
  Auto merged
2005-04-20 23:04:27 +02:00
unknown
6b645d309f Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-04-20 20:44:18 +02:00