1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Commit Graph

24084 Commits

Author SHA1 Message Date
skozlov/ksm@mysql.com/virtop.(none)
b2fe75a1ec Fix for binlog_index test case: hide difference for paths from warning messages between Windows and Unix 2008-04-05 15:09:53 +04:00
skozlov/ksm@virtop.(none)
07f5b33ae8 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  mysql.com:/home/ksm/mysql/bugs/commit-mysql-5.1-new-rpl-bug28772
2008-04-05 10:50:09 +04:00
joerg@trift2.
0d0b67d270 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/tmp-5.1

Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
2008-04-04 19:52:48 +02:00
joerg@trift2.
2092e0c004 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/tmp-5.1
2008-04-04 19:25:39 +02:00
mleich@five.local.lan
71dd9bda70 Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2008-04-04 18:02:55 +02:00
msvensson@pilot.mysql.com
cea71680eb Fix paths MYSQLTEST_VARDIR/master-data -> MYSQLD_DATADIR 2008-04-04 17:46:48 +02:00
mleich@five.local.lan
7498f9e6b8 Backport of fix made in 5.1 to 5.0
mysql-test/Makefile.am   :    Fix a copy-paste error ...
2008-04-04 17:41:14 +02:00
joerg@trift2.
a1173ad61b mysql-test/Makefile.am : Fix a copy-paste error ... 2008-04-04 13:21:40 +02:00
skozlov/ksm@mysql.com/virtop.(none)
b1dafe5efe Bug#32653.
Added --log-slave-updates because test requires it. 
The events based on LOAD DATA INFILE masked by --replace_regex instead restarting of slave.
Added waiting start and stop of slave after START|STOP SLAVE statements.
2008-04-04 01:16:55 +04:00
msvensson@pilot.mysql.com
17a5ef3984 Merge bk-internal:/home/bk/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
2008-04-03 21:51:26 +02:00
msvensson@pilot.mysql.com
95d9608d3e Fix paths in test and result files 2008-04-03 21:40:10 +02:00
cmiller@zippy.cornsilk.net
bb7d01f73d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-04-03 11:30:38 -04:00
cmiller@zippy.cornsilk.net
a296df9581 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-04-03 11:28:10 -04:00
joerg@trift2.
c62e5bbe46 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-04-03 15:30:39 +02:00
msvensson@pilot.mysql.com
a011d27cf9 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-04-03 11:50:43 +02:00
skozlov/ksm@virtop.(none)
8f95b8d230 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  mysql.com:/home/ksm/mysql/bugs/commit-mysql-5.1-new-rpl-bug30128
2008-04-03 13:08:03 +04:00
msvensson@shellback.(none)
f1312d30bb Dynamically set debug flag for session only
- avoid restart
- keep all in one file
- fix --check-testcase
2008-04-03 10:27:56 +02:00
mleich@five.local.lan
3e8657456a Merge five.local.lan:/work/merge/mysql-5.1-funcs_1
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
2008-04-02 21:30:48 +02:00
mleich@five.local.lan
d14e25bf7b Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2008-04-02 21:29:43 +02:00
skozlov/ksm@mysql.com/virtop.(none)
2e5a329066 Bug#28772, added waiting Until_Log_Pos when slave starting with UNTIL clause and then waiting stop of slave.
It helps to avoid issues when slave starts too slowly.
2008-04-02 22:50:54 +04:00
mkindahl@dl145h.mysql.com
70827ee13e Post-merge fixes to make tests pass. 2008-04-02 20:47:16 +02:00
mleich@five.local.lan
cf8e6655ab Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
into  five.local.lan:/work/merge/mysql-5.1-funcs_1
2008-04-02 20:24:07 +02:00
mleich@five.local.lan
c01918948c Correct the location of the directory for
"funcs_1" data load
2008-04-02 19:47:20 +02:00
skozlov/ksm@mysql.com/virtop.(none)
fd8d82aed7 Bug#30128, The reason that sometimes events were executed because without STARTS clause server fires immediately after creating event and
time between create and delete event sometimes is enough for firing. So adding STARTS clause moves first execution in future after drop of event.
2008-04-02 19:41:49 +04:00
cmiller@zippy.cornsilk.net
844939eed6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-04-02 10:58:37 -04:00
cmiller@zippy.cornsilk.net
c83c18c058 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-04-02 10:56:49 -04:00
mleich@five.local.lan
4f4d10da03 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2008-04-02 14:55:35 +02:00
mleich@five.local.lan
a36a3fa266 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
2008-04-02 14:50:29 +02:00
mkindahl@dl145h.mysql.com
5669551ccd Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-04-02 12:36:38 +02:00
sven@riska.(none)
0a4d373f3d BUG#34541: mysqlbinlog prints 'set;' in stm mode after changing autocommit mode
Problem: a typo in the code. When autocommit, foreign_key_checks,
sql_auto_is_null, or unique_checks changes, it prints "SET", and then a
comma-separated list of assignments. However, it does not print the
assignment to the @@autocommit variable.
Fix: print the @@autocommit variable.
2008-04-02 16:49:22 +07:00
msvensson@pilot.mysql.com
16d4936e3b Set verbose to off by default 2008-04-02 10:08:44 +02:00
msvensson@pilot.mysql.com
d4eecb9677 Add mtr database 2008-04-02 10:06:36 +02:00
kent/mysqldev@mysql.com/production.mysql.com
fd1bd7547a mysqld.cc:
Corrects build problems embedded on Windows
Makefile.am:
  Install .sym or mysqld-debug if exists
query_cache_debug.test, query_cache_debug.result:
  Set more resonable query cache size (bug#35749)
CMakeLists.txt:
  Added missing stacktrace.c
2008-04-02 00:43:17 +02:00
mleich@five.local.lan
bc3b4a2cf9 Merge five.local.lan:/work/merge/mysql-5.1-Bug
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
2008-04-01 23:19:37 +02:00
mleich@five.local.lan
4822079f0a Merge five.local.lan:/work/merge/mysql-5.0-Bug
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2008-04-01 23:03:23 +02:00
mleich@five.local.lan
4002e5c362 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.1-release
into  five.local.lan:/work/mysql-5.1-24-rc
2008-04-01 19:29:29 +02:00
mleich@five.local.lan
1f26fe0815 Fixes for failing funcs_1 tests in mysql-5.1.24-rc
Problems were caused by modifications of
- the server
  - HANDLER FOR SQLSTATE '00000' is now rejected (bug fix)
    affects several ..._storedproc* tests
  - improved error message
    affects the ..._trig_03e
  - improved content of information_schema.COLUMNS about
    information_schema.REFERENTIAL_CONSTRAINTS
    affects is_columns_is
- the content of the community build (collations)
    affects charset_collation_3
2008-04-01 19:22:37 +02:00
cmiller@zippy.cornsilk.net
7a9f12e1c4 Test updated. 2008-04-01 12:26:12 -04:00
cmiller@zippy.cornsilk.net
15b1a5ff54 Bug#15776: 32-bit signed int used for length of blob
Based on contributed patch from Martin Friebe, CLA from 2007-02-24.

The parser lacked support for field sizes after signed long,
when it should extend to 2**32-1.

Now, we correct that limitation, and also make the error handling
consistent for casts.
---
Fix minor complaints of Marc Alff, for patch against B-g#15776.
---
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
---
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
---
testing
2008-04-01 12:19:20 -04:00
mats@mats-laptop.(none)
984ea1a3cb Fixes to eliminate some race conditions in tests. 2008-04-01 14:40:23 +02:00
mleich@five.local.lan
414299f4de Post merge fix for
ChangeSet@1.2583, 2008-03-31
   Merge five.local.lan:/work/merge/mysql-5.0-Bug
   into  five.local.lan:/work/merge/mysql-5.1-Bug
   Addditional manual fixes will be needed.
   MERGE: 1.1810.3667.16

   Which contains
      ChangeSet@1.1810.3667.16, 2008-03-31
      Fix for Bug
        #35335 funcs_1: Some tests fail within load_file during
                        pushbuild runs
   ...
2008-04-01 13:18:31 +02:00
mkindahl@dl145h.mysql.com
edc7090a5a Post-merge fixes. 2008-04-01 12:29:53 +02:00
mkindahl@dl145h.mysql.com
354f4d4cf6 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-04-01 08:45:24 +02:00
mkindahl@dl145h.mysql.com
fb9e8ed5e8 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-04-01 08:43:15 +02:00
mleich@five.local.lan
6a835464e4 Merge five.local.lan:/work/merge/mysql-5.0-Bug
into  five.local.lan:/work/merge/mysql-5.1-Bug
Addditional manual fixes will be needed.
2008-03-31 23:39:51 +02:00
cmiller@zippy.cornsilk.net
a878c1b9c1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
2008-03-31 14:32:56 -04:00
mleich@five.local.lan
89ddc0aa52 Fix for
Bug#35335 funcs_1: Some tests fail within load_file during
                      pushbuild runs
   Solution: 1. Move files with input data used in load_file, 
                load data etc. 
                from suite/funcs_1/<whatever>
                to std_data
             2. Use for testsuite funcs_1 the server option
                --secure-file-priv=<MYSQLTEST_VARDIR>
             3. Outfiles have to be stored under MYSQLTEST_VARDIR 
+ changes according to WL#4304 Cleanup in funcs_1 tests
  - backport of fixes/improvements made in 5.1 to 5.0
    The differences between scripts in 5.0 and 5.1 cause
    much additional and annoying work during any upmerge.
  - replace error numbers with names
  - improved comments
  - improved formatting
  - Unify storage engine names so that result files for
    storage engine variants do not differ (some tests)
  - remove a script no more used (tests are done in other scripts)
2008-03-31 19:48:02 +02:00
kent/mysqldev@mysql.com/production.mysql.com
7cd32aa3ec disabled.def:
Disabled 'rpl_redirect', failure is sporadic and and the test is superfluous
rpl_packet.test, rpl_packet.result:
  Removing race conditions from rpl_packet causing test to fail
2008-03-31 19:01:56 +02:00
mkindahl@dl145h.mysql.com
b9f860f3e6 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-03-31 16:34:52 +02:00
mkindahl@dl145h.mysql.com
6c8a0887cc Removing race conditions from rpl_packet causing test to fail. 2008-03-31 16:32:45 +02:00