Commits · bfdc9c120792c412e7cbb03b071616aaf899599a · nexedi / MariaDB

01 Nov, 2006 1 commit

Merge mysql.com:/usr/home/bar/mysql-5.0.b18908 · bfdc9c12

unknown authored Nov 01, 2006

into  mysql.com:/usr/home/bar/mysql-5.1-rpl


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/strict_autoinc_1myisam.result:
  Auto merged
mysql-test/r/strict_autoinc_2innodb.result:
  Auto merged
mysql-test/r/strict_autoinc_3heap.result:
  Auto merged
mysql-test/r/strict_autoinc_4bdb.result:
  Auto merged
mysql-test/r/strict_autoinc_5ndb.result:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/field.cc:
  SCCS merged

bfdc9c12

31 Oct, 2006 2 commits

Added new file · a78bdf82
unknown authored Oct 31, 2006

a78bdf82

Refactoring: Moved rli code to new file rpl_rli.cc. The idea being that rli · 69d92fb1

unknown authored Oct 31, 2006

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.


sql/Makefile.am:
  Added file rpl_rli.cc
sql/repl_failsafe.cc:
  Move function
sql/rpl_rli.h:
  moved functions
sql/slave.cc:
  Moved rli code into rpl_rli.cc
sql/sql_repl.cc:
  Changed function to be member function
sql/rpl_rli.cc:
  Code for rli

69d92fb1

30 Oct, 2006 3 commits

BUG#20697 slave fails to rollback replicated transaction hang over innodb_lock_wait_timeou · b7d43470

unknown authored Oct 30, 2006

post-merge fixes in test/result


mysql-test/extra/rpl_tests/rpl_deadlock.test:
  recalculating BEGIN's event position.
mysql-test/r/rpl_deadlock_innodb.result:
  results changed

b7d43470

Merge dsl-hkigw8-feaef900-46.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0-merge · 9fdc9acb

unknown authored Oct 30, 2006

into  dsl-hkigw8-feaef900-46.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50


mysql-test/r/rpl_deadlock_innodb.result:
  results changed
mysql-test/extra/rpl_tests/rpl_deadlock.test:
  taking a fix for testing timed-out behaviour.
sql/slave.cc:
  just comments are fixed due to changes in behavior of timed-out msta.

9fdc9acb

Bug#18908: ERROR 1406 (22001): Data too long for column :: using utf8 · 00c1c19e

unknown authored Oct 30, 2006

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. 


mysql-test/include/strict_autoinc.inc:
  Adding DROP TABLE to be safe against previous tests failure.
mysql-test/r/ctype_recoding.result:
  Fixing test results
mysql-test/r/ctype_utf8.result:
  Fixing test results
mysql-test/r/fulltext.result:
  Fixing test results
mysql-test/r/strict_autoinc_1myisam.result:
  Adding DROP TABLE to be safe against previous tests failure.
mysql-test/r/strict_autoinc_2innodb.result:
  Adding DROP TABLE to be safe against previous tests failure.
mysql-test/r/strict_autoinc_3heap.result:
  Adding DROP TABLE to be safe against previous tests failure.
mysql-test/r/strict_autoinc_4bdb.result:
  Adding DROP TABLE to be safe against previous tests failure.
mysql-test/r/strict_autoinc_5ndb.result:
  Adding DROP TABLE to be safe against previous tests failure.
sql/field.cc:
  - producing better error messages than
    "DATA TRUNCATED" or "DATA TOO LONG" (in strict mode)
    in case of "not well formed source" and
    "cannot convert to field character set"
  - Performance improvements: copying directly to
    the target, instead of using an intermediate
    String.
  - Moving duplicate code into report_data_too_long() function.
sql/sql_string.cc:
  Adding a new function to convert strings between character sets,
  but not more than "nchar" characters - a helper function for
  Field_string::store(), Field_varstring::store() and Field_blob::store().
sql/sql_string.h:
  Adding new function prototype.

00c1c19e

25 Oct, 2006 1 commit

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 36296ca9

unknown authored Oct 25, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged

36296ca9

23 Oct, 2006 3 commits

Bug #22027 CREATE TABLE IF NOT EXISTS SELECT logged improperly with row-based binlog · a76c3814
unknown authored Oct 23, 2006
```
results of binlog_stm_binlog in sync


mysql-test/r/binlog_stm_binlog.result:
  results changed
```
a76c3814

Bug #22762 create talbe if not exists like a-temp-table binlogged w/o "if not exists" · 5f858aad

unknown authored Oct 23, 2006

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.


mysql-test/extra/binlog_tests/binlog.test:
  eliminating format-description line in show binlog events.
mysql-test/r/binlog_row_binlog.result:
  results changed

5f858aad

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · 5438ab9c

unknown authored Oct 23, 2006

into  dsl-hkigw8-febefb00-148.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug22027_create_select_exists


sql/sql_show.cc:
  Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  SCCS merged

5438ab9c

20 Oct, 2006 6 commits

Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt · 9852dfbc

unknown authored Oct 20, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


mysql-test/r/myisam.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

9852dfbc

Merge bk-internal:/home/bk/mysql-5.1 · 73baa90a

unknown authored Oct 20, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


mysql-test/r/myisam.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

73baa90a

Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · ab133655

unknown authored Oct 20, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

ab133655

Merge bk-internal:/home/bk/mysql-5.0 · 8cc48091

unknown authored Oct 20, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


mysql-test/r/myisam.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

8cc48091

Merge bk-internal:/home/bk/mysql-4.1 · 0153d67e

unknown authored Oct 20, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

0153d67e

sql_rename.cc, sql_table.cc, type_decimal.result, mix2_myisam.result: · 95124370

unknown authored Oct 20, 2006

  merge fixes


mysql-test/r/mix2_myisam.result:
  merge fixes
mysql-test/r/type_decimal.result:
  merge fixes
sql/sql_rename.cc:
  merge fixes
sql/sql_table.cc:
  merge fixes

95124370

19 Oct, 2006 19 commits

After merge fix. · 94f337bb
unknown authored Oct 19, 2006

94f337bb

Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines · 9a77a540

unknown authored Oct 19, 2006

into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines


mysql-test/t/repair.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  Manual merge.

9a77a540

Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt · fcbf1509

unknown authored Oct 19, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


BitKeeper/deleted/.del-bdb.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
include/my_base.h:
  SCCS merged
mysql-test/include/mix1.inc:
  SCCS merged
mysql-test/r/group_by.result:
  SCCS merged
mysql-test/r/innodb_mysql.result:
  SCCS merged
mysql-test/t/group_by.test:
  SCCS merged
sql/sql_select.cc:
  SCCS merged

fcbf1509

Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1 · f4f15b54

unknown authored Oct 19, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/table.cc:
  Auto merged

f4f15b54

After merge fix. · 3ad2baa1
unknown authored Oct 19, 2006

3ad2baa1

Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines · baacb8a1

unknown authored Oct 19, 2006

into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines


myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
sql/sql_base.cc:
  Use local.

baacb8a1

Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · 5e1fe0f8

unknown authored Oct 19, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


sql/sql_select.cc:
  Auto merged
mysql-test/r/olap.result:
  SCCS merged

5e1fe0f8

Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0 · d3018677

unknown authored Oct 19, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


mysql-test/r/merge.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged

d3018677

Merge mysql.com:/home/svoj/devel/mysql/BUG23175/mysql-4.1-engines · 2576c4c0

unknown authored Oct 19, 2006

into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines


mysql-test/r/repair.result:
  Manual merge.
mysql-test/t/repair.test:
  Manual merge.

2576c4c0

Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1 · 9bfaab57
unknown authored Oct 19, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt


sql/sql_select.cc:
  Auto merged
```
9bfaab57
Merge mysql.com:/home/svoj/devel/mysql/BUG22562/mysql-4.1-engines · f841b546
unknown authored Oct 19, 2006
```
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
```
f841b546
Merge chilla.local:/home/mydev/mysql-5.0-merge · e873878d
unknown authored Oct 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-merge


sql/mysql_priv.h:
  Auto merged
```
e873878d

Bug#21476 - Lost Database Connection During Query · 862d8bab

unknown authored Oct 19, 2006

Backport from 5.1.
Raised STACK_MIN_SIZE for Debian GNU/Linux Sid,
Linux kernel 2.6.16,
gcc version 3.3.6 (Debian 1:3.3.6-13),
libc6-dbg 2.3.6.ds1-4,
Pentium4 (x86),
BUILD/compile-pentium-debug-max
Raised about 100 Bytes above the required minimum.

862d8bab

Merge chilla.local:/home/mydev/mysql-5.0-merge · 2a7ee79b

unknown authored Oct 19, 2006

into  chilla.local:/home/mydev/mysql-5.1-merge


include/my_sys.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged

2a7ee79b

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 8144eb5a

unknown authored Oct 19, 2006

into  chilla.local:/home/mydev/mysql-5.1-merge


include/my_sys.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

8144eb5a

Merge chilla.local:/home/mydev/mysql-4.1-merge · 0e5fee5d

unknown authored Oct 19, 2006

into  chilla.local:/home/mydev/mysql-5.0-merge


include/my_sys.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

0e5fee5d

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 554aaed3
unknown authored Oct 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-merge


sql/sql_select.cc:
  Auto merged
```
554aaed3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a4a09cd2
unknown authored Oct 19, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-merge
```
a4a09cd2
Changed test case for bug 22342 to make it platform independent. · 672b61c5
unknown authored Oct 18, 2006

672b61c5

18 Oct, 2006 3 commits

Merge mysql.com:/data0/bk/mysql-5.0 · ea39ca34
unknown authored Oct 18, 2006
```
into  mysql.com:/data0/bk/mysql-5.0-kt
```
ea39ca34

BUG#23175 - MYISAM crash/repair failed during repair · 48cf65c0

unknown authored Oct 18, 2006

Repair table could crash a server if there is not sufficient
memory (myisam_sort_buffer_size) to operate. Affects not only
repair, but also all statements that use create index by sort:
repair by sort, parallel repair, bulk insert.

Return an error if there is not sufficient memory to store at
least one key per BUFFPEK.

Also fixed memory leak if thr_find_all_keys returns an error.


myisam/sort.c:
  maxbuffer is number of BUFFPEK-s for repair. It is calculated
  as records / keys. keys is number of keys that can be stored
  in memory (myisam_sort_buffer_size). There must be sufficient
  memory to store both BUFFPEK-s and keys. It was checked
  correctly before this patch. However there is another
  requirement that wasn't checked: there must be sufficient
  memory for at least one key per BUFFPEK, otherwise repair
  by sort/parallel repair cannot operate.
  
  Return an error if there is not sufficient memory to store at
  least one key per BUFFPEK.
  
  Also fixed memory leak if thr_find_all_keys returns an error.
mysql-test/r/repair.result:
  A test case for BUG#23175.
mysql-test/t/repair.test:
  A test case for BUG#23175.

48cf65c0

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt · ddee02ec
unknown authored Oct 18, 2006
```
into  mysql.com:/home/hf/mysql-5.1.mrg
```
ddee02ec

17 Oct, 2006 2 commits
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b18b419b
  unknown authored Oct 18, 2006
```
into  sunlight.local:/local_work/14959-bug-5.0-opt-mysql
```
  b18b419b
- sql_rename.cc: · 3dccef3c
  unknown authored Oct 18, 2006
```
  Cleanup of fix for bug#14959.


sql/sql_rename.cc:
  Cleanup of fix for bug#14959.
```
  3dccef3c