mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
14068 commits 2790 branches 343 tags 1.7 GiB
Commit graph

14068 commits

This branch
This branch
All branches
Author SHA1 Message Date
brian@avenger.(none)
32f2674a07 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into avenger.(none):/export/brian/mysql/4.1
 2004-08-23 12:31:03 -07:00
brian@avenger.(none)
e4a2cdde47 Changing version information. 2004-08-23 12:28:28 -07:00
serg@serg.mylan
f68219f6df Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-23 21:25:25 +02:00
serg@serg.mylan
2f8be12b85 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-23 21:11:06 +02:00
lenz@mysql.com
871625c5d5 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2004-08-23 21:03:16 +02:00
lenz@mysql.com
0479919884 - removed mysql-test/t/flush_block_commit-master.opt as it collided 
with the sleep value we use for the test suite run during the
   release builds
 2004-08-23 20:58:56 +02:00
mskold@mysql.com
9ad2448606 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-23 20:33:38 +02:00
gluh@gluh.mysql.r18.ru
b1847f471c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
 2004-08-23 20:18:24 +04:00
gluh@gluh.mysql.r18.ru
7b17daf21e Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results(for 4.1 tree) 2004-08-23 20:17:14 +04:00
mskold@mysql.com
c644595dac Fix for bug#5171 2004-08-23 17:24:03 +02:00
bar@mysql.com
1ffd4d6129 show_check.test, show_check.result: 
Don't do this test for now: it fails on Mac OSX.
 2004-08-23 20:12:40 +05:00
bar@mysql.com
0983295859 Bug#4594: column index make = failed for gbk, but like works 
Fix for HEAP+HASH prefix keys.
 2004-08-23 20:12:39 +05:00
tomas@poseidon.(none)
b8dfb7eaf1 reverted default setting of --ndbcluster if --ndb-connectstring is given 2004-08-23 15:12:38 +00:00
serg@serg.mylan
0df870ef1e Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-23 14:07:59 +02:00
serg@serg.mylan
157a041baa bdb bugfix: LTLIBOBJS didn't take --disable-shared into account 
fix for bdb not ending up into libmysqld.a
 2004-08-23 13:55:40 +02:00
serg@serg.mylan
a835e9bc9c unnecessary LINT_INIT removed 2004-08-23 13:43:55 +02:00
serg@serg.mylan
52731bec19 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-23 11:15:44 +02:00
sergefp@mysql.com
a309f76128 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-root-root
 2004-08-23 13:15:43 +04:00
tomas@poseidon.(none)
efac41149c small ndb switch fix 2004-08-23 09:15:42 +00:00
serg@serg.mylan
a64ac380b5 better for for bug#4767 2004-08-23 10:53:53 +02:00
tomas@poseidon.(none)
552d841be2 stylistic fixes 2004-08-23 08:42:31 +00:00
sergefp@mysql.com
263f2e3fe2 Fix for bug#5088: 
* When executing EXPLAIN, do the same as for the query: convert join type to JT_CONST if keyuse array covers all key parts and all of them are constants.
 * In remove_const, don't remove conditions that depend on some-const-table and current-table.
 2004-08-23 12:31:56 +04:00
tomas@poseidon.(none)
05853d95de Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-23 07:33:40 +00:00
serg@serg.mylan
f0fffbe21b Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-22 14:24:45 +02:00
serg@serg.mylan
326992430f check for mysql_bin_log.is_open() before my_b_tell(&thd->transaction.trans_log 
in ha_commit_trans - why it didn't crash earlier ?
 2004-08-22 14:23:52 +02:00
serg@serg.mylan
d0afecff15 merged 2004-08-22 12:47:11 +02:00
serg@serg.mylan
d5bf903e4d after merge fixes 2004-08-22 12:43:26 +02:00
serg@serg.mylan
99bb6ff7a0 ported bugfix for #2408 from 3.23 
(cannot call it a "merge" :)
 2004-08-22 10:22:59 +02:00
serg@serg.mylan
ca35127739 bug#2408 - Multiple threads altering MERGE table UNIONs hang/crash. 
Abandoned improper use of MyISAM data.
Thanks Ingo!
 2004-08-22 09:36:17 +02:00
serg@serg.mylan
566344b42e libedit safety fix: account for closing \0 2004-08-21 23:53:42 +02:00
paul@ice.snake.net
8f43d0c4b2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-08-21 12:35:33 -05:00
konstantin@mysql.com
df1d90d12b Fix to skip flush_block_commit test if the server was compiled 
without InnoDB.
 2004-08-21 11:30:41 +04:00
igor@rurik.mysql.com
4b760fcb94 null.test, null.result: 
Added test case for bug #4256.
join_outer.result:
  Fixed bug #4256.
item_cmpfunc.h:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects.
  This inconsistency caused bug #4256.
 2004-08-20 23:48:30 -07:00
igor@rurik.mysql.com
02f9e068b9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-08-20 16:32:40 -07:00
paul@ice.snake.net
db40cfb43b Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-08-20 17:22:56 -05:00
igor@rurik.mysql.com
b817b007f9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-08-20 15:10:12 -07:00
konstantin@mysql.com
75454b0a1d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/work/mysql-4.1-4912
 2004-08-21 02:08:20 +04:00
konstantin@mysql.com
568c6e8526 Fix for bug#4912 "mysqld crashs in case a statement is executed 
a second time". The bug was caused by incompatibility of
negations elimination algorithm and PS: during first statement 
execute a subtree with negation was replaced with equivalent 
subtree without NOTs.
The problem was that although this transformation was permanent, 
items of the new subtree were created in execute-local memory.
The patch adds means to check if it is the first execute of a
prepared statement, and if this is the case, to allocate items
in memory of the prepared statement.
The implementation:
- backports Item_arena from 5.0
- adds Item_arena::is_stmt_prepare(), 
  Item_arena::is_first_stmt_execute().
- deletes THD::allocate_temporary_pool_for_ps_preparing(),
  THD::free_temporary_pool_for_ps_preparing(); they
  were redundant.
and adds a few invariants:
- thd->free_list never contains junk (= freed items)
- thd->current_arena is never null. If there is no
  prepared statement, it points at the thd. 
The rest of the patch contains mainly mechanical changes and
cleanups.
 2004-08-21 02:02:46 +04:00
mysqldev@mysql.com
325ea1b991 mysql-copyright: 
Fixed it to work, added function to fix include/mysql_version.h LICENSE tag from GPL to Commercial
 2004-08-21 00:02:45 +02:00
igor@rurik.mysql.com
3862914416 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-08-20 14:09:50 -07:00
serg@serg.mylan
949348f576 after merge fix 2004-08-20 22:54:42 +02:00
serg@serg.mylan
f401650290 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-20 22:37:19 +02:00
joreland@mysql.com
8c938872a2 variable scoop, compile fix 2004-08-20 22:18:39 +02:00
serg@serg.mylan
050bf6a89f merged 2004-08-20 21:56:29 +02:00
joreland@mysql.com
9d44e240bd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-20 21:56:15 +02:00
rburnett@build.mysql.com
69ec557494 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into build.mysql.com:/users/rburnett/mysql-4.1
 2004-08-20 21:48:16 +02:00
igor@rurik.mysql.com
433206c1f2 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-08-20 12:31:57 -07:00
joreland@mysql.com
3145031ae1 removed debug printout 2004-08-20 21:07:08 +02:00
joreland@mysql.com
c7f311c450 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-20 20:58:55 +02:00
serg@serg.mylan
b267ce4bb4 sql_select.cc: compilation failure fixed 2004-08-20 20:10:49 +02:00