mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21149 commits 2791 branches 343 tags 1.7 GiB
Commit graph

21149 commits

This branch
This branch
All branches
Author SHA1 Message Date
ramil@mysql.com
3f6fdabe4f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-03-15 20:06:37 +04:00
ramil@mysql.com
4ee9cc5a98 after merge fix 2005-03-15 19:43:32 +04:00
ramil@mysql.com
d5e3ba70f3 merging 2005-03-15 19:31:52 +04:00
msvensson@neptunus.(none)
3f8a66cbea Merged WL#2269 to mysql-5.0 2005-03-15 15:22:40 +01:00
msvensson@neptunus.(none)
2bdd710d3c WL#2269 Enable query cache for NDB part 2 
-This is mostly fixes for correct behaviour when using query cache + transactions + the thread that
fetches commit count from NDB at regular intervals. The major fix is to add a
list in thd_ndb, that keeps a list of NDB_SHARE's that were modified by
transaction and then "clearing" them in ndbcluster_commit.
 2005-03-15 15:03:25 +01:00
konstantin@mysql.com
021f8d2170 Cleanup 2005-03-15 16:54:11 +03:00
marko@hundin.mysql.fi
37905eea50 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0
 2005-03-15 14:47:22 +02:00
lenz@mysql.com
49e7ca8364 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-03-15 13:47:21 +01:00
ramil@mysql.com
04328c3dfa A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end). 2005-03-15 15:32:11 +04:00
lenz@mysql.com
945aad6b49 Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0
 2005-03-15 12:28:43 +01:00
lenz@mysql.com
c7506fa5f9 - Build fix for Do-solaris-pkg: fixed package name matching regex to be satisfied with 
"mysql-pro-gpl-cert" packages as well (thanks to Kent for the suggestion)
 2005-03-15 12:27:44 +01:00
lenz@mysql.com
2714f176fb Applied some changes to the mysql.server init script that are already shipped as an additional patch 
in the 4.1.10a RPMs for SLES9/RHEL3:

- small improvement: use LSB functions to display startup success and failure, if available.
  Fall back to more primitive builtin functions otherwise.
- joined two pieces of code performing the same functionality into one "wait_for_pid" function
- added a "reload" function (LSB requirement)
 2005-03-15 12:23:14 +01:00
pekka@mysql.com
d8d8cf1f72 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/pekka/ndb/version/my50
 2005-03-15 12:06:29 +01:00
pekka@mysql.com
23355a3c95 ndb - valgrind/compile fix Transporter.cpp: missing return 2005-03-15 12:01:41 +01:00
joerg@mysql.com
74708ae075 Avoid compilation error: On IRIX, identifiers with loop scope still need to be unique 
at function level.
 2005-03-15 11:55:27 +01:00
ramil@mysql.com
ec775b65f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b8799
 2005-03-15 14:13:44 +04:00
joerg@mysql.com
ba8d7edb5f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-03-15 11:12:55 +01:00
marko@hundin.mysql.fi
2729e866df dict0load.c: 
dict_load_table(): Remove unused label that was accidentally introduced
  in a 4.0->4.1->5.0 merge.
 2005-03-15 11:50:44 +02:00
ramil@mysql.com
46613bafbe A fix (bug #8489: Strange auto_increment behaviour with HEAP table). 2005-03-15 13:32:12 +04:00
marko@hundin.mysql.fi
6dba591d0b After merge fixes 2005-03-15 11:22:20 +02:00
marko@hundin.mysql.fi
dd20809e32 Merge hundin.mysql.fi:/home/marko/k/mysql-4.0 
into hundin.mysql.fi:/home/marko/mysql-4.1
 2005-03-15 11:14:57 +02:00
patg@krsna.
d0603db72a Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.:/home/patg/test/mysql-5.0
 2005-03-15 00:36:38 -08:00
patg@krsna.
24bc862456 This changeset contains changes approved in code review by 
Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully 
tested on both my own workstation (Suse 9.0) and production.mysql.com.
 2005-03-15 00:32:21 -08:00
sergefp@mysql.com
ce564b2d7f Updated tests results for BUG#8510 2005-03-15 10:27:44 +03:00
heikki@hundin.mysql.fi
9967ee9d28 buf0flu.c: 
Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user
 2005-03-15 08:33:47 +02:00
sergefp@mysql.com
1e1a1b1f82 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug8510
 2005-03-15 09:33:46 +03:00
sergefp@mysql.com
62465a98e2 Merge mysql.com:/home/psergey/mysql-4.1-bug8510 
into mysql.com:/home/psergey/mysql-5.0-bug8510
 2005-03-15 09:29:54 +03:00
paul@snake-hub.snake.net
d5296c39eb Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
 2005-03-14 20:22:15 -06:00
paul@snake-hub.snake.net
4db8986006 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0 
into snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1
 2005-03-14 19:59:59 -06:00
paul@snake-hub.snake.net
4af3c8a23a mysql.1.in: 
Fix path that needs no parameterization.
 2005-03-14 19:59:00 -06:00
sergefp@mysql.com
e7e2a8c8eb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug8510
 2005-03-15 04:09:41 +03:00
konstantin@mysql.com
6a2ef5577c WL#926 "AVG(DISTINCT) and other distincts", part 2 (out of 3): clean up 
Item_sum_count_distinct, and
deploy Unique for use with COUNT(DISTINCT) if there is no blob
column in the list of DISTINCT arguments.
 2005-03-15 03:46:19 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
98e83555a5 Merge 4.1 - 5.0 2005-03-15 01:14:59 +02:00
serg@serg.mylan
57adc4d740 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-14 20:45:10 +01:00
serg@serg.mylan
f04bef8faf merged 2005-03-14 18:46:30 +01:00
serg@serg.mylan
3613f8c262 sql/log.cc 
don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs
sql/sql_repl.cc
    clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave
 2005-03-14 17:53:24 +01:00
gluh@gluh.mysql.r18.ru
354a93842f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-03-14 19:47:46 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
9ec8d87328 Updated error message to be more informative. Previous error message 
"Access denied to database mysql" was actually not just misleading, but
also wrong.

Bug#7905.
 2005-03-14 16:59:09 +02:00
mskold@mysql.com
f2db341abe Removed unnecessary current_thd 2005-03-14 15:53:44 +01:00
gluh@gluh.mysql.r18.ru
ee434e5cc9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-03-14 17:27:10 +03:00
mskold@mysql.com
7092c7dec2 WL#2353 EXPLAIN support for condition pushdown 2005-03-14 15:26:10 +01:00
serg@serg.mylan
dba1e0889a Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-14 14:47:51 +01:00
mskold@bk-internal.mysql.com
ca3391c7e7 Removed files that disabled ndb tests 2005-03-14 12:27:02 +01:00
msvensson@neptunus.(none)
13ec961c3a BUG#6554 Problem Building MySql on Fedora Core 3 
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3
 2005-03-14 12:07:49 +01:00
marko@hundin.mysql.fi
d5c1475db6 dict0load.c: 
dict_load_table(): Refuse to open ROW_FORMAT=COMPACT tables
  of MySQL 5.0.3 and later.
 2005-03-14 12:43:22 +02:00
mskold@bk-internal.mysql.com
c30095c920 Marked missing file gone 2005-03-14 11:37:26 +01:00
mskold@bk-internal.mysql.com
c7f46d678a Removed 2005-03-14 11:12:54 +01:00
serg@serg.mylan
ada959edf8 anotehr fix for Item_func_isnotnull::not_null_tables() 2005-03-14 11:04:42 +01:00
serg@serg.mylan
a6b3b8fa98 print more information 2005-03-14 09:27:34 +01:00
marty@linux.site
20ca32862a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into linux.site:/home/marty/MySQL/mysql-5.0
 2005-03-14 09:21:15 +01:00