mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39108 commits 2778 branches 343 tags 1.6 GiB
Commit graph

39108 commits

This branch
This branch
All branches
Author SHA1 Message Date
mats@romeo.(none)
efaa0f4092 Post-merge fixes. 2006-11-03 21:55:51 +01:00
mats@romeo.(none)
a726fec6e7 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
 2006-11-03 21:11:58 +01:00
mats@romeo.(none)
a38642569e Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl
 2006-11-03 20:49:41 +01:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
a66daa28dc Has issues with original tree, so had to pull new tree and copy test over. Running last test now and will push after 2006-11-03 16:31:25 +01:00
bar@bar.intranet.mysql.r18.ru
0dd8eb22e8 Merge mysql.com:/usr/home/bar/mysql-5.1.b22823 
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
 2006-11-03 15:37:15 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
76d000755a After merge fix. 2006-11-03 13:08:53 +04:00
bar@bar.intranet.mysql.r18.ru
8803496903 Merge mysql.com:/usr/home/bar/mysql-5.0-rpl 
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
 2006-11-03 10:29:44 +04:00
bar@bar.intranet.mysql.r18.ru
8748cde937 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
 2006-11-03 10:19:23 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
45ac13658b After merge fix for BUG#18908 ERROR 1406 (22001): Data too long for column :: using utf8 2006-11-03 10:18:13 +04:00
cbell/Chuck@mysql_cab.
506b97fd5e Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql_cab.:C:/source/c++/mysql-5.1-BUG_23735
 2006-11-02 09:10:06 -05:00
cbell/Chuck@mysql_cab.
801f03381c BUG#23735 Changes to comments in code for explanation of fix. 2006-11-02 08:34:16 -05:00
cbell/Chuck@mysql_cab.
367a41c308 Changes to the code are necessary to compile on Windows. Typecasts are needed in several DBUG_DUMP statements. CAB 01 Nov 2006 2006-11-01 11:52:32 -05:00
cbell/Chuck@mysql_cab.
c062178781 BUG#23735 Test rpl_row_mysqlbinlog fails on Windows. The errors report a file discrepency on reading a binlog from the command line. 2006-11-01 10:56:43 -05:00
bar@bar.intranet.mysql.r18.ru
cefa1cf9e0 Merge mysql.com:/usr/home/bar/mysql-5.0.b18908 
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
 2006-11-01 16:48:03 +04:00
mats@romeo.(none)
83f8e17258 BUG#18581 (Creation of system tables recorded in binlog causing slave failure): 
Not replicating the mysql database *at all* any more. All changes to
mysql tables are replicated by replicating the statements that do
the changes.
 2006-11-01 09:49:03 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
c378d3a1ec Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/usr/home/bar/mysql-5.0.b22877
 2006-11-01 12:34:42 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
ac9e3db9a7 Bug#22877 replication character sets get out of 
sync using replicate-wild-ignore-table
Problem: changes in character set variables
before an action on an replication-ignored table
makes slave to forget new variable values.
Fix: initialize one_shot variables only when
4.1 -> 5.x replication is running.
 2006-11-01 12:30:01 +04:00
lars@mysql.com/black.(none)
c06f9991b7 Refactoring: Moved master info functionality into rpl_mi.cc to 
make code easier to maintain.
 2006-10-31 16:51:51 +01:00
lars@mysql.com/black.(none)
c9b963cfcd Added new file 2006-10-31 14:54:37 +01:00
lars@mysql.com/black.(none)
1e038dc882 Refactoring: Moved rli code to new file rpl_rli.cc. The idea being that rli 
should be a separate module (i.e. a class) to make it easier to maintain the 
code, e.g. by having checks within the rli checking sanity of data and making 
member variables private.  This will also ease implementation of multi-source 
and, at least in my fantasies :), make it possible in some future to have 
separate replication servers.
 2006-10-31 12:23:14 +01:00
aelkin/elkin@dsl-hkigw8-feaef900-46.dhcp.inet.fi
3a3d673dd5 BUG#20697 slave fails to rollback replicated transaction hang over innodb_lock_wait_timeou 
post-merge fixes in test/result
 2006-10-30 17:09:28 +02:00
aelkin/elkin@dsl-hkigw8-feaef900-46.dhcp.inet.fi
f25db09b96 Merge dsl-hkigw8-feaef900-46.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0-merge 
into  dsl-hkigw8-feaef900-46.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50
 2006-10-30 13:07:36 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
d18fcb3a0f Bug#20404: SHOW CREATE TABLE fails with Turkish I 
Problem: SHOW CREATE TABLE printed garbage in table
  name for tables having TURKISH I
  (i.e. LATIN CAPITABLE LETTER I WITH DOT ABOVE)
  when lower-case-table-name=1.
  
  Reason: In some cases during lower/upper conversion in utf8,
  the result string can be shorter the original string
  (including the above letter). Old implementation of caseup_str()
  and casedn_str() didn't handle the result length properly,
  assuming that length cannot change.
  
  This fix changes the result type of cs->cset->casedn_str()
  and cs->cset->caseup_str() from VOID to UINT, to return
  the result length, as well as put '\0' terminator on a 
  proper place.
  
  Also, my_caseup_str_utf8() and my_casedn_str_utf8() were 
  rewritten not to use strlen() for performance purposes.
  It was done with help of adding of new functions - my_utf8_uni_no_range()
  and my_uni_utf8_no_range() - for null terminated strings.
 2006-10-30 14:40:15 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
28eaf5ff75 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/usr/home/bar/mysql-5.0.b18908
 2006-10-30 10:16:18 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
0e3a1eece7 Bug#18908: ERROR 1406 (22001): Data too long for column :: using utf8 
Problem: Too confusing error message when cannot convert
between string and column character sets on INSERT and UPDATE.
Fix: producing a better error message, instead of "Data too long"
in such cases
Additional changes: Adding "DROP TABLE IF EXISTS" into several
tests to be safe against failures in previous tests.
 2006-10-30 10:14:03 +04:00
lars/lthalmann@mysql.com/dl145j.mysql.com
dc8a559bf1 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-10-25 18:07:07 +02:00
lars/lthalmann@dl145h.mysql.com
1ef49b93e7 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-10-25 17:12:09 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
4743fb6902 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-10-25 17:10:18 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
31abddb5e1 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-10-25 17:08:57 +02:00
aelkin/elkin@dsl-hkigw8-febefb00-148.dhcp.inet.fi
36de830f0c Bug #22027 CREATE TABLE IF NOT EXISTS SELECT logged improperly with row-based binlog 
results of binlog_stm_binlog in sync
 2006-10-23 18:22:27 +03:00
aelkin/elkin@dsl-hkigw8-febefb00-148.dhcp.inet.fi
4e14e0a35d Bug #22762 create talbe if not exists like a-temp-table binlogged w/o "if not exists" 
Bug #22027 CREATE TABLE IF NOT EXISTS SELECT logged improperly with row-based binlog
    
post-merge fix, also making results free from server's version number.
 2006-10-23 15:09:04 +03:00
aelkin/elkin@dsl-hkigw8-febefb00-148.dhcp.inet.fi
cbf2cb325b Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkigw8-febefb00-148.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug22027_create_select_exists
 2006-10-23 14:42:00 +03:00
bar@mysql.com/bar.intranet.mysql.r18.ru
8a617440ad Bug#22823 gt and lt operators appear to be reversed in ExtractValue() command 
Problem: "greater than" and "less than" XPath operators appeared to have been implemented in reverse.
Fix: swap arguments to eq_func() and eq_func_reverse() to provide correct operation result.
 2006-10-23 14:17:57 +05:00
mats@romeo.(none)
d728519dbd Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/mytap-mysql-5.1-new
 2006-10-20 22:56:03 +02:00
mats@romeo.(none)
8723523029 Documentation changes to MyTAP. 2006-10-20 21:50:08 +02:00
gkodinov@dl145s.mysql.com
99b572b9eb Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-20 11:15:54 +02:00
gkodinov@dl145s.mysql.com
bb0422a0b0 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-20 11:12:35 +02:00
gkodinov@dl145s.mysql.com
4eff5ab26a Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-20 11:05:06 +02:00
gkodinov@dl145s.mysql.com
a93cc1b70b Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-20 11:02:56 +02:00
gkodinov@dl145s.mysql.com
0612a212d1 Merge bk-internal:/home/bk/mysql-4.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-10-20 10:57:38 +02:00
gkodinov@dl145s.mysql.com
a0c0bbd8ae sql_rename.cc, sql_table.cc, type_decimal.result, mix2_myisam.result: 
merge fixes
 2006-10-20 10:12:38 +02:00
svoj@mysql.com/april.(none)
26bf6a25c8 After merge fix. 2006-10-19 20:29:12 +05:00
svoj@april.(none)
8b01686765 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
 2006-10-19 19:59:57 +05:00
gkodinov@dl145s.mysql.com
aaed398254 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-19 16:43:46 +02:00
gkodinov@dl145s.mysql.com
ea8ba03556 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-19 16:00:06 +02:00
svoj@mysql.com/april.(none)
afefa5d42f After merge fix. 2006-10-19 18:48:37 +05:00
svoj@mysql.com/april.(none)
2d9e457460 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
 2006-10-19 18:04:34 +05:00
gkodinov@dl145s.mysql.com
c77fae407b Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-19 15:04:12 +02:00
gkodinov@dl145s.mysql.com
892495acaf Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-10-19 14:37:49 +02:00
svoj@mysql.com/april.(none)
d2fa9fd192 Merge mysql.com:/home/svoj/devel/mysql/BUG23175/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
 2006-10-19 17:35:09 +05:00