unknown
66d2a9f471
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
sql/mysql_priv.h:
manual merge.
2007-02-13 10:23:32 -05:00
unknown
6f628013e8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
sql/mysql_priv.h:
Auto merged
2007-02-13 10:02:00 -05:00
unknown
08850cdaeb
adopt to changes in load_defaults
2007-02-13 14:32:07 +01:00
unknown
4908dec7e4
objects is only for internal use.
...
BitKeeper/deleted/.del-README.txt~97cdd3dccd3539d2:
Delete: mysql-test/suite/objects/README.txt
BitKeeper/deleted/.del-drop_all.inc:
Delete: mysql-test/suite/objects/include/drop_all.inc
BitKeeper/deleted/.del-objects.inc:
Delete: mysql-test/suite/objects/include/objects.inc
BitKeeper/deleted/.del-tbl01.inc:
Delete: mysql-test/suite/objects/include/tbl01.inc
BitKeeper/deleted/.del-tbl02.inc:
Delete: mysql-test/suite/objects/include/tbl02.inc
BitKeeper/deleted/.del-tbl03.inc:
Delete: mysql-test/suite/objects/include/tbl03.inc
BitKeeper/deleted/.del-tbl04.inc:
Delete: mysql-test/suite/objects/include/tbl04.inc
BitKeeper/deleted/.del-tbl05.inc:
Delete: mysql-test/suite/objects/include/tbl05.inc
BitKeeper/deleted/.del-tbl06.inc:
Delete: mysql-test/suite/objects/include/tbl06.inc
BitKeeper/deleted/.del-tbl07.inc:
Delete: mysql-test/suite/objects/include/tbl07.inc
BitKeeper/deleted/.del-tbl08.inc:
Delete: mysql-test/suite/objects/include/tbl08.inc
BitKeeper/deleted/.del-tbl09.inc:
Delete: mysql-test/suite/objects/include/tbl09.inc
BitKeeper/deleted/.del-tbl10.inc:
Delete: mysql-test/suite/objects/include/tbl10.inc
BitKeeper/deleted/.del-tbl11.inc:
Delete: mysql-test/suite/objects/include/tbl11.inc
BitKeeper/deleted/.del-tbl12.inc:
Delete: mysql-test/suite/objects/include/tbl12.inc
BitKeeper/deleted/.del-tbl13.inc:
Delete: mysql-test/suite/objects/include/tbl13.inc
BitKeeper/deleted/.del-tbl14.inc:
Delete: mysql-test/suite/objects/include/tbl14.inc
BitKeeper/deleted/.del-tbl15.inc:
Delete: mysql-test/suite/objects/include/tbl15.inc
BitKeeper/deleted/.del-tbl16.inc:
Delete: mysql-test/suite/objects/include/tbl16.inc
BitKeeper/deleted/.del-tbl17.inc:
Delete: mysql-test/suite/objects/include/tbl17.inc
BitKeeper/deleted/.del-tbl18.inc:
Delete: mysql-test/suite/objects/include/tbl18.inc
BitKeeper/deleted/.del-tbl19.inc:
Delete: mysql-test/suite/objects/include/tbl19.inc
BitKeeper/deleted/.del-tbl20.inc:
Delete: mysql-test/suite/objects/include/tbl20.inc
BitKeeper/deleted/.del-tbl21.inc:
Delete: mysql-test/suite/objects/include/tbl21.inc
BitKeeper/deleted/.del-tbl22.inc:
Delete: mysql-test/suite/objects/include/tbl22.inc
BitKeeper/deleted/.del-tbl23.inc:
Delete: mysql-test/suite/objects/include/tbl23.inc
BitKeeper/deleted/.del-tbl24.inc:
Delete: mysql-test/suite/objects/include/tbl24.inc
BitKeeper/deleted/.del-tbl25.inc:
Delete: mysql-test/suite/objects/include/tbl25.inc
BitKeeper/deleted/.del-tbl26.inc:
Delete: mysql-test/suite/objects/include/tbl26.inc
BitKeeper/deleted/.del-tbl27.inc:
Delete: mysql-test/suite/objects/include/tbl27.inc
BitKeeper/deleted/.del-tbl28.inc:
Delete: mysql-test/suite/objects/include/tbl28.inc
BitKeeper/deleted/.del-tbl29.inc:
Delete: mysql-test/suite/objects/include/tbl29.inc
BitKeeper/deleted/.del-tbl30.inc:
Delete: mysql-test/suite/objects/include/tbl30.inc
BitKeeper/deleted/.del-tbl31.inc:
Delete: mysql-test/suite/objects/include/tbl31.inc
BitKeeper/deleted/.del-tbl32.inc:
Delete: mysql-test/suite/objects/include/tbl32.inc
BitKeeper/deleted/.del-tbl33.inc:
Delete: mysql-test/suite/objects/include/tbl33.inc
BitKeeper/deleted/.del-tbl34.inc:
Delete: mysql-test/suite/objects/include/tbl34.inc
BitKeeper/deleted/.del-tbl35.inc:
Delete: mysql-test/suite/objects/include/tbl35.inc
BitKeeper/deleted/.del-tbl36.inc:
Delete: mysql-test/suite/objects/include/tbl36.inc
BitKeeper/deleted/.del-tbl37.inc:
Delete: mysql-test/suite/objects/include/tbl37.inc
BitKeeper/deleted/.del-tbl38.inc:
Delete: mysql-test/suite/objects/include/tbl38.inc
BitKeeper/deleted/.del-tbl39.inc:
Delete: mysql-test/suite/objects/include/tbl39.inc
BitKeeper/deleted/.del-tbl40.inc:
Delete: mysql-test/suite/objects/include/tbl40.inc
BitKeeper/deleted/.del-tbl41.inc:
Delete: mysql-test/suite/objects/include/tbl41.inc
BitKeeper/deleted/.del-tbl42.inc:
Delete: mysql-test/suite/objects/include/tbl42.inc
BitKeeper/deleted/.del-tbl43.inc:
Delete: mysql-test/suite/objects/include/tbl43.inc
BitKeeper/deleted/.del-tbl44.inc:
Delete: mysql-test/suite/objects/include/tbl44.inc
BitKeeper/deleted/.del-tbl45.inc:
Delete: mysql-test/suite/objects/include/tbl45.inc
BitKeeper/deleted/.del-tbl46.inc:
Delete: mysql-test/suite/objects/include/tbl46.inc
BitKeeper/deleted/.del-tbl47.inc:
Delete: mysql-test/suite/objects/include/tbl47.inc
BitKeeper/deleted/.del-tbl48.inc:
Delete: mysql-test/suite/objects/include/tbl48.inc
BitKeeper/deleted/.del-view.inc:
Delete: mysql-test/suite/objects/include/view.inc
BitKeeper/deleted/.del-objects_falcon.result:
Delete: mysql-test/suite/objects/r/objects_falcon.result
BitKeeper/deleted/.del-objects_falcon.test:
Delete: mysql-test/suite/objects/t/objects_falcon.test
BitKeeper/deleted/.del-objects_innodb.result:
Delete: mysql-test/suite/objects/r/objects_innodb.result
BitKeeper/deleted/.del-objects_innodb.test:
Delete: mysql-test/suite/objects/t/objects_innodb.test
2007-02-13 12:04:20 +01:00
unknown
21df932dbd
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
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
2007-02-13 01:34:36 -08:00
unknown
b4442bb2d6
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
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
2007-02-13 10:27:39 +01:00
unknown
f2905a9094
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
BitKeeper/etc/ignore:
auto-union
2007-02-13 10:00:59 +01:00
unknown
e5c1656e97
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
2007-02-13 10:00:53 +01:00
unknown
faacf58091
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
...
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
2007-02-13 09:56:56 +01:00
unknown
e656c582bc
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26209
sql/sql_select.cc:
Auto merged
2007-02-12 23:10:33 -08:00
unknown
4af2b329ff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
2007-02-13 13:18:37 +07:00
unknown
61e9e1f70d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
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/Ndb.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
2007-02-13 13:12:54 +07:00
unknown
a3fa962b17
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-02-13 02:56:35 +01:00
unknown
5e2a32781c
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
2007-02-13 02:54:51 +01:00
unknown
28fd0d04cd
ndb - new atrt
...
BitKeeper/deleted/.del-conf-daily-basic-ndb08.txt:
Delete: storage/ndb/test/run-test/conf-daily-basic-ndb08.txt
BitKeeper/deleted/.del-conf-daily-devel-ndb08.txt:
Delete: storage/ndb/test/run-test/conf-daily-devel-ndb08.txt
BitKeeper/deleted/.del-conf-daily-devel-ndbmaster.txt:
Delete: storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
BitKeeper/deleted/.del-conf-daily-sql-ndb08.txt:
Delete: storage/ndb/test/run-test/conf-daily-sql-ndb08.txt
BitKeeper/deleted/.del-conf-daily-sql-ndbmaster.txt:
Delete: storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
BitKeeper/deleted/.del-conf-dl145a.txt:
Delete: storage/ndb/test/run-test/conf-dl145a.txt
BitKeeper/deleted/.del-conf-ndbmaster.txt:
Delete: storage/ndb/test/run-test/conf-ndbmaster.txt
BitKeeper/deleted/.del-conf-shark.txt:
Delete: storage/ndb/test/run-test/conf-shark.txt
storage/ndb/src/cw/cpcd/Makefile.am:
new atrt
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
new atrt
storage/ndb/test/run-test/Makefile.am:
new atrt
storage/ndb/test/run-test/atrt-gather-result.sh:
new atrt
storage/ndb/test/run-test/atrt.hpp:
new atrt
storage/ndb/test/run-test/main.cpp:
new atrt
storage/ndb/test/tools/Makefile.am:
new atrt
storage/ndb/test/run-test/autotest-boot.sh:
New BitKeeper file ``storage/ndb/test/run-test/autotest-boot.sh''
storage/ndb/test/run-test/autotest-run.sh:
New BitKeeper file ``storage/ndb/test/run-test/autotest-run.sh''
storage/ndb/test/run-test/conf-dl145a.cnf:
New BitKeeper file ``storage/ndb/test/run-test/conf-dl145a.cnf''
storage/ndb/test/run-test/conf-ndbmaster.cnf:
New BitKeeper file ``storage/ndb/test/run-test/conf-ndbmaster.cnf''
storage/ndb/test/run-test/conf-repl.cnf:
New BitKeeper file ``storage/ndb/test/run-test/conf-repl.cnf''
storage/ndb/test/run-test/example-my.cnf:
New BitKeeper file ``storage/ndb/test/run-test/example-my.cnf''
storage/ndb/test/run-test/files.cpp:
New BitKeeper file ``storage/ndb/test/run-test/files.cpp''
storage/ndb/test/run-test/setup.cpp:
New BitKeeper file ``storage/ndb/test/run-test/setup.cpp''
storage/ndb/test/run-test/test-tests.txt:
New BitKeeper file ``storage/ndb/test/run-test/test-tests.txt''
2007-02-13 02:38:54 +01:00
unknown
9292b57707
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
libmysqld/lib_sql.cc:
Auto merged
sql/item.cc:
Auto merged
2007-02-13 00:00:27 +01:00
unknown
aedf161dda
Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0
...
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
2007-02-12 23:37:12 +01:00
unknown
ff72cc9386
Merge mysql.com:/home/hf/work/20691/my51-20691
...
into mysql.com:/home/hf/work/25492/my51-25492
2007-02-13 01:24:00 +04:00
unknown
4c2bc81ae7
Merge mysql.com:/home/hf/work/20691/my50-20691
...
into mysql.com:/home/hf/work/25492/my50-25492
sql/item.cc:
Auto merged
2007-02-13 01:23:23 +04:00
unknown
d30e1c76ae
Merge mysql.com:/home/hf/work/20691/my50-20691
...
into mysql.com:/home/hf/work/20691/my51-20691
mysql-test/r/default.result:
Auto merged
sql/item.cc:
Auto merged
mysql-test/r/gis.result:
SCCS merged
mysql-test/t/gis.test:
merging
2007-02-13 01:22:43 +04:00
unknown
e7e2550610
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/25492/my50-25492
2007-02-13 01:20:02 +04:00
unknown
5b1941675c
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/25492/my51-25492
libmysqld/lib_sql.cc:
Auto merged
2007-02-13 01:19:19 +04:00
unknown
38fa86a12e
Merge bk@192.168.21.1:mysql-4.1-opt
...
into mysql.com:/home/hf/work/25492/my41-25492
2007-02-13 01:18:52 +04:00
unknown
1dc9e5a622
Merge mysql.com:/home/hf/work/25492/my50-25492
...
into mysql.com:/home/hf/work/25492/my51-25492
libmysqld/lib_sql.cc:
Auto merged
2007-02-13 01:00:27 +04:00
unknown
04b64f0034
Merge mysql.com:/home/hf/work/25492/my41-25492
...
into mysql.com:/home/hf/work/25492/my50-25492
libmysqld/lib_sql.cc:
merging
2007-02-13 00:59:30 +04:00
unknown
fd76e14893
bug #25492 (Invalid deallocation in mysql_stmt_fetch)
...
libmysqld/lib_sql.cc:
code modified to prevent freeing of memory that wasn't malloc-ed.
Now we check if MYSQL_STMT::result was used.
2007-02-13 00:55:45 +04:00
unknown
ad7c737ec4
Merge clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-merge
...
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
2007-02-12 21:13:19 +01:00
unknown
715281a94b
Fix a linkage problem with the previous patch for "thr_client_alarm".
...
mysys/my_pthread.c:
Linkage problem with previous patch: "thr_client_alarm" must be declared in here.
mysys/thr_alarm.c:
Linkage problem: Declare "thr_client_alarm" over in "mysys/my_pthread.c".
2007-02-12 20:13:34 +01:00
unknown
2d2957c041
Break a double declare of "uint thr_client_alarm" between "mysys/thr_alarm.c" and "mysys/my_pthread.c".
...
mysys/my_pthread.c:
Break a double declare: "uint thr_client_alarm" is also declared in "mysys/thr_alarm.c", take it from there.
2007-02-12 19:55:33 +01:00
unknown
dfe66b93c8
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-02-12 19:36:47 +04:00
unknown
5e84eb5652
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-02-12 19:29:20 +04:00
unknown
7ca34a798f
valgrind error fix
2007-02-12 19:28:49 +04:00
unknown
2a221c8014
Compile error on Windows: Signal names are undefined. Fix by hiding the whole section.
...
mysys/my_thr_init.c:
Compile error on Windows: Both "SIGALRM" and "SIGUSR1" are undefined.
Fix by hiding the whole section, according to Jani it is not needed on Windows.
2007-02-12 15:03:11 +01:00
unknown
e307a46caf
Fixed MacOSX/Intel linking problem
...
Common symbols with and without initialization
cause the apple linker to exclude then from the
list of global symbols.
2007-02-12 16:02:53 +02:00
unknown
1c28548966
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/tnurnberg/24660/50-24660
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
2007-02-12 14:49:34 +01:00
unknown
8a34c4bb78
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/home/tnurnberg/24660/41-24660
sql/table.cc:
Auto merged
2007-02-12 14:39:45 +01:00
unknown
91f684a5ad
Merge mysql.com:/home/tnurnberg/24660/41-24660
...
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
2007-02-12 14:32:06 +01:00
unknown
4dc7c1aa46
Bug#24660: "enum" field type definition problem
...
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.
2007-02-12 14:31:44 +01:00
unknown
2572c82621
Bug#24630 Subselect query crashes mysqld
...
The crash happens because second filling of the same I_S table happens in
case of subselect with order by. table->sort.io_cache previously allocated
in create_sort_index() is deleted during second filling
(function get_schema_tables_result). There are two places where
I_S table can be filled: JOIN::exec and create_sort_index().
To fix the bug we should check if the table was already filled
in one of these places and skip processing of the table in second.
mysql-test/r/information_schema.result:
test case
mysql-test/t/information_schema.test:
test case
sql/mysql_priv.h:
added new parameter 'executed_place' to function get_schema_tables_result()
sql/sql_select.cc:
added new parameter 'executed_place' to function get_schema_tables_result()
sql/sql_show.cc:
added more accurate check for cases when we need to refresh I_S table
sql/table.cc:
added more accurate check for cases when we need to refresh I_S table
sql/table.h:
added more accurate check for cases when we need to refresh I_S table
2007-02-12 16:06:14 +04:00
unknown
07f36668ae
bug #20691 (INSERT (DEFAULT) may insert garbage with NO DEFAULT NOT NULL field)
...
Some fields (GEOMETRY first of all) can't be handled properly in this
case at all. So we return an error in this case
mysql-test/r/default.result:
result fixed
mysql-test/r/gis.result:
result fixed
mysql-test/t/default.test:
VIEW test added
mysql-test/t/gis.test:
testcase added
sql/item.cc:
set_defaults() changed with the 'reset()'
2007-02-12 15:41:36 +04:00
unknown
21c2e6e11a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
2007-02-12 11:10:28 +01:00
unknown
5abe2fdba4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
2007-02-12 11:01:59 +01:00
unknown
4c8010e341
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-12 15:10:58 +07:00
unknown
1932ac9aae
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26159
2007-02-11 22:48:40 -08:00
unknown
ac8e029357
Fixed bug #26209 .
...
The function make_unireg_sortorder ignored the fact that any
view field is represented by a 'ref' object.
This could lead to wrong results for the queries containing
both GROUP BY and ORDER BY clauses.
mysql-test/r/view.result:
Added a test case for bug #26209 .
mysql-test/t/view.test:
Added a test case for bug #26209 .
2007-02-11 19:36:46 -08:00
unknown
5e42c0de8d
sql_view.cc:
...
Post fix for bug#12122.
information_schema.result:
Corrected test case after fixing bug#12122.
sql/sql_view.cc:
Post fix for bug#12122.
mysql-test/r/information_schema.result:
Corrected test case after fixing bug#12122.
2007-02-11 22:52:12 +03:00
unknown
a544b64f8d
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/12122-bug-5.0-opt-mysql
2007-02-11 21:03:40 +03:00
unknown
3e4f834dfb
Fixed bug #26159 .
...
A wrong order of statements in QUICK_GROUP_MIN_MAX_SELECT::reset
caused a crash when a query with DISTINCT was executed by a loose scan
for an InnoDB table that had been emptied.
mysql-test/r/innodb_mysql.result:
Added a test case for bug #26159 .
mysql-test/t/innodb_mysql.test:
Added a test case for bug #26159 .
sql/opt_range.cc:
Fixed bug #26159 .
A wrong order of statements in QUICK_GROUP_MIN_MAX_SELECT::reset
caused a crash when a query with DISTINCT was executed by a loose scan
for an InnoDB table that had been emptied.
For an empty table quick_prefix_select->reset() was not called at all
and thus some important initialization steps were missing.
2007-02-10 23:55:56 -08:00
unknown
308da65162
Bug#12122: The MERGE algorithm isn't applicable if the ORDER BY clause is
...
present.
A view created with CREATE VIEW ... ORDER BY ... cannot be resolved with
the MERGE algorithm, even when no other part of the CREATE VIEW statement
would require the view to be resolved using the TEMPTABLE algorithm.
The check for presence of the ORDER BY clause in the underlying select is
removed from the st_lex::can_be_merged() function.
The ORDER BY list of the underlying select is appended to the ORDER BY list
mysql-test/t/view.test:
Added a test case for bug#12122: Views with ORDER BY can't be resolved using MERGE algorithm.
mysql-test/r/view.result:
Added a test case for bug#12122: Views with ORDER BY can't be resolved using MERGE algorithm.
sql/sql_lex.cc:
Bug#12122: Views with ORDER BY can't be resolved using MERGE algorithm.
The st_lex::can_be_merged() function now allows views with the ORDER BY
clause to be resolved using MERGE algorithm. The ORDER BY list of the view
is appended to the ORDER BY list of the embedding select.
2007-02-10 00:00:07 +03:00
unknown
ce8c0ec29b
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26017
2007-02-09 12:58:35 -08:00
