Commits · c282f260be6603882142dc0fa3c69397398b52c8 · nexedi / MariaDB

14 Feb, 2007 15 commits

Merge bk-internal:/home/bk/mysql-5.1-maint · c282f260
unknown authored Feb 14, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
c282f260

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

unknown authored Feb 14, 2007

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


sql/mysql_priv.h:
  Auto merged

d3580af9

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 1bb0966d
unknown authored Feb 14, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
```
1bb0966d
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 9beb55e1
unknown authored Feb 14, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
9beb55e1
Use my_vsnprintf instead of vsnprintf · e988fbdd
unknown authored Feb 14, 2007

e988fbdd

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

unknown authored Feb 14, 2007

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


sql/mysql_priv.h:
  Auto merged

54a6cd61

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · abaacf80

unknown authored Feb 14, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/mysqld.cc:
  Manual merge of OPT_SECUREE_FILE_PRIV
sql/set_var.cc:
  Manual merge
sql/share/errmsg.txt:
  Manual merge, change is already in 5.1
sql/sql_class.h:
  Manual mergem change is already in 5.1

abaacf80

Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628 · e30dd524

unknown authored Feb 14, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

e30dd524

Bug#18628 mysql-test-run: security problem(part1) · 2d4bb318

unknown authored Feb 14, 2007

 - Implement --secure-file-priv=<dir> option that limits
  "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
  with files in specified dir.
 - Use above option for mysqld in mysql-test-run.pl 


mysql-test/mysql-test-run.pl:
  Add usage of --secure-file-priv=vardir when starting mysqld
mysql-test/r/loaddata.result:
  Update test result after adding test to check that secure-file-priv
  works for "load data" and "load_file"
mysql-test/r/outfile.result:
  Update result
mysql-test/r/query_cache.result:
  Can't load from outside of vardir anymore
mysql-test/r/type_blob.result:
  Can't load from outside of vardir anymore
mysql-test/t/loaddata.test:
  Update test result after adding test to check that secure-file-priv 
  works for "load data" and "load_file"
mysql-test/t/outfile.test:
  Update test result after adding test to check that secure-file-priv
  works for "SELECT .. INTO OUTFILE"
mysql-test/t/query_cache.test:
  Can't load from outside of vardir anymore
mysql-test/t/type_blob.test:
  Can't load from outside of vardir anymore
sql/item_strfunc.cc:
  Check that the path "load_file" uses for the file is within 
  what's specified with --secure-file-priv
sql/mysql_priv.h:
  Add secure_file_priv
sql/mysqld.cc:
  Add "--secure_file_priv"
sql/set_var.cc:
  Add variable "secure_file_priv" to "show variables"
sql/sql_class.cc:
  Check that the path "load_file" uses for the file is within 
  what's specified with --secure-file-priv
sql/sql_class.h:
  Fix spelling error
sql/sql_load.cc:
  Check that the path "load_file" uses for the file is within 
  what's specified with --secure-file-priv
sql/share/errmsg.txt:
  Fix swedish error message for ER_OPTION_PREVENTS_STATMENT wich was hardcoded
  to --skip-grant-tables

2d4bb318

Protect DBUG_ENTER printout from NULL pointers · f0de8674
unknown authored Feb 14, 2007

f0de8674
Merge bk-internal:/home/bk/mysql-5.1-maint · 100e453e
unknown authored Feb 14, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
100e453e
Merge bk-internal:/home/bk/mysql-5.0-maint · 15e95213
unknown authored Feb 14, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
15e95213
Post-merge fix · e9bdde0d
unknown authored Feb 13, 2007

e9bdde0d

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · f5d883c2

unknown authored Feb 13, 2007

into  olga.mysql.com:/home/igor/mysql-5.1-opt


BitKeeper/etc/gone:
  auto-union
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged

f5d883c2

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 277b59b8

unknown authored Feb 13, 2007

into  olga.mysql.com:/home/igor/mysql-5.1-opt


BitKeeper/etc/gone:
  auto-union
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/select.result:
  SCCS merged
mysql-test/t/select.test:
  SCCS merged

277b59b8

13 Feb, 2007 24 commits

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 1ceb46b7
unknown authored Feb 14, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/item.cc:
  Auto merged
```
1ceb46b7
Post-merge fix · 5ecad9a5
unknown authored Feb 13, 2007

5ecad9a5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 27f28599
unknown authored Feb 13, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
27f28599

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · cfe1a891

unknown authored Feb 13, 2007

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt


BitKeeper/etc/gone:
  auto-union
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/select.result:
  Manual merge
mysql-test/t/select.test:
  Manual merge

cfe1a891

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my50-bug25807 · 30a23d4a

unknown authored Feb 13, 2007

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


BitKeeper/etc/collapsed:
  auto-union
mysys/mf_iocache.c:
  Auto merged

30a23d4a

Bug#25807: LOAD DATA INFILE does not work with Pipes · 40bf2b37

unknown authored Feb 13, 2007

Showstopper and regression against 5.0.24.

Previously, we ignored seek() errors (see Bug#22828) and let seek()s
against pipes fail.  Now, since we check that a seek didn't fail,
and return without reading, this bug popped up.

This restores the behavior for file-ish objects that could never be 
seek()ed.


mysys/mf_iocache.c:
  If we detect early that the file is not tell()able, then we should
  assume that it's also not seek()able and therefore we should never
  set the (poorly named) "seek_not_done" flag so that we don't immedi-
  ately try to seek() when reading later.
  
  The problem was that tell() was returning -1, so when we read later, 
  we needlessly tried to seek to position  (unsigned long) -1 . 
  
  Also, if we think we're supposed to seek to a position in a file and 
  the file is un-tell()able, then abort.

40bf2b37

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 7e1a4765

unknown authored Feb 13, 2007

into  olga.mysql.com:/home/igor/mysql-5.1-opt


mysql-test/r/view.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/view.test:
  Manual merge

7e1a4765

Post-merge fix. · 9e2a4a36
unknown authored Feb 13, 2007

9e2a4a36
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · ca89c0ff
unknown authored Feb 13, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
```
ca89c0ff
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · b41b7a30
unknown authored Feb 13, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
b41b7a30
Write some debug info to result log file before dying in 'do_exec' · a75026eb
unknown authored Feb 13, 2007

a75026eb
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · ecc0ec2f
unknown authored Feb 13, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
```
ecc0ec2f
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · d50c640c
unknown authored Feb 13, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
d50c640c
Reset value of variable "escaped" in "default" label causing $variables not · 5d783a03
unknown authored Feb 13, 2007
```
to be expanded in same cases 


client/mysqltest.c:
  Reset value of variable "escaped" in "default" label
```
5d783a03
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 97eb9ce8
unknown authored Feb 13, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/tmpmerge
```
97eb9ce8

.del-README.txt-renamed: · 511e23a3

unknown authored Feb 13, 2007

Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed

BitKeeper/deleted/.del-README.txt-renamed:
Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed

511e23a3

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · bc1fff84
unknown authored Feb 13, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/mysql_priv.h:
  manual merge.
```
bc1fff84

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

unknown authored Feb 13, 2007

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


sql/mysql_priv.h:
  Auto merged

29b63cb1

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · cf0e6813

unknown authored Feb 13, 2007

into  olga.mysql.com:/home/igor/mysql-5.1-opt


BitKeeper/etc/gone:
  auto-union
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/information_schema.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/information_schema.test:
  Manual merge
mysql-test/t/view.test:
  Manual merge
mysys/my_pthread.c:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/opt_range.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/sql_update.cc:
  Manual merge

cf0e6813

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · d2228b1e

unknown authored Feb 13, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/ignore:
  auto-union
mysys/my_getopt.c:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
mysql-test/r/type_enum.result:
  Use local
mysql-test/t/type_enum.test:
  Use local

d2228b1e

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1 · df1aaedf

unknown authored Feb 13, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/ignore:
  auto-union

df1aaedf

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 · f72e6447
unknown authored Feb 13, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
```
f72e6447

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 457d4d6b

unknown authored Feb 13, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/gone:
  auto-union
mysys/my_getopt.c:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/table.cc:
  Auto merged

457d4d6b

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 147a8485

unknown authored Feb 12, 2007

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26209


sql/sql_select.cc:
  Auto merged

147a8485

12 Feb, 2007 1 commit

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · ef4400b0

unknown authored Feb 13, 2007

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


libmysqld/lib_sql.cc:
  Auto merged
sql/item.cc:
  Auto merged

ef4400b0