Commits · 16f0c9f606ca2ea27fabf97b85fe3e7a15380892 · nexedi / MariaDB

22 Feb, 2007 2 commits

Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum · 16f0c9f6

unknown authored Feb 22, 2007

into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum


extra/Makefile.am:
  Auto merged
sql/share/errmsg.txt:
  Use local errmsg.txt
extra/comp_err.c:
  Manual merge

16f0c9f6

Bug #26571 Different format specifiers in errmsg.txt · c36e2c23

unknown authored Feb 22, 2007

- Add check of format specifiers in error message strings
- Update error message text accordingly to be equal between all translations


extra/Makefile.am:
  comp_err uses my_cheksum, link with zlib
extra/comp_err.c:
  Add check of format specifiers in error message strings
sql/share/errmsg.txt:
  Update error messages after checks
  ---
  Remove the newly added space in error message, should not be there

c36e2c23

15 Feb, 2007 1 commit
- Update error message to make sure all error strings for same error · 56dd63a7
  unknown authored Feb 15, 2007
```
uses the same format specifiers
```
  56dd63a7
14 Feb, 2007 4 commits

Merge pilot.mysql.com:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum · 84eaebd4

unknown authored Feb 14, 2007

into  pilot.mysql.com:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum


extra/comp_err.c:
  Auto merged
sql/share/errmsg.txt:
  Dont merge errmsg.txt

84eaebd4

Add check of format specifiers in error message strings · 7ca99d79

unknown authored Feb 14, 2007

Update error message text accordingly to be equal between all translations


extra/comp_err.c:
  Add check of format specifiers in error message strings
sql/share/errmsg.txt:
  Update error messages after checks

7ca99d79

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

13 Feb, 2007 17 commits

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 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 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 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

12 Feb, 2007 6 commits

Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0 · aedf161d

unknown authored Feb 12, 2007

into  mysql.com:/home/kent/bk/tmp3/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-README.txt:
  Delete: mysql-test/suite/funcs_1/README.txt
BitKeeper/deleted/.del-memory_tb3.txt:
  Delete: mysql-test/suite/funcs_1/data/memory_tb3.txt
BitKeeper/deleted/.del-myisam_storedproc_02.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
BitKeeper/deleted/.del-myisam_storedproc_03.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
BitKeeper/deleted/.del-myisam_storedproc_06.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
BitKeeper/deleted/.del-myisam_storedproc_07.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
BitKeeper/deleted/.del-myisam_storedproc_08.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
BitKeeper/deleted/.del-myisam_storedproc_10.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
BitKeeper/deleted/.del-myisam_trig_0102.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_0102.result
BitKeeper/deleted/.del-myisam_trig_03.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_03.result
BitKeeper/deleted/.del-myisam_trig_0407.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_0407.result
BitKeeper/deleted/.del-myisam_trig_08.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_08.result
BitKeeper/deleted/.del-memory_tb4.txt:
  Delete: mysql-test/suite/funcs_1/data/memory_tb4.txt
BitKeeper/deleted/.del-myisam_trig_09.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_09.result
BitKeeper/deleted/.del-myisam_trig_1011ext.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
BitKeeper/deleted/.del-myisam_triggers.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_triggers.result
BitKeeper/deleted/.del-myisam_views.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_views.result
BitKeeper/deleted/.del-cleanup_sp_tb.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
BitKeeper/deleted/.del-load_sp_tb.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
BitKeeper/deleted/.del-storedproc_02.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
BitKeeper/deleted/.del-storedproc_03.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
BitKeeper/deleted/.del-storedproc_06.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
BitKeeper/deleted/.del-storedproc_07.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
BitKeeper/deleted/.del-myisam_tb1.txt:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb1.txt
BitKeeper/deleted/.del-storedproc_08.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
BitKeeper/deleted/.del-storedproc_08_show.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
BitKeeper/deleted/.del-storedproc_10.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
BitKeeper/deleted/.del-storedproc_master.inc:
  Delete: mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
BitKeeper/deleted/.del-a_version_check.test:
  Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-disabled.def~1:
  Delete: mysql-test/suite/funcs_1/t/disabled.def
BitKeeper/deleted/.del-innodb__datadict.test:
  Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test
BitKeeper/deleted/.del-innodb__load.test:
  Delete: mysql-test/suite/funcs_1/t/innodb__load.test
BitKeeper/deleted/.del-innodb_bitdata.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_bitdata.test
BitKeeper/deleted/.del-innodb_cursors.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_cursors.test
BitKeeper/deleted/.del-myisam_tb2.txt:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb2.txt
BitKeeper/deleted/.del-innodb_func_view.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_func_view.test
BitKeeper/deleted/.del-innodb_storedproc.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc.test
BitKeeper/deleted/.del-innodb_storedproc_02.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
BitKeeper/deleted/.del-innodb_storedproc_03.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
BitKeeper/deleted/.del-innodb_storedproc_06.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
BitKeeper/deleted/.del-innodb_storedproc_07.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
BitKeeper/deleted/.del-innodb_storedproc_08.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
BitKeeper/deleted/.del-innodb_storedproc_10.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
BitKeeper/deleted/.del-innodb_trig_0102.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_0102.test
BitKeeper/deleted/.del-innodb_trig_03.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_03.test
BitKeeper/deleted/.del-myisam_tb3.txt:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb3.txt
BitKeeper/deleted/.del-innodb_trig_0407.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_0407.test
BitKeeper/deleted/.del-innodb_trig_08.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_08.test
BitKeeper/deleted/.del-innodb_trig_09.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_09.test
BitKeeper/deleted/.del-innodb_trig_1011ext.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
BitKeeper/deleted/.del-innodb_trig_frkey.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
BitKeeper/deleted/.del-innodb_views.test:
  Delete: mysql-test/suite/funcs_1/t/innodb_views.test
BitKeeper/deleted/.del-memory__datadict.test:
  Delete: mysql-test/suite/funcs_1/t/memory__datadict.test
BitKeeper/deleted/.del-memory__load.test:
  Delete: mysql-test/suite/funcs_1/t/memory__load.test
BitKeeper/deleted/.del-memory_bitdata.test:
  Delete: mysql-test/suite/funcs_1/t/memory_bitdata.test
BitKeeper/deleted/.del-memory_cursors.test:
  Delete: mysql-test/suite/funcs_1/t/memory_cursors.test
BitKeeper/deleted/.del-myisam_tb4.txt:
  Delete: mysql-test/suite/funcs_1/data/myisam_tb4.txt
BitKeeper/deleted/.del-memory_func_view.test:
  Delete: mysql-test/suite/funcs_1/t/memory_func_view.test
BitKeeper/deleted/.del-memory_storedproc.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc.test
BitKeeper/deleted/.del-memory_storedproc_02.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_02.test
BitKeeper/deleted/.del-memory_storedproc_03.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_03.test
BitKeeper/deleted/.del-memory_storedproc_06.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_06.test
BitKeeper/deleted/.del-memory_storedproc_07.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_07.test
BitKeeper/deleted/.del-memory_storedproc_08.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_08.test
BitKeeper/deleted/.del-memory_storedproc_10.test:
  Delete: mysql-test/suite/funcs_1/t/memory_storedproc_10.test
BitKeeper/deleted/.del-memory_trig_0102.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_0102.test
BitKeeper/deleted/.del-memory_trig_03.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_03.test
BitKeeper/deleted/.del-t3.txt:
  Delete: mysql-test/suite/funcs_1/data/t3.txt
BitKeeper/deleted/.del-memory_trig_0407.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_0407.test
BitKeeper/deleted/.del-memory_trig_08.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_08.test
BitKeeper/deleted/.del-memory_trig_09.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_09.test
BitKeeper/deleted/.del-memory_trig_1011ext.test:
  Delete: mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
BitKeeper/deleted/.del-memory_views.test:
  Delete: mysql-test/suite/funcs_1/t/memory_views.test
BitKeeper/deleted/.del-myisam__datadict.test:
  Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test
BitKeeper/deleted/.del-myisam__load.test:
  Delete: mysql-test/suite/funcs_1/t/myisam__load.test
BitKeeper/deleted/.del-myisam_bitdata.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_bitdata.test
BitKeeper/deleted/.del-myisam_cursors.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_cursors.test
BitKeeper/deleted/.del-myisam_func_view.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_func_view.test
BitKeeper/deleted/.del-t4.txt:
  Delete: mysql-test/suite/funcs_1/data/t4.txt
BitKeeper/deleted/.del-myisam_storedproc.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc.test
BitKeeper/deleted/.del-myisam_storedproc_02.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
BitKeeper/deleted/.del-myisam_storedproc_03.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
BitKeeper/deleted/.del-myisam_storedproc_06.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
BitKeeper/deleted/.del-myisam_storedproc_07.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
BitKeeper/deleted/.del-myisam_storedproc_08.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
BitKeeper/deleted/.del-myisam_storedproc_10.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
BitKeeper/deleted/.del-myisam_trig_0102.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_0102.test
BitKeeper/deleted/.del-myisam_trig_03.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_03.test
BitKeeper/deleted/.del-myisam_trig_0407.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_0407.test
BitKeeper/deleted/.del-t7.txt:
  Delete: mysql-test/suite/funcs_1/data/t7.txt
BitKeeper/deleted/.del-myisam_trig_08.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_08.test
BitKeeper/deleted/.del-myisam_trig_09.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_09.test
BitKeeper/deleted/.del-myisam_trig_1011ext.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
BitKeeper/deleted/.del-myisam_views.test:
  Delete: mysql-test/suite/funcs_1/t/myisam_views.test
BitKeeper/deleted/.del-trig_frkey.inc:
  Delete: mysql-test/suite/funcs_1/triggers/trig_frkey.inc
BitKeeper/deleted/.del-trig_frkey2.inc:
  Delete: mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
BitKeeper/deleted/.del-triggers_0102.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_0102.inc
BitKeeper/deleted/.del-triggers_03.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_03.inc
BitKeeper/deleted/.del-triggers_0407.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_0407.inc
BitKeeper/deleted/.del-triggers_08.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_08.inc
BitKeeper/deleted/.del-t9.txt:
  Delete: mysql-test/suite/funcs_1/data/t9.txt
BitKeeper/deleted/.del-triggers_09.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_09.inc
BitKeeper/deleted/.del-triggers_1011ext.inc:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
BitKeeper/deleted/.del-triggers_master.test:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
BitKeeper/deleted/.del-func_view.inc:
  Delete: mysql-test/suite/funcs_1/views/func_view.inc
BitKeeper/deleted/.del-fv1.inc:
  Delete: mysql-test/suite/funcs_1/views/fv1.inc
BitKeeper/deleted/.del-fv2.inc:
  Delete: mysql-test/suite/funcs_1/views/fv2.inc
BitKeeper/deleted/.del-fv_cast.inc:
  Delete: mysql-test/suite/funcs_1/views/fv_cast.inc
BitKeeper/deleted/.del-fv_if1.inc:
  Delete: mysql-test/suite/funcs_1/views/fv_if1.inc
BitKeeper/deleted/.del-fv_if2.inc:
  Delete: mysql-test/suite/funcs_1/views/fv_if2.inc
BitKeeper/deleted/.del-fv_ifnull.inc:
  Delete: mysql-test/suite/funcs_1/views/fv_ifnull.inc
BitKeeper/deleted/.del-bitdata_master.test:
  Delete: mysql-test/suite/funcs_1/bitdata/bitdata_master.test
BitKeeper/deleted/.del-datadict_bug_12777.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
BitKeeper/deleted/.del-views_master.inc:
  Delete: mysql-test/suite/funcs_1/views/views_master.inc
BitKeeper/deleted/.del-readme.txt~2:
  Delete: mysql-test/suite/funcs_2/readme.txt
BitKeeper/deleted/.del-charset_master.test:
  Delete: mysql-test/suite/funcs_2/charset/charset_master.test
BitKeeper/deleted/.del-charset_utf8.txt:
  Delete: mysql-test/suite/funcs_2/data/charset_utf8.txt
BitKeeper/deleted/.del-check_charset.inc:
  Delete: mysql-test/suite/funcs_2/include/check_charset.inc
BitKeeper/deleted/.del-check_charset_ucs2.inc:
  Delete: mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
BitKeeper/deleted/.del-check_charset_utf8.inc:
  Delete: mysql-test/suite/funcs_2/include/check_charset_utf8.inc
BitKeeper/deleted/.del-gen_charset_utf8.pl:
  Delete: mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
BitKeeper/deleted/.del-innodb_charset.result:
  Delete: mysql-test/suite/funcs_2/r/innodb_charset.result
BitKeeper/deleted/.del-memory_charset.result:
  Delete: mysql-test/suite/funcs_2/r/memory_charset.result
BitKeeper/deleted/.del-datadict_load.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_load.inc
BitKeeper/deleted/.del-myisam_charset.result:
  Delete: mysql-test/suite/funcs_2/r/myisam_charset.result
BitKeeper/deleted/.del-ndb_charset.result:
  Delete: mysql-test/suite/funcs_2/r/ndb_charset.result
BitKeeper/deleted/.del-innodb_charset.test:
  Delete: mysql-test/suite/funcs_2/t/innodb_charset.test
BitKeeper/deleted/.del-memory_charset.test:
  Delete: mysql-test/suite/funcs_2/t/memory_charset.test
BitKeeper/deleted/.del-myisam_charset.test:
  Delete: mysql-test/suite/funcs_2/t/myisam_charset.test
BitKeeper/deleted/.del-ndb_charset.test:
  Delete: mysql-test/suite/funcs_2/t/ndb_charset.test
BitKeeper/deleted/.del-datadict_master.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc
BitKeeper/deleted/.del-datadict_show_schema.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
BitKeeper/deleted/.del-datadict_show_table_design.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
BitKeeper/deleted/.del-datadict_tables.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc
BitKeeper/deleted/.del-datadict_tables_error.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
BitKeeper/deleted/.del-datadict_tables_error_1.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
BitKeeper/deleted/.del-datadict_tables_error_1044.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
BitKeeper/deleted/.del-datadict_tables_error_1049.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
BitKeeper/deleted/.del-cursors_master.test:
  Delete: mysql-test/suite/funcs_1/cursors/cursors_master.test
BitKeeper/deleted/.del-datadict_tables_error_1051.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
BitKeeper/deleted/.del-datadict_tables_error_1146.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
BitKeeper/deleted/.del-datadict_tables_error_1288.inc:
  Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
BitKeeper/deleted/.del-create_database.inc:
  Delete: mysql-test/suite/funcs_1/include/create_database.inc
BitKeeper/deleted/.del-create_user_lowest_priv.inc:
  Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
BitKeeper/deleted/.del-create_user_no_super.inc:
  Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc
BitKeeper/deleted/.del-innodb_tb1.inc:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb1.inc
BitKeeper/deleted/.del-innodb_tb2.inc:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb2.inc
BitKeeper/deleted/.del-innodb_tb3.inc:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb3.inc
BitKeeper/deleted/.del-innodb_tb4.inc:
  Delete: mysql-test/suite/funcs_1/include/innodb_tb4.inc
BitKeeper/deleted/.del-innodb_tb1.txt:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb1.txt
BitKeeper/deleted/.del-memory_tb1.inc:
  Delete: mysql-test/suite/funcs_1/include/memory_tb1.inc
BitKeeper/deleted/.del-memory_tb2.inc:
  Delete: mysql-test/suite/funcs_1/include/memory_tb2.inc
BitKeeper/deleted/.del-memory_tb3.inc:
  Delete: mysql-test/suite/funcs_1/include/memory_tb3.inc
BitKeeper/deleted/.del-memory_tb4.inc:
  Delete: mysql-test/suite/funcs_1/include/memory_tb4.inc
BitKeeper/deleted/.del-myisam_tb1.inc:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb1.inc
BitKeeper/deleted/.del-myisam_tb2.inc:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb2.inc
BitKeeper/deleted/.del-myisam_tb3.inc:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb3.inc
BitKeeper/deleted/.del-myisam_tb4.inc:
  Delete: mysql-test/suite/funcs_1/include/myisam_tb4.inc
BitKeeper/deleted/.del-show_connection.inc:
  Delete: mysql-test/suite/funcs_1/include/show_connection.inc
BitKeeper/deleted/.del-sp_tb.inc:
  Delete: mysql-test/suite/funcs_1/include/sp_tb.inc
BitKeeper/deleted/.del-innodb_tb2.txt:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb2.txt
BitKeeper/deleted/.del-DataGen_local.pl:
  Delete: mysql-test/suite/funcs_1/lib/DataGen_local.pl
BitKeeper/deleted/.del-DataGen_modify.pl:
  Delete: mysql-test/suite/funcs_1/lib/DataGen_modify.pl
BitKeeper/deleted/.del-a_version_check.result:
  Delete: mysql-test/suite/funcs_1/r/a_version_check.result
BitKeeper/deleted/.del-innodb__datadict.result:
  Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result
BitKeeper/deleted/.del-innodb__load.result:
  Delete: mysql-test/suite/funcs_1/r/innodb__load.result
BitKeeper/deleted/.del-innodb_bitdata.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_bitdata.result
BitKeeper/deleted/.del-innodb_cursors.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_cursors.result
BitKeeper/deleted/.del-innodb_func_view.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_func_view.result
BitKeeper/deleted/.del-innodb_storedproc.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc.result
BitKeeper/deleted/.del-innodb_storedproc_02.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
BitKeeper/deleted/.del-innodb_tb3.txt:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb3.txt
BitKeeper/deleted/.del-innodb_storedproc_03.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
BitKeeper/deleted/.del-innodb_storedproc_06.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
BitKeeper/deleted/.del-innodb_storedproc_07.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
BitKeeper/deleted/.del-innodb_storedproc_08.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
BitKeeper/deleted/.del-innodb_storedproc_10.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
BitKeeper/deleted/.del-innodb_trig_0102.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_0102.result
BitKeeper/deleted/.del-innodb_trig_03.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_03.result
BitKeeper/deleted/.del-innodb_trig_0407.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_0407.result
BitKeeper/deleted/.del-innodb_trig_08.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_08.result
BitKeeper/deleted/.del-innodb_trig_09.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_09.result
BitKeeper/deleted/.del-innodb_tb4.txt:
  Delete: mysql-test/suite/funcs_1/data/innodb_tb4.txt
BitKeeper/deleted/.del-innodb_trig_1011ext.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
BitKeeper/deleted/.del-innodb_trig_frkey.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
BitKeeper/deleted/.del-innodb_triggers.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_triggers.result
BitKeeper/deleted/.del-innodb_views.result:
  Delete: mysql-test/suite/funcs_1/r/innodb_views.result
BitKeeper/deleted/.del-memory__datadict.result:
  Delete: mysql-test/suite/funcs_1/r/memory__datadict.result
BitKeeper/deleted/.del-memory__load.result:
  Delete: mysql-test/suite/funcs_1/r/memory__load.result
BitKeeper/deleted/.del-memory_bitdata.result:
  Delete: mysql-test/suite/funcs_1/r/memory_bitdata.result
BitKeeper/deleted/.del-memory_cursors.result:
  Delete: mysql-test/suite/funcs_1/r/memory_cursors.result
BitKeeper/deleted/.del-memory_func_view.result:
  Delete: mysql-test/suite/funcs_1/r/memory_func_view.result
BitKeeper/deleted/.del-memory_storedproc.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc.result
BitKeeper/deleted/.del-memory_tb1.txt:
  Delete: mysql-test/suite/funcs_1/data/memory_tb1.txt
BitKeeper/deleted/.del-memory_storedproc_02.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_02.result
BitKeeper/deleted/.del-memory_storedproc_03.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_03.result
BitKeeper/deleted/.del-memory_storedproc_06.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_06.result
BitKeeper/deleted/.del-memory_storedproc_07.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_07.result
BitKeeper/deleted/.del-memory_storedproc_08.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_08.result
BitKeeper/deleted/.del-memory_storedproc_10.result:
  Delete: mysql-test/suite/funcs_1/r/memory_storedproc_10.result
BitKeeper/deleted/.del-memory_trig_0102.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_0102.result
BitKeeper/deleted/.del-memory_trig_03.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_03.result
BitKeeper/deleted/.del-memory_trig_0407.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_0407.result
BitKeeper/deleted/.del-memory_trig_08.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_08.result
BitKeeper/deleted/.del-memory_tb2.txt:
  Delete: mysql-test/suite/funcs_1/data/memory_tb2.txt
BitKeeper/deleted/.del-memory_trig_09.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_09.result
BitKeeper/deleted/.del-memory_trig_1011ext.result:
  Delete: mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
BitKeeper/deleted/.del-memory_triggers.result:
  Delete: mysql-test/suite/funcs_1/r/memory_triggers.result
BitKeeper/deleted/.del-memory_views.result:
  Delete: mysql-test/suite/funcs_1/r/memory_views.result
BitKeeper/deleted/.del-myisam__datadict.result:
  Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result
BitKeeper/deleted/.del-myisam__load.result:
  Delete: mysql-test/suite/funcs_1/r/myisam__load.result
BitKeeper/deleted/.del-myisam_bitdata.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_bitdata.result
BitKeeper/deleted/.del-myisam_cursors.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_cursors.result
BitKeeper/deleted/.del-myisam_func_view.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_func_view.result
BitKeeper/deleted/.del-myisam_storedproc.result:
  Delete: mysql-test/suite/funcs_1/r/myisam_storedproc.result
scripts/make_binary_distribution.sh:
  SCCS merged

aedf161d

Merge clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-merge · ad7c737e

unknown authored Feb 12, 2007

into  clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  dont see anything here, use local

ad7c737e

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1c285489
unknown authored Feb 12, 2007
```
into  mysql.com:/home/tnurnberg/24660/50-24660


sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
```
1c285489
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 8a34c4bb
unknown authored Feb 12, 2007
```
into  mysql.com:/home/tnurnberg/24660/41-24660


sql/table.cc:
  Auto merged
```
8a34c4bb

Merge mysql.com:/home/tnurnberg/24660/41-24660 · 91f684a5

unknown authored Feb 12, 2007

into  mysql.com:/home/tnurnberg/24660/50-24660


mysql-test/r/type_enum.result:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

91f684a5

Bug#24660: "enum" field type definition problem · 4dc7c1aa

unknown authored Feb 12, 2007

ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales.
This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
being used. Now if 0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an error.

Any solution would have broken some sort of existing behaviour. This solution should
serve both fractions (those with 0xff and those with ',' in their enums), but
WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
That is, mysqldump with their current server, and restore when upgrading to one with
this patch.


mysql-test/r/type_enum.result:
  Bug#24660: "enum" field type definition problem
  
  Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
  char in some locales), or ',', or both.
mysql-test/t/type_enum.test:
  Bug#24660: "enum" field type definition problem
  
  Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
  char in some locales), or ',', or both.
sql/table.cc:
  Bug#24660: "enum" field type definition problem
  
  Revert fix for Bug#20922.
sql/unireg.cc:
  Bug#24660: "enum" field type definition problem
  
  Use a field-separator for ENUM-values that is not part of those values. If impossible,
  throw error.

4dc7c1aa

09 Feb, 2007 4 commits
- Merge trift2.:/MySQL/M50/mysql-5.0 · 2abc977d
  unknown authored Feb 09, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  2abc977d
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · a4727936
  unknown authored Feb 09, 2007
```
into  trift2.:/MySQL/M51/push-5.1


BitKeeper/etc/ignore:
  auto-union
```
  a4727936
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 8bdc141f
  unknown authored Feb 09, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
```
  8bdc141f
- Merge trift2.:/MySQL/M51/mysql-5.1 · 135d0256
  unknown authored Feb 09, 2007
```
into  trift2.:/MySQL/M51/push-5.1


BitKeeper/etc/ignore:
  auto-union
```
  135d0256
08 Feb, 2007 5 commits

make_binary_distribution.sh: · 906a4842

unknown authored Feb 09, 2007

  Copy "ndb_size.tmpl" into binary distribution (Bug#24191)


scripts/make_binary_distribution.sh:
  Copy "ndb_size.tmpl" into binary distribution (Bug#24191)

906a4842

Merge siva.hindu.god:/home/tsmith/m/bk/51 · c4fdf11e

unknown authored Feb 08, 2007

into  siva.hindu.god:/home/tsmith/m/bk/maint/51


sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

c4fdf11e

Merge siva.hindu.god:/home/tsmith/m/bk/50 · 686be32e
unknown authored Feb 08, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
```
686be32e
Merge siva.hindu.god:/home/tsmith/m/bk/41 · 43ada21f
unknown authored Feb 08, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/maint/41


sql/sql_prepare.cc:
  Manual merge
```
43ada21f

updates caused by 5.1.16 · fc71108a

unknown authored Feb 08, 2007


BitKeeper/etc/ignore:
  Added mysql-test/partitions.log mysql-test/rpl.log to the ignore list

fc71108a

07 Feb, 2007 1 commit
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 75d614e0
  unknown authored Feb 08, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-4.1-ndb
```
  75d614e0