1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Commit Graph

15958 Commits

Author SHA1 Message Date
unknown
39ee25b374 Fix for bug #7418 "TIMESTAMP not always converted to DATETIME in MAXDB
mode".

Changed grammar rule for "type" token. Now we have one branch with 
optional length specification for TIMESTAMP type instead of two separate
branches.


mysql-test/r/type_timestamp.result:
  Added test case for bug #7418 "TIMESTAMP not always converted to DATETIME
  in MAXDB mode".
mysql-test/t/type_timestamp.test:
  Added test case for bug #7418 "TIMESTAMP not always converted to DATETIME
  in MAXDB mode".
sql/sql_yacc.yy:
  Changed rule for "type" token. Now we have one branch with optional
  length specification for TIMESTAMP type instead of two separate branches.
  This also gives us consistent behavior for TIMETSAMP in MAXDB mode.
2005-01-11 14:26:40 +03:00
unknown
a28ebe6b6f Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-11 11:16:02 +01:00
unknown
39e52a532b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-11 01:36:49 +01:00
unknown
ac606583ca mtr_process.pl:
Catch more fork() errors.
  Moved sleep_until_file_created() here from "mysql-test-run.pl".
  Improved debug output.
mtr_io.pl:
  Improved mtr_get_opts_from_file(), try to mimic some sh.
mysql-test-run.pl:
  Cleaned up the timeout handling.
  Created new function environment_setup().
  Corrected time zone handling.
  Moved sleep_until_file_created() to "lib/mtr_process.pl".
  Improved debug output.


mysql-test/mysql-test-run.pl:
  Cleaned up the timeout handling.
  Created new function environment_setup().
  Corrected time zone handling.
  Moved sleep_until_file_created() to "lib/mtr_process.pl".
  Improved debug output.
mysql-test/lib/mtr_io.pl:
  Improved mtr_get_opts_from_file(), try to mimic some sh.
mysql-test/lib/mtr_process.pl:
  Catch more fork() errors.
  Moved sleep_until_file_created() here from "mysql-test-run.pl".
  Improved debug output.
2005-01-11 01:35:08 +01:00
unknown
b63d9439c9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-10 23:27:37 +01:00
unknown
26c1d47a0d Recorded new result file 2005-01-10 21:45:35 +01:00
unknown
24b048f5f4 Merge mysql.com:/home/mysql_src/mysql-4.1-clean
into mysql.com:/home/mysql_src/mysql-5.0-clean


sql/net_serv.cc:
  Auto merged
2005-01-10 15:15:49 +01:00
unknown
87e1a296ab A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE). 2005-01-10 15:13:33 +01:00
unknown
b4e736b861 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-01-10 15:28:17 +02:00
unknown
88e845067b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-10 09:31:17 +01:00
unknown
99f07f83ac Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-10 01:35:18 +01:00
unknown
9ec0095e47 updated ndb_mgm test
removed grep event and added congestion event
   more docs
    changed some naming, expecially regarding severities
    added config param for logevel for congestion


mysql-test/ndb/basic.result:
  updated ndb_mgm test
mysql-test/ndb/restart.test:
  updated ndb_mgm test
ndb/include/kernel/LogLevel.hpp:
  removed grep event and added congestion event
ndb/include/mgmapi/mgmapi.h:
  more docs
  changed some naming, expecially regarding severities
ndb/include/mgmapi/mgmapi_config_parameters.h:
  removed grep event and added congestion event
ndb/src/common/debugger/EventLogger.cpp:
  removed grep event and added congestion event
ndb/src/mgmapi/mgmapi.cpp:
  changed some naming, expecially regarding severities
ndb/src/mgmsrv/ConfigInfo.cpp:
  added config param for logevel for congestion
ndb/src/mgmsrv/Services.cpp:
  just som variable name changes
2005-01-09 23:02:06 +01:00
unknown
6cfef07c05 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-09 15:41:54 +01:00
unknown
cfe5650cab Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-09 11:01:47 +01:00
unknown
9b80f95f8f ndb -
Fix ndb_limit, handle cmpDate of length 3
Remove ucs2 test as it requires one to configure --with-extra-charsets


mysql-test/r/ndb_charset.result:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
mysql-test/t/ndb_charset.test:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
ndb/src/common/util/NdbSqlUtil.cpp:
  Fix ndb_limit, handle cmpDate of length 3
2005-01-09 11:00:37 +01:00
unknown
f029af067b Merge
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndb_constants.h:
  merge 5.0->5.0-ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge 5.0->5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  merge 5.0->5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  merge 5.0->5.0-ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  merge 5.0->5.0-ndb
2005-01-09 00:45:06 +01:00
unknown
09ee2d3db0 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-08 23:32:53 +01:00
unknown
e9befed644 Update test as result of merge
mysql-test/r/heap.result:
  update test
2005-01-08 23:32:28 +01:00
unknown
2c12921a64 Merge
client/mysql.cc:
  Auto merged
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge
2005-01-08 22:34:16 +01:00
unknown
f2034fdbba Merge mysql.com:/home/jwinstead2/mysql-4.1-7233
into mysql.com:/home/jwinstead2/mysql-5.0-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-01-08 22:22:41 +01:00
unknown
3186b340da ndb - wl-1442 fix Time ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Time.  adds new type id 25
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Time.  adds new type id 25
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Time.  adds new type id 25
sql/ha_ndbcluster.cc:
  wl-1442 fix Time.  adds new type id 25
2005-01-08 19:28:44 +01:00
unknown
633ee9b099 ndb - wl-1442 fix Date ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Date.  reuses old unused Timespec type id
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
sql/ha_ndbcluster.cc:
  wl-1442 fix Date.  reuses old unused Timespec type id
2005-01-08 16:57:51 +01:00
unknown
2a3f285eb5 ndb - wl-1442 updated ndb_index_ordered.result
mysql-test/r/ndb_index_ordered.result:
  wl-1442 missed result file
2005-01-08 15:18:24 +01:00
unknown
6f45da15f3 Merge bk-internal:/home/bk/mysql-5.0
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0


innobase/srv/srv0srv.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-08 15:06:20 +01:00
unknown
8a8823d27f Many files:
- Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable


innobase/include/srv0srv.h:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
innobase/srv/srv0srv.c:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
mysql-test/r/innodb.result:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
mysql-test/t/innodb.test:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/ha_innodb.cc:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/ha_innodb.h:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/mysqld.cc:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/set_var.cc:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
2005-01-08 15:01:37 +01:00
unknown
ce6de604c8 ndb - wl-1442 bug#7725 datetime ordering
mysql-test/t/ndb_index_ordered.test:
  wl-1442 datetime ordering
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 datetime ordering
2005-01-08 13:59:57 +01:00
unknown
895b50d74c Use 'USING <indextype>' in results of SHOW CREATE TABLE, it's the preferred
syntax. (Bug #7233)


sql/sql_show.cc:
  Use 'USING <indextype>' in SHOW CREATE TABLE, it's the preferred syntax
mysql-test/r/ctype_utf8.result:
  Update results
mysql-test/r/show_check.result:
  Update results
mysql-test/r/sql_mode.result:
  Update results
mysql-test/t/show_check.test:
  Use preferred syntax 'USING BTREE' instead of 'TYPE BTREE'
2005-01-08 07:31:13 +01:00
unknown
76266f19e8 Show the index type even for indexes using the default index type in
tables that support multiple index types. (Bug #7235)


sql/sql_show.cc:
  Always output 'TYPE <indextype>' for indexes on tables with multiple index types
mysql-test/r/ctype_utf8.result:
  Fix results for test
2005-01-08 06:15:41 +01:00
unknown
2731ae036c Merge bk-internal:/home/bk/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-08 00:34:08 +01:00
unknown
5802259dc5 Update messages in type_float test results
mysql-test/r/type_float.result:
  Update warning messages
mysql-test/r/type_float.result.es:
  Update warning messages
2005-01-07 20:34:51 +01:00
unknown
25335a9177 Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0-clean


mysql-test/r/type_float.result:
  Auto merged
sql/field.cc:
  Auto merged
2005-01-07 19:03:35 +01:00
unknown
0c57a67ce0 Correctly truncate integers inserted into field and double columns
with a number of decimals specified. (Bug #7361)


mysql-test/t/type_float.test:
  Add test for maximum values of float and double columns with number of decimals
mysql-test/r/type_float.result:
  Add results for new test
mysql-test/r/type_float.result.es:
  Add results for new test
sql/field.cc:
  Use ::store(double nr) from ::store(longlong nr) so we get the same range checking
2005-01-07 17:44:18 +01:00
unknown
15d7da2b3d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-07 15:34:25 +01:00
unknown
a2a3cf6578 Merge bk-internal:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1-cluster-extra


sql/mysqld.cc:
  Auto merged
2005-01-07 15:34:14 +01:00
unknown
b194c1c1ce merge
configure.in:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  manually merged
2005-01-07 15:02:25 +02:00
unknown
9ad1b390fc Many files:
Change mode to -rw-rw----


mysql-test/suite/jp/r/jp_alter_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_alter_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charlength_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_charset_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_convert_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_db_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_create_tbl_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_enum_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_insert_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_instr_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_join_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_left_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_length_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_like_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_locate_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_lpad_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ltrim_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ps_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_ps_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_replace_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_reverse_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_right_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rpad_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_rtrim_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_select_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_subquery_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_substring_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_trim_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_union_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_update_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_sjis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_ucs2.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_ujis.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/r/jp_where_utf8.result:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_sjis.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_ucs2.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_ujis.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0201_utf8.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis2.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_sjis3.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_ucs2.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_ujis.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0208_utf8.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_ucs2.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_ujis.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/std_data/jisx0212_utf8.dat:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_alter_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charlength_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_charset_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_convert_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_db_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_create_tbl_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_enum_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_insert_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_instr_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_join_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_left_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_length_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_like_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_locate_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_lpad_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ltrim_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ps_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_ps_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_replace_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_reverse_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_right_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rpad_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_rtrim_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_select_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_subquery_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_substring_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_trim_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_union_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_update_utf8.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_sjis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_ucs2.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_ujis.test:
  Change mode to -rw-rw----
mysql-test/suite/jp/t/jp_where_utf8.test:
  Change mode to -rw-rw----
2005-01-07 14:32:05 +02:00
unknown
c2b7fc9464 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-07 14:14:37 +02:00
unknown
2331344909 ndb - wl-1442 new varchar
mysql-test/r/ndb_alter_table.result:
  wl-1442 new varchar
mysql-test/r/ndb_bitfield.result:
  wl-1442 new varchar
mysql-test/r/ndb_charset.result:
  wl-1442 new varchar
mysql-test/t/ndb_charset.test:
  wl-1442 new varchar
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 new varchar
ndb/include/ndb_constants.h:
  wl-1442 new varchar
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 new varchar
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 new varchar
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbOperationDefine.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbOperationSearch.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbRecAttr.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbTransaction.cpp:
  wl-1442 new varchar
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1442 new varchar
sql/ha_ndbcluster.cc:
  wl-1442 new varchar
2005-01-07 11:55:20 +01:00
unknown
888b665e6c Added test data, test case and test result files for Japanese characters test.
I have put the tests into a separate "suite", the first one actually.
Currently this can only be run by the Perl version of mysql-test-run
that is not quite finished. It should, or at least will, be able to
be run with the line

  ./mysql-test-run.pl --suite=jp
2005-01-07 00:48:38 -08:00
unknown
187ff7c6fc Added test case files 2005-01-07 00:40:29 -08:00
unknown
647906259c Added test data and test case files. 2005-01-07 00:32:31 -08:00
unknown
b95768589a merge
BitKeeper/etc/logging_ok:
  auto-union
ndb/src/mgmsrv/main.cpp:
  Auto merged
2005-01-07 06:47:41 +01:00
unknown
dd02fd59b6 Skip client_test when testing embedded server
mysql-test/t/client_test.test:
  Doesn't make sense to run this test when running the embedded server
2005-01-07 04:53:05 +01:00
unknown
382cc831de merged
BitKeeper/etc/ignore:
  auto-union
include/my_pthread.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  merged manually
2005-01-06 19:32:16 +02:00
unknown
6b584127af Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-06 17:53:32 +02:00
unknown
dd4a9fcbd3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
2005-01-06 17:36:48 +02:00
unknown
615cd4ff75 Fixed a bug in prepared statements error handling
After merge fixes


libmysql/libmysql.c:
  Fixed a bug in prepared statements error handling introduced by me on a recent patch
mysql-test/r/delayed.result:
  Updated results
mysql-test/t/delayed.test:
  Bigger timeout needed when using --ps-protocol (don't understand why yet)
  Added output of not_flushed_dealyed_rows for easier debugging
sql/sql_base.cc:
  USE tables_share fix for prepared statements
sql/sql_prepare.cc:
  After merge fix
2005-01-06 16:59:29 +02:00
unknown
8ff8867251 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
2005-01-06 13:31:31 +02:00
unknown
acf76e3b88 First stage of table definition cache
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name


include/myisam.h:
  Added const before names
mysql-test/r/group_min_max.result:
  Make results repeatable
mysql-test/t/group_min_max.test:
  Make results repeatable
sql/field.cc:
  Created Field::make_field() and made Field_num::make_field() to call this
  Use TABLE_SHARE
  Use sql_strmake() instead of sql_memdup() to simplify code
sql/field.h:
  Changed table_name to be pointer to table_name. This allows us to change alias for all fields by just changing one pointer.
  Use TABLE_SHARE
sql/field_conv.cc:
  Use TABLE_SHARE
sql/filesort.cc:
  Use TABLE_SHARE
sql/ha_berkeley.cc:
  Use TABLE_SHARE
sql/ha_heap.cc:
  Use TABLE_SHARE
sql/ha_innodb.cc:
  Use TABLE_SHARE
sql/ha_myisam.cc:
  Use TABLE_SHARE
sql/ha_myisammrg.cc:
  Use TABLE_SHARE
  Change some pointer handling to use const char*
sql/ha_ndbcluster.cc:
  Use TABLE_SHARE
sql/handler.cc:
  Use TABLE_SHARE
sql/item.cc:
  Use TABLE_SHARE
sql/item_func.cc:
  Use TABLE_SHARE
sql/item_subselect.cc:
  Use TABLE_SHARE
sql/item_sum.cc:
  Use TABLE_SHARE
sql/key.cc:
  Use TABLE_SHARE
sql/lock.cc:
  Use TABLE_SHARE
sql/log_event.cc:
  real_name -> table_name
sql/mysql_priv.h:
  Use TABLE_SHARE
sql/opt_range.cc:
  Use TABLE_SHARE
sql/opt_sum.cc:
  Use TABLE_SHARE
sql/records.cc:
  Use TABLE_SHARE
sql/repl_failsafe.cc:
  real_name -> table_name
sql/slave.cc:
  Use TABLE_SHARE
sql/sp.cc:
  Use TABLE_SHARE
sql/sp_head.cc:
  real_name -> table_name
sql/sql_acl.cc:
  Use TABLE_SHARE
  removed unnecessary assert
  fixed indentation
  changed some char * -> const char*
sql/sql_acl.h:
  changed some char* -> const char*
sql/sql_base.cc:
  Use TABLE_SHARE
sql/sql_cache.cc:
  Use TABLE_SHARE
sql/sql_class.cc:
  Use TABLE_SHARE
sql/sql_db.cc:
  real_name -> table_name
sql/sql_delete.cc:
  Use TABLE_SHARE
sql/sql_derived.cc:
  Use TABLE_SHARE
sql/sql_handler.cc:
  Use TABLE_SHARE
sql/sql_help.cc:
  Use TABLE_SHARE
sql/sql_insert.cc:
  Use TABLE_SHARE
sql/sql_load.cc:
  Use TABLE_SHARE
sql/sql_parse.cc:
  Use TABLE_SHARE
sql/sql_rename.cc:
  real_name -> table_name
sql/sql_select.cc:
  Use TABLE_SHARE
  table->blob_fields now points to field offsets, not fields
  tmp_table->table_name now points to alias name
sql/sql_show.cc:
  Use TABLE_SHARE
sql/sql_table.cc:
  Use TABLE_SHARE
sql/sql_test.cc:
  Use TABLE_SHARE
sql/sql_trigger.cc:
  Use TABLE_SHARE
sql/sql_udf.cc:
  Use TABLE_SHARE
sql/sql_union.cc:
  real_name -> table_name
sql/sql_update.cc:
  Use TABLE_SHARE
sql/sql_view.cc:
  Use TABLE_SHARE
sql/table.cc:
  Split TABLE to TABLE and TABLE_SHARE
  Changed blob_field to be field offsets instead of pointer to fields
  Only initialize table->s->default_values with default record (not all table->record[#])
  Some indentation changes
sql/table.h:
  Split TABLE to TABLE and TABLE_SHARE
sql/tztime.cc:
  real_name -> table_name
sql/unireg.cc:
  Use TABLE_SHARE
sql/unireg.h:
  Use TABLE_SHARE
2005-01-06 13:00:13 +02:00
unknown
f0cf742fd3 Fix for BUG#7331.
The problem was that when a QUICK_SELECT access method is chosen,
test_if_skip_sort_order() discovered that the index being used
by the quick select will not deliver tuples in sorted order.
In this case test_if_skip_sort_order() tried to change the index
used by the quick select, but it didn't properly set the other
members of the quick select, and especially the range flags of
the ranges in QUICK_SELECT::ranges.

The fix re-invokes the function SQL_SELECT::test_quick_select
to correctly create a valid QUICK_SELECT object.


mysql-test/r/order_by.result:
  Added test results.
mysql-test/t/order_by.test:
  Added test for BUG#7331.
sql/sql_select.cc:
  Fix for BUG#7331.
2005-01-06 10:49:26 +02:00