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

36622 commits

This branch
This branch
All branches
Author SHA1 Message Date
kroki/tomash@moonlight.intranet
e79876362e Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-rt-merge
 2006-08-09 16:42:21 +04:00
kroki/tomash@moonlight.intranet
216ba85296 Post-merge fix. 2006-08-09 16:37:26 +04:00
kroki/tomash@moonlight.intranet
5c272816ca Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-09 13:37:20 +04:00
patg@govinda.patg.net
21f7f34776 BUG #21524 "'ps' test fails in --ps-protocol test AMD64 bit" 
(this is not a fix to the bug, but simply to disable the test in 
order to push a 5.0 to 5.1 merge)

This merge contains:

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
 2006-08-08 14:32:39 -07:00
patg@govinda.patg.net
8d1e5a5bb1 Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
 2006-08-08 09:01:32 -07:00
petr/cps@mysql.com/owlet.
5431ecb593 Fix windows pushbuild failure: the bug occured because 
we didn't check for NULL value of the
lex_create_info->db_type pointer.
The pointer is NULL in the case, when the engine name is
unknown to the server. This happens with NDB on Windows.
 2006-08-08 12:03:24 +04:00
petr/cps@owlet.
af461de728 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-curs-bug
 2006-08-04 14:48:51 +04:00
tsmith@maint1.mysql.com
a4eb61b88c Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
 2006-08-04 00:40:30 +02:00
msvensson@neptunus.(none)
f2aa07f80d Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-08-03 21:25:28 +02:00
jimw@rama.(none)
47f71efe0f Merge rama.(none):/home/jimw/my/mysql-5.1-17122 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-08-03 11:12:48 -07:00
tsmith@maint1.mysql.com
d6c4c3bad2 Manual merge resolve, part 6 of 6+ 2006-08-03 19:43:52 +02:00
msvensson@neptunus.(none)
34d48ce10a Use "--source" command instead of "source", makes mysql-test-run.pl dtecte this as test case that need binlog format row. 2006-08-03 19:35:00 +02:00
tsmith@maint1.mysql.com
e0b9910728 Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-a 
into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
 2006-08-03 19:28:20 +02:00
petr/cps@mysql.com/owlet.
be2ce2614b Fix Bug #18559 "log tables cannot change engine, and 
gets deadlocked when dropping w/ log on"

Log tables rely on concurrent insert machinery to add data.
This means that log tables are always opened and locked by
special (artificial) logger threads. Because of this, the thread
which tries to drop a log table starts to wait for the table
to be unlocked. Which will happen only if the log table is disabled.
Alike situation happens if one tries to alter a log table.
However in addition to the problem above, alter table calls
check_if_locking_is_allowed() routine for the engine. The
routine does not allow alter for the log tables. So, alter
doesn't start waiting forever for logs to be disabled, but 
returns with an error.
Another problem is that not all engines could be used for
the log tables. That's because they need concurrent insert.

In this patch we:
(1) Explicitly disallow to drop/alter a log table if it
    is currently used by the logger.
(2) Update MyISAM to support log tables
(3) Allow to drop log tables/alter log tables if log is
    disabled
At the same time we (4) Disallow to alter log tables to
unsupported engine (after this patch CSV and MyISAM are 
alowed)
Recommit with review fixes.
 2006-08-03 21:28:15 +04:00
tsmith@maint1.mysql.com
b9ac526884 5.0 -> 5.1 manual merge, part 5 of 5 (or more?) 2006-08-03 19:27:00 +02:00
msvensson@neptunus.(none)
fbad0da826 Replace FEDERATED_EQ with STRING_WITH_LEN("=") 2006-08-03 19:15:55 +02:00
msvensson@neptunus.(none)
62e553c1c5 Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug20942 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-08-03 19:10:18 +02:00
petr/cps@mysql.com/owlet.
7aec120549 Fix Bug #20139 Infinite loop after "FLUSH" and "LOCK tabX, general_log" 
Due to incorrect handling of FLUSH TABLES, log tables were marked for flush,
but not reopened. Later we started to wait for the log table to be closed
(disabled) after the flush. And as nobody disabled logs in concurrent treads,
the command lasted forever.
After internal consultations it was decided to skip logs during FLUSH TABLES.
The reasoning is that logging is done in the "log device", whatever it is
which is always active and controlled by FLUSH LOGS. So, to flush logs
one should use FLUSH LOGS, and not FLUSH TABLES.
 2006-08-03 17:23:37 +04:00
tsmith@maint1.mysql.com
cc4a6e0015 5.0 -> 5.1 manual merge, part 4 of 4 (or more?) 2006-08-03 10:48:01 +02:00
tsmith@maint1.mysql.com
8e0cc34af4 Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-c 
into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
 2006-08-03 10:41:14 +02:00
tsmith@maint1.mysql.com
06060fd602 Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-b 
into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-b
 2006-08-03 10:18:04 +02:00
tsmith@maint1.mysql.com
242ed711d2 5.0 -> 5.1 manual merge, part 1 of 3 (or more?) 2006-08-03 10:04:25 +02:00
petr/cps@owlet.
9f2214d8c0 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
 2006-08-02 17:49:27 +04:00
msvensson@neptunus.(none)
554b1f019b Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-08-02 15:45:03 +02:00
msvensson@neptunus.(none)
e6348e0277 Disable crash_commit_before waiting for a "crash()" function that won't generate a core. 2006-08-02 15:41:59 +02:00
joerg@trift2.
ae05282801 Merge trift2.:/M50/back241-5.0 
into  trift2.:/M51/merge-5.0-to-5.1
 2006-08-02 12:41:48 +02:00
msvensson@neptunus.(none)
faf5beb6de Bug#20942 ha_federated uses String::append(const char *s), strlen() on every call 
- Remove the defines for strings and uses STRING_WITH_LEN directly when calling 'append'
 2006-08-02 12:36:01 +02:00
evgen@sunlight.local
d6cf536d93 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-08-02 02:19:46 +04:00
evgen@sunlight.local
7b361c83b7 sql_view.cc: 
After merge fix
 2006-08-02 00:38:38 +04:00
evgen@sunlight.local
d4f92cbb5c Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-08-01 20:52:21 +04:00
evgen@sunlight.local
56a66c8dc4 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-08-01 20:01:05 +04:00
evgen@sunlight.local
0cb98e4f4a Makefile.am: 
After merge fix
 2006-08-01 19:56:22 +04:00
evgen@sunlight.local
a8405f650d func_str.result: 
After merge fix
 2006-08-01 18:55:44 +04:00
gkodinov/kgeorge@macbook.gmz
6909ab2627 serg's MacOSX-intel portability diff 2006-08-01 11:34:11 +03:00
gkodinov/kgeorge@rakia.(none)
8cf5a4c04e Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B20103-5.0-opt
 2006-08-01 11:17:14 +03:00
gkodinov/kgeorge@macbook.gmz
7b5e4ed026 Bug #20103: Escaping with backslash does not work 
- make the client to respect the server-side 
   no_backslash_escapes option and disable the 
   special meaning of backslash also at client side.
 2006-08-01 11:05:54 +03:00
msvensson@neptunus.(none)
4131be777e Bug#20439 mysqltest: remove unused options 
-Remove leftovers of server_stop and server_start commands
 2006-08-01 09:36:27 +02:00
msvensson@neptunus.(none)
39130d15eb Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug19535 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-08-01 09:33:00 +02:00
evgen@sunlight.local
dda7a95c59 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-08-01 09:24:19 +04:00
evgen@sunlight.local
799ecc9f2a After merge fix 2006-08-01 08:49:43 +04:00
gkodinov/kgeorge@rakia.(none)
63d198af1c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
 2006-08-01 06:11:11 +03:00
evgen@sunlight.local
6806776eed Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
 2006-08-01 06:42:33 +04:00
lars/lthalmann@dl145k.mysql.com
317bc36fd9 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-08-01 02:13:45 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
b3bc1d02de Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-08-01 02:10:30 +02:00
evgen@sunlight.local
1007b441df Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-07-31 23:49:52 +04:00
lars/lthalmann@dl145j.mysql.com
418d4eb39d Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-07-31 21:36:10 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
3fc037db1b Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-07-31 21:32:57 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
635281619b Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-07-31 21:30:24 +02:00
evgen@moonbone.local
b43b2a2fe0 select.result, func_group.result, sql_select.cc: 
After merge fix
 2006-07-31 23:05:54 +04:00
sergefp@mysql.com
6056f7714e BUG#14940: Post-merge fixes: update test results 2006-07-31 22:22:01 +04:00