Commits · e1a142961e0ae2adcea2cfb4d399b93581a8a6eb · Kirill Smelkov / mariadb

23 Oct, 2006 1 commit

Merge mysql.com:/usr/home/ram/work/bug20732/my50-bug20732 · e1a14296

unknown authored Oct 23, 2006

into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732


mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  manual merging.

e1a14296

19 Oct, 2006 2 commits

Merge mysql.com:/usr/home/ram/work/bug20732/my41-bug20732 · 68c2a008

unknown authored Oct 19, 2006

into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732


sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/range.result:
  SCCS merged
mysql-test/t/range.test:
  SCCS merged

68c2a008

Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes · da7af481

unknown authored Oct 19, 2006

We miss some records sometimes using RANGE method if we have
partial key segments.
Example:
  Create table t1(a char(2), key(a(1)));
  insert into t1 values ('a'), ('xx');
  select a from t1 where a > 'x';
We call index_read() passing 'x' key and HA_READ_AFTER_KEY flag
in the handler::read_range_first() wich is wrong because we have
a partial key segment for the field and might miss records like 'xx'.

Fix: don't use open segments in such a case.


mysql-test/r/range.result:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - test result.
mysql-test/t/range.test:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - test case.
sql/opt_range.cc:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - check if we have a partial key segment for a Item_func::GT_FUNC;
      if so, don't set NEAR_MIN flag in order to use HA_READ_KEY_OR_NEXT
      instead of HA_READ_AFTER_KEY.
sql/opt_range.h:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - key segment 'flag' slot added.
sql/sql_select.cc:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - test (HA_PART_KEY_SEG | HA_NULL_PART) as we split it in the sql/table.cc
sql/table.cc:
  Fix for bug #20732: Partial index and long sjis search with '>' fails sometimes
    - set HA_NULL_PART flag instead of HA_PART_KEY_SEG in order not to mix them.

da7af481

17 Oct, 2006 11 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c055efba

unknown authored Oct 17, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/r/ps.result:
  Auto merged

c055efba

Merge fixes. · dfa183b7

unknown authored Oct 17, 2006


mysql-test/r/func_time.result:
  One update from errmsg.txt and removal of /two/ duplicate results.
mysql-test/t/func_time.test:
  Removed duplicate test.

dfa183b7

Update ps and show_check results to account for new -master.opt settings. · 099d8741

unknown authored Oct 17, 2006


mysql-test/r/ps.result:
  Update test results to account for new ps-master.opt settings
mysql-test/r/show_check.result:
  Update test results to account for new show_check-master.opt settings

099d8741

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016 · 98fd2991

unknown authored Oct 17, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/deleted/.del-collapsed:
  auto-union
BitKeeper/etc/collapsed:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_dbug.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/time.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge.
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/func_time.test:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
sql/sql_view.cc:
  Manual merge.

98fd2991

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

unknown authored Oct 17, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/m_ctype.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
vio/viosocket.c:
  Auto merged

dd8a33c0

Fix previous bad patch for Bug#14262. · 48dfeb4d

unknown authored Oct 17, 2006

Remove table engine qualification where it's unnecessary.


mysql-test/r/view.result:
  Remove requirement for innodb where not needed.  (Running this test alone
  raised warnings that it was using myisam.)
mysql-test/t/view.test:
  Remove requirement for innodb where not needed.  (Running this test alone
  raised warnings that it was using myisam.)
sql/sql_parse.cc:
  Fix previous bad re-patch.
sql/sql_view.cc:
  Fix previous bad re-patch.

48dfeb4d

Merge naruto.:C:/cpp/bug23010/my51-bug23010 · 30996224
unknown authored Oct 17, 2006
```
into  naruto.:C:/cpp/mysql-5.1-new-maint
```
30996224
Merge naruto.:C:/cpp/bug23010/my50-bug23010 · 95108de5
unknown authored Oct 17, 2006
```
into  naruto.:C:/cpp/bug23010/my51-bug23010


mysys/my_seek.c:
  Auto merged
```
95108de5
Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/51 · 7b792405
unknown authored Oct 16, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/51
```
7b792405
Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/51 · b3149432
unknown authored Oct 16, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/51
```
b3149432

Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50 · d0172194

unknown authored Oct 16, 2006

into  siva.hindu.god:/usr/home/tim/m/bk/b19764/51


mysql-test/r/union.result:
  Manual merge (use local)
sql/sql_lex.cc:
  SCCS merged
sql/sql_lex.h:
  SCCS merged
sql/sql_parse.cc:
  Manual merge (use local)
sql/sql_prepare.cc:
  Manual merge (use local)
sql/sql_yacc.yy:
  SCCS merged
mysql-test/r/ps.result:
  Manual merge
mysql-test/r/show_check.result:
  Manual merge
mysql-test/t/ps.test:
  Manual merge
mysql-test/t/show_check.test:
  Manual merge

d0172194

16 Oct, 2006 1 commit

Merge dator5.(none):/home/pappa/clean-mysql-5.1 · e1ff81bb

unknown authored Oct 16, 2006

into  dator5.(none):/home/pappa/bug18198


mysql-test/r/partition.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_partition.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item_cmpfunc.h:
  e

e1ff81bb

14 Oct, 2006 8 commits

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · b2bf4843

unknown authored Oct 14, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_dbug.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge, test already there
mysql-test/t/innodb_mysql.test:
  Manual merge

b2bf4843

Merge bk-internal:/home/bk/mysql-4.1-maint · 9a506df0
unknown authored Oct 14, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
```
9a506df0

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 · 591d09a9

unknown authored Oct 14, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


Makefile.am:
  Auto merged
sql/sql_select.cc:
  Auto merged
vio/viosocket.c:
  Auto merged

591d09a9

Merge bk-internal:/home/bk/mysql-5.0-maint · 98cc967d
unknown authored Oct 14, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
98cc967d
No need to continue in 'mtr_report_test_failed' after timeout detected, return immediately after · ad4d8130
unknown authored Oct 14, 2006

ad4d8130

Use char as datatype for the byte that are read with my_fgetc, fixes problem with · 8ec4020e

unknown authored Oct 14, 2006

mysqltest.test on Solaris and Mac. write_file produced nice files with all zeroes.


client/mysqltest.c:
  Use char as datatype for the byte that are read with my_fgetc
mysql-test/mysql-test-run.pl:
  Fix typo, add missing $

8ec4020e

Improving debugging support in 'read_line' function · b0a4ec85
unknown authored Oct 14, 2006

b0a4ec85
Skip looking for mysql_client_test in 4.1 on windows as it's not built by default · 0d9e6366
unknown authored Oct 14, 2006

0d9e6366

13 Oct, 2006 17 commits

Look for client bindirs client_release and client_debug before other directories. · 00e327ed
unknown authored Oct 13, 2006

00e327ed
rpl_empty_master_crash need a master restart so that all log files are deleted · 7e73af63
unknown authored Oct 13, 2006
```
mysql-test/t/rpl_empty_master_crash-master.opt:
  New BitKeeper file ``mysql-test/t/rpl_empty_master_crash-master.opt''
```
7e73af63
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · e767ab6d
unknown authored Oct 13, 2006
```
into  mysql.com:/usr/home/ram/work/bug23254/my41-bug23254
```
e767ab6d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · f202c9d2
unknown authored Oct 13, 2006
```
into  mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
```
f202c9d2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4a488c06
unknown authored Oct 13, 2006
```
into  mysql.com:/usr/home/ram/work/bug23254/my51-bug23254
```
4a488c06
Merge fix-up. · 665e5575
unknown authored Oct 13, 2006
```
vio/viossl.c:
  We prefer "0x%lx" to "%p".
```
665e5575

Merge mysql.com:/usr/home/ram/work/bug23254/my50-bug23254 · 20a2a997

unknown authored Oct 13, 2006

into  mysql.com:/usr/home/ram/work/bug23254/my51-bug23254


mysql-test/r/func_compress.result:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

20a2a997

Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254 · 0ace2b44

unknown authored Oct 13, 2006

into  mysql.com:/usr/home/ram/work/bug23254/my50-bug23254


sql/item_strfunc.cc:
  Auto merged
mysql-test/r/func_compress.result:
  SCCS merged
mysql-test/t/func_compress.test:
  SCCS merged

0ace2b44

Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL · 60a21d16

unknown authored Oct 13, 2006

We don't set null_value to 0 in the Item_func_compress::val_str() for 
not-NULL results.


mysql-test/r/func_compress.result:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - test result.
mysql-test/t/func_compress.test:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - test case.
sql/item_strfunc.cc:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - set null_value.

60a21d16

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · aff965c3

unknown authored Oct 13, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262


BitKeeper/deleted/.del-collapsed:
  'Auto converge rename'
BitKeeper/etc/collapsed:
  'Auto converge'
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.h:
  Auto merged
vio/viosocket.c:
  Auto merged
sql/sql_parse.cc:
  Manual merge
sql/sql_view.cc:
  Manual merge

aff965c3

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · e892ca2a

unknown authored Oct 13, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my51-alter


BitKeeper/etc/collapsed:
  auto-union
sql/sql_acl.cc:
  Auto merged

e892ca2a

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real · ef9e4ab6

unknown authored Oct 13, 2006

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real


include/violite.h:
  SCCS merged
sql/net_serv.cc:
  SCCS merged
vio/viosocket.c:
  SCCS merged

ef9e4ab6

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678 · 380aa281

unknown authored Oct 13, 2006

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real


include/violite.h:
  SCCS merged
sql/net_serv.cc:
  SCCS merged
vio/viosocket.c:
  SCCS merged

380aa281

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.0 · 39b42b76

unknown authored Oct 13, 2006

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678


BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220:
  Use local.
include/violite.h:
  Use local.
sql/net_serv.cc:
  Use local.
vio/viosocket.c:
  Use local.

39b42b76

Optimize restarts by using --force-restart option · be831d73
unknown authored Oct 13, 2006

be831d73
Use 'my_strnncoll_simple' instead of 'strncasecmp' · 851e6fe4
unknown authored Oct 13, 2006

851e6fe4
Improve the function that parses test files looking for what features it uses · b35617cd
unknown authored Oct 13, 2006
```
Now also detects "source nnnn;" command, previous version only detected
"--source"
```
b35617cd