database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity
49,993 Commits 3,276 Branches 1,097 Tags
b75eb1ee3e91dbbd7be78bf3a1e18a07642c4c1c
Commit Graph

19659 Commits

Author SHA1 Message Date
malff/marcsql@weblab.(none)
ef2bca44b0 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-27857
 2007-06-14 12:00:14 -06:00
mskold/marty@linux.site
7b99f8a0fc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-06-14 19:08:46 +02:00
tomas@whalegate.ndb.mysql.com
0da2eb5ce3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-14 18:43:29 +02:00
tomas@whalegate.ndb.mysql.com
ad81e83c70 Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed" 
- correction, missing node id
 2007-06-14 18:40:32 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
160add01a5 fix the binlog-stm_ps.test for the embedded-server 2007-06-14 20:33:57 +05:00
mskold/marty@linux.site
8945183fc3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-06-14 16:21:52 +02:00
mskold/marty@linux.site
c487c38111 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-06-14 16:10:11 +02:00
mats@kindahl-laptop.dnsalias.net
a6e2763853 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
 2007-06-14 15:48:32 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ad88a849c8 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
 2007-06-14 20:45:12 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
27430cd10b Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
 2007-06-14 20:30:48 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
04931cfcd6 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
 2007-06-14 19:57:50 +08:00
holyfoot/hf@hfmain.(none)
1e9373fd60 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-06-14 16:42:43 +05:00
holyfoot/hf@hfmain.(none)
8ccc50b303 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-06-14 16:41:10 +05:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
51fe11b494 Bug#27640, backup id not displayed in the output of "ndb_mgm start backup wait completed" 2007-06-14 19:40:44 +08:00
holyfoot/hf@mysql.com/hfmain.(none)
79062df3fb Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
 2007-06-14 16:35:46 +05:00
holyfoot/hf@hfmain.(none)
76e0a0768a Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-06-14 16:35:20 +05:00
mats@kindahl-laptop.dnsalias.net
0341be4eb3 BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): 
Temporarily using thd_tx_isolation() until decision is made on how to
get the isolation level.
 2007-06-14 13:33:31 +02:00
svoj@june.mysql.com
d122a8caf7 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
 2007-06-14 16:28:34 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
6d2ffe7b8e Bug#26402 Server crashes with old-style named table 
Problem: crash on attempt to open a table
  having "#mysql50#" prefix in db or table name.
  Fix: This prefix is reserved for "mysql_upgrade"
  to access 5.0 tables  whose file names are not encoded
  according to "5.1 tablename to filename encoded".
  Don't try open tables whose db name or table name
  has this prefix.
 2007-06-14 16:28:33 +05:00
svoj@june.mysql.com
09cd5b5ef8 Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
 2007-06-14 16:19:47 +05:00
svoj@mysql.com/june.mysql.com
01c9419cec BUG#26976 - Missing table in merge not noted in related error msg + 
SHOW CREATE TABLE fails
Addition to the fix: report db name + table name instead of table path.
This solves embedded merge test failure.
 2007-06-14 16:18:01 +05:00
tomas@whalegate.ndb.mysql.com
b2aa8dd4d3 Bug #29103 ndb_restore segfaults on NULL var[char|binary] 2007-06-14 12:51:13 +02:00
gkodinov/kgeorge@magare.gmz
2372767bbd Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28991-5.1-opt
 2007-06-14 12:54:52 +03:00
gkodinov/kgeorge@magare.gmz
56290f2690 Bug #28991: rpl_events failure in pushbuild 
In tests waiting on a timeout is not deterministic enough
to make sure that an event actually finished executing.
Fixed the test by waiting in a loop and checking the effect
that the event is supposed to produce.
 2007-06-14 12:53:13 +03:00
kostja@bodhi.(none)
96f57c13df Add a missing wait_condition call. 2007-06-14 13:51:35 +04:00
mats@kindahl-laptop.dnsalias.net
61ac88f313 WL#3303 (RBR: Engine-controlled logging format): 
Test case fixes.
 2007-06-14 11:05:48 +02:00
msvensson@pilot.(none)
5791fe1ced Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test failures 
- touch up
 2007-06-14 08:48:00 +02:00
msvensson@pilot.(none)
8e393b776e Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-14 08:38:49 +02:00
malff/marcsql@weblab.(none)
dd2bdfda8d Bug#27857 (Log tables supplies the wrong value for generating AUTO_INCREMENT 
numbers)

Before this patch, the code in the class Log_to_csv_event_handler, which is
used by the global LOGGER object to write to the tables mysql.slow_log and
mysql_general_log, was supporting only records of the format defined for
these tables in the database creation scripts.

Also before this patch, the server would allow, with certain limitations,
to perform ALTER TABLE on the LOG TABLES.

As implemented, the behavior of the server, with regards to LOG TABLES,
is inconsistent:
- either ALTER TABLES on LOG TABLES should be prohibited,
and the code writing to these tables can make assumptions on the record
format,
- or ALTER TABLE on LOG TABLES is permitted, in which case the code
writing a record to these tables should be more flexible and honor
new fields.

In particular, adding an AUTO_INCREMENT column to the logs,
does not work as expected (per the bug report).

Given that the ALTER TABLE on log tables statement has been explicitly
implemented to check that the log should be off to perform the operation,
and that current test cases already cover this, the user expectation is
already set that this is a "feature" and should be supported.

With this patch, the server will:
- populate AUTO INCREMENT columns if present,
- populate any additional column with it's default value
when writing a record to the LOG TABLES.

Tests are provided, that detail the precise sequence of statements
a SUPER user might want to perform to add more columns to the log tables.
 2007-06-13 22:05:22 -06:00
dkatz@damien-katzs-computer.local
7a303bc80e Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-06-13 16:37:16 -04:00
dkatz@damien-katzs-computer.local
471173c57c Bug #28953 Using events in a replication let the slave crash. 
Fixed where the slave code would try to update the Lex->sphead which is NULL on an "alter table" commands.
 2007-06-13 16:24:21 -04:00
dkatz@damien-katzs-computer.local
c67c49fff0 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50_win
 2007-06-13 15:47:34 -04:00
dkatz@damien-katzs-computer.local
1481bfc87b Bug #28897 UUID() returns non-unique values when query cache is enabled 
Removed the ability to cache queries containing "UUID()".
 2007-06-13 14:23:25 -04:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
422d7999b5 rpl_known_bugs_detection.test: 
Updated to use new tool(s):Missed on call, resubmitting
 2007-06-13 19:52:42 +02:00
igor@olga.mysql.com
20ad515003 Fixed bug #28980: the result of ROUND(<decimal expr>,<int column>) 
was erroneously converted to double, while the result of
ROUND(<decimal expr>, <int literal>) was preserved as decimal.
As a result of such a conversion the value of ROUND(D,A) could
differ from the value of ROUND(D,val(A)) if D was a decimal expression.

Now the result of the ROUND function is never converted to 
double if the first argument is decimal.
 2007-06-13 09:32:36 -07:00
jmiller/ndbdev@ndb08.mysql.com
8b44b6f593 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/data2/mysql-5.1-maint
 2007-06-13 17:44:21 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
61873b6765 rpl_known_bugs_detection.test: 
Updated to use new tool(s)
 2007-06-13 17:43:31 +02:00
mikael@dator6.(none)
4ab5e26d93 Disabled ascii-function 2007-06-13 17:28:59 +02:00
mikael@dator6.(none)
920a8ed5b3 Merge dator6.(none):/home/mikael/mysql_clones/clean-mysql-5.1 
into  dator6.(none):/home/mikael/mysql_clones/bug18198
 2007-06-13 16:03:18 +02:00
mhansson@dl145s.mysql.com
b87dbfe949 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/users/mhansson/mysql/autopush/5.1o-bug27634
 2007-06-13 16:01:16 +02:00
stewart@flamingspork.com[stewart]
85eba85b40 [PATCH] Enable test for (Closed) bug 16445 
Bug was updated on May 30th by Tomas to say that hasn't been seen in PB
since global dict cache rewrite. This test should probably be enabled then.

Index: ndb-work/mysql-test/t/ndb_basic.test
===================================================================
 2007-06-13 23:34:22 +10:00
stewart@flamingspork.com[stewart]
367076371e [PATCH] Add tests for ndb variables (related to BUG#26675) 
This is somewhat related to BUG#26675 (ndb_connectstring not reported
in show global variables)

Index: ndb-work/mysql-test/r/ndb_basic.result
===================================================================
 2007-06-13 23:33:51 +10:00
stewart@flamingspork.com[stewart]
35006868d1 [PATCH] Disable mysql_upgrade test (Bug#28560) 
Index: ndb-work/mysql-test/t/disabled.def
===================================================================
 2007-06-13 23:33:37 +10:00
mats@kindahl-laptop.dnsalias.net
4ecdd55b49 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
 2007-06-13 15:18:39 +02:00
mats@kindahl-laptop.dnsalias.net
c6bfb5b4ef Fixing some trivial test problems. 2007-06-13 15:16:33 +02:00
mats@kindahl-laptop.dnsalias.net
0cf7e502ee BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): 
Post-merge fixes.
 2007-06-13 12:28:35 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
3587614be7 after-merge fix. 2007-06-13 14:59:31 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
87e7709fae Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28748/b28748.5.0
 2007-06-13 14:21:44 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
722f9305e0 Merge mysql.com:/home/ram/work/b28748/b28748.5.0 
into  mysql.com:/home/ram/work/b28748/b28748.5.1
 2007-06-13 14:16:39 +05:00
msvensson@pilot.(none)
4437fd649d Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-13 10:37:31 +02:00