Commits · 6733cc1a0440a4ce560542519afe1a66b91c7de0 · Kirill Smelkov / mariadb

14 Feb, 2007 15 commits

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

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

unknown authored Feb 14, 2007

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


sql/mysql_priv.h:
  Auto merged

3ec0c5c5

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


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


client/mysqltest.c:
  Auto merged
```
1d549b95
Use my_vsnprintf instead of vsnprintf · 557f6169
unknown authored Feb 14, 2007

557f6169

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

unknown authored Feb 14, 2007

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


sql/mysql_priv.h:
  Auto merged

4f12094f

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

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

fe46b0ff

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

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

555aed64

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

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

c4ae01e6

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

581db6c1
Merge bk-internal:/home/bk/mysql-5.1-maint · 6cf5a4a3
unknown authored Feb 14, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
6cf5a4a3
Merge bk-internal:/home/bk/mysql-5.0-maint · 12d6c6eb
unknown authored Feb 14, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
12d6c6eb
Post-merge fix · 59b0e145
unknown authored Feb 13, 2007

59b0e145

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

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

86267e67

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

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

d311c188

13 Feb, 2007 24 commits

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


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

c039eed8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 8ed41572
unknown authored Feb 13, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
8ed41572

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

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

579c926d

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

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

cbed7766

Bug#25807: LOAD DATA INFILE does not work with Pipes · 035062b2

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.

035062b2

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

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

7a498bbf

Post-merge fix. · 4c9d090a
unknown authored Feb 13, 2007

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


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


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

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


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


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


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

.del-README.txt-renamed: · e7fbbfd4

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

e7fbbfd4

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


sql/mysql_priv.h:
  manual merge.
```
66d2a9f4

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

unknown authored Feb 13, 2007

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


sql/mysql_priv.h:
  Auto merged

6f628013

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

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

21df932d

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

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

b4442bb2

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

unknown authored Feb 13, 2007

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


BitKeeper/etc/ignore:
  auto-union

f2905a90

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


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

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

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

faacf580

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

unknown authored Feb 12, 2007

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


sql/sql_select.cc:
  Auto merged

e656c582

12 Feb, 2007 1 commit

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

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

9292b577