Commit graph

10396 commits

Author SHA1 Message Date
unknown
8af0acea6f Fixed parenthesis needed by valgrind-max. 2003-12-16 16:03:39 +02:00
unknown
029e30b4aa Missed header added
heap/hp_hash.c:
  header added
2003-12-16 16:36:12 +04:00
unknown
2c2c409afb Some minor code clean up. 2003-12-16 11:44:22 +02:00
unknown
3467862b32 Added support for multi statement tests. Use mysqltest internal
command delimiter to change the default delimiter (;) to something
else, a string upto 16 characters is allowed. Separate the sub
queries with ';' and end the whole statement with your own delimiter.
2003-12-16 06:09:44 +02:00
unknown
caf4fd96f2 Cleanup
client/mysqltest.c:
  Remove not needed include files
2003-12-16 02:23:40 +02:00
unknown
52a3910511 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-15 23:18:40 +01:00
unknown
c3617bb88c Updated results 2003-12-15 18:10:46 +01:00
unknown
987d8ff9a3 part one of the fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
mysql-test/r/type_enum.result:
  test for the bug #2077: accented characters in enum/defaul values are reported incorrectly
mysql-test/t/type_enum.test:
  test for the bug #2077: accented characters in enum/defaul values are reported incorrectly
2003-12-15 21:01:38 +04:00
unknown
082953ec76 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
2003-12-15 18:02:29 +02:00
unknown
9000046c22 Added missing timeout function for named pipes and shared memory (fixes core dump on windows)
Signed auto_increment keys for HASH tables (like for MyISAM tables in 4.0)
nitialize system_charset_info() early. Fixes core dump when starting windows service


heap/hp_hash.c:
  Signed auto_increment keys for HASH tables (like for MyISAM tables in 4.0)
mysql-test/r/create.result:
  More test for type returned by if_null()
mysql-test/t/create.test:
  More test for type returned by if_null()
sql/field.h:
  Remove not needed functions
sql/item.cc:
  Use normal field create function instead of special functions just made for tmp_table_field_from_field_type
sql/mysqld.cc:
  Initialize system_charset_info() early. Fixes core dump when starting windows service
vio/vio.c:
  Added missing timeouts for named pipes and shared memory (fixes core dump on windows)
vio/vio_priv.h:
  Added missing timeout function for named pipes and shared memory (fixes core dump on windows)
vio/viosocket.c:
  Added missing timeout function for named pipes and shared memory (fixes core dump on windows)
2003-12-15 17:58:15 +02:00
unknown
4d52808bb3 Translation update 2003-12-13 18:00:15 -04:00
unknown
85dab63936 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-13 18:49:45 +01:00
unknown
bc1b68f0d8 insert table select * from table2 now converts charsets correctly 2003-12-13 18:49:10 +01:00
unknown
85a4e83e9a Already approved bug fix for #1561.
Bug happens in INTERVAL function when number of compared arguments
is 8 or more.
2003-12-13 17:20:35 +02:00
unknown
f953acea92 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-12 19:43:52 +01:00
unknown
18ebd63440 Bug#2075 - fix reduce/reduce
sql/sql_yacc.yy:
  Fix reduce/reduce introduced when fixing Bug#2075
2003-12-11 16:05:51 +00:00
unknown
5fb80a0439 mysqldump version updated 2003-12-11 12:02:26 +01:00
unknown
8086aa3542 Fix for Bug #2075 - negative default values not accepted for integer columns
Allow numeric literals have a sign


sql/sql_yacc.yy:
  Bug#2075 - Numeric literals need to handle sign.
mysql-test/r/create.result:
  New test for Bug #2075
mysql-test/t/create.test:
  New test for Bug #2075
2003-12-11 00:28:25 +00:00
unknown
4de973336f changed usc2 -> koi8r to don't depend on extra-charset option. 2003-12-10 15:27:33 +04:00
unknown
80ec807976 WorkLog#1323
Deprecate the use of TYPE=... Preferred syntax is ENGINE=


include/mysqld_error.h:
  New warning for deprecated syntax
sql/lex.h:
  Introduce ENGINE keyword
  Sort order of symbols
sql/share/czech/errmsg.txt:
  New warning for deprecated syntax
sql/share/danish/errmsg.txt:
  New warning for deprecated syntax
sql/share/dutch/errmsg.txt:
  New warning for deprecated syntax
sql/share/english/errmsg.txt:
  New warning for deprecated syntax
sql/share/estonian/errmsg.txt:
  New warning for deprecated syntax
sql/share/french/errmsg.txt:
  New warning for deprecated syntax
sql/share/german/errmsg.txt:
  New warning for deprecated syntax
sql/share/greek/errmsg.txt:
  New warning for deprecated syntax
sql/share/hungarian/errmsg.txt:
  New warning for deprecated syntax
sql/share/italian/errmsg.txt:
  New warning for deprecated syntax
sql/share/japanese/errmsg.txt:
  New warning for deprecated syntax
sql/share/korean/errmsg.txt:
  New warning for deprecated syntax
sql/share/norwegian-ny/errmsg.txt:
  New warning for deprecated syntax
sql/share/norwegian/errmsg.txt:
  New warning for deprecated syntax
sql/share/polish/errmsg.txt:
  New warning for deprecated syntax
sql/share/portuguese/errmsg.txt:
  New warning for deprecated syntax
sql/share/romanian/errmsg.txt:
  New warning for deprecated syntax
sql/share/russian/errmsg.txt:
  New warning for deprecated syntax
sql/share/serbian/errmsg.txt:
  New warning for deprecated syntax
sql/share/slovak/errmsg.txt:
  New warning for deprecated syntax
sql/share/spanish/errmsg.txt:
  New warning for deprecated syntax
sql/share/swedish/errmsg.txt:
  New warning for deprecated syntax
sql/share/ukrainian/errmsg.txt:
  New warning for deprecated syntax
sql/sql_show.cc:
  Change TYPE= with ENGINE=
sql/sql_yacc.yy:
  Introduce ENGINE keyword,
  Deprecate TYPE= syntax,
  Introduce SHOW ENGINE syntax,
  Deprecate SHOW INNODB/BDB syntax.
mysql-test/r/alias.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/alter_table.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/auto_increment.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/bdb-alter-table-1.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/bdb-crash.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/bdb-deadlock.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/bdb.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/bdb_cache.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/case.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/cast.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/constraints.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/create.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/ctype_collate.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/ctype_latin1_de.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/ctype_many.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/ctype_mb.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/ctype_recoding.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/ctype_ucs.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/delete.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/distinct.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/fulltext.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/fulltext2.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/fulltext_distinct.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/fulltext_left_join.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/func_compress.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/func_date_add.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/func_group.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/func_if.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/func_str.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/func_system.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/func_test.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/func_time.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/gis-rtree.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/group_by.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/handler.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/heap.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/heap_auto_increment.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/heap_btree.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/heap_hash.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/help.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/innodb-deadlock.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/innodb.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/innodb_cache.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/innodb_handler.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/insert_select.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/isam.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/join.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/join_crash.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/join_outer.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/key.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/lock.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/lock_tables_lost_commit.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/merge.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/mix_innodb_myisam_binlog.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/multi_update.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/myisam.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/null.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/null_key.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/order_by.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/query_cache.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/range.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/repair_part1.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/replace.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/rollback.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/rpl000006.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/rpl_flush_tables.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/rpl_insert_id.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/rpl_relayrotate.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/select.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/select_found.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/show_check.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/sql_mode.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/status.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/subselect.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/subselect2.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/subselect_innodb.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/symlink.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/temp_table.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/type_blob.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/type_datetime.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/type_enum.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/type_nchar.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/type_set.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/union.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/update.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/r/warnings.result:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/alias.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/alter_table.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/auto_increment.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/bdb-alter-table-1.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/bdb-crash.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/bdb-deadlock.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/bdb.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/bdb_cache.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/create.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/ctype_ucs.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/delete.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/distinct.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/fulltext.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/fulltext2.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/fulltext_distinct.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/fulltext_left_join.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/func_compress.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/func_date_add.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/func_group.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/func_if.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/func_str.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/func_test.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/func_time.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/gis-rtree.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/group_by.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/handler.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/heap.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/heap_auto_increment.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/heap_btree.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/heap_hash.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/help.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/innodb-deadlock.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/innodb.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/innodb_cache.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/innodb_handler.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/insert_select.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/isam.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/join.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/join_crash.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/join_outer.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/key.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/lock.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/lock_tables_lost_commit.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/merge.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/mix_innodb_myisam_binlog.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/multi_update.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/myisam.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/null.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/null_key.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/order_by.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/outfile.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/query_cache.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/query_cache_merge.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/range.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/repair_part1.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/replace.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/rollback.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/rpl000006.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/rpl_flush_tables.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/rpl_insert_id.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/rpl_relayrotate.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/select.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/select_found.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/show_check.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/sql_mode.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/status.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/subselect.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/subselect2.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/subselect_innodb.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/symlink.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/temp_table.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/type_datetime.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/type_set.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/union.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/update.test:
  Change occurances of TYPE= to ENGINE=
mysql-test/t/warnings.test:
  Change occurances of TYPE= to ENGINE=
  New test for deprecated syntax
2003-12-10 04:31:42 +00:00
unknown
b6df8bb66a key_cache.result, key_cache.test, mf_keycache.c:
Fixed a wrong return code by the function init_key_cache.


mysys/mf_keycache.c:
  Fixed a wrong return code by the function init_key_cache.
mysql-test/t/key_cache.test:
  Fixed a wrong return code by the function init_key_cache.
mysql-test/r/key_cache.result:
  Fixed a wrong return code by the function init_key_cache.
2003-12-09 13:29:38 -08:00
unknown
9388c41953 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b1994
2003-12-09 22:00:33 +04:00
unknown
e0daf11201 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1688/mysql-4.1
2003-12-09 14:00:32 -04:00
unknown
32441953a7 Merge
mysql-test/t/create.test:
  Auto merged
mysql-test/r/create.result:
  SCCS merged
sql/sql_select.cc:
  SCCS merged
2003-12-09 13:34:57 -04:00
unknown
56ea8bfd84 Fix for the bug #1994: mysqldump does not correctly dump UCS2 data. 2003-12-09 15:28:58 +04:00
unknown
ee89f1d340 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-09 11:58:21 +02:00
unknown
adc470c290 Fixed two packaging bugs:
- postinstall of the Mac OS X PKG failed as a parameter for 
   mysql_install_db was changed for MySQL 4.1
 - postinstall of the Server RPM failed as mysql_create_system_tables was
   missing from the file list


support-files/MacOSX/postinstall.sh:
   - Fix parameter for mysql_install_db (it was changed from -IN-RPM to --rpm
     in the 4.1 tree)
support-files/mysql.spec.sh:
   - Added missing file mysql_create_system_tables to the server subpackage
2003-12-08 14:38:29 +01:00
unknown
6c0a24553e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-08 13:31:40 +03:00
unknown
f6f9b3496a commented why valgrind barks at the bug #1500 2003-12-08 13:30:14 +03:00
unknown
43b42ceee1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
2003-12-08 12:26:10 +02:00
unknown
e505696ffc Portability fixes for Windows
VC++Files/client/mysqlclient.dsp:
  Update for windows
VC++Files/libmysql/libmysql.dsp:
  Update for windows
VC++Files/strings/strings.dsp:
  Update for windows
libmysqld/lib_sql.cc:
  Update for windows
scripts/make_win_src_distribution.sh:
  Update for windows
scripts/mysql_install_db.sh:
  Update for windows
sql/mysqld.cc:
  Remove not used variable
sql/set_var.cc:
  Indentation cleanups
sql/share/czech/errmsg.txt:
  Fixed wrong delimiters
sql/share/danish/errmsg.txt:
  Fixed wrong delimiters
sql/share/dutch/errmsg.txt:
  Fixed wrong delimiters
sql/share/english/errmsg.txt:
  Fixed wrong delimiters
sql/share/estonian/errmsg.txt:
  Fixed wrong delimiters
sql/share/french/errmsg.txt:
  Fixed wrong delimiters
sql/share/greek/errmsg.txt:
  Fixed wrong delimiters
sql/share/hungarian/errmsg.txt:
  Fixed wrong delimiters
sql/share/italian/errmsg.txt:
  Fixed wrong delimiters
sql/share/japanese/errmsg.txt:
  Fixed wrong delimiters
sql/share/korean/errmsg.txt:
  Fixed wrong delimiters
sql/share/norwegian-ny/errmsg.txt:
  Fixed wrong delimiters
sql/share/norwegian/errmsg.txt:
  Fixed wrong delimiters
sql/share/polish/errmsg.txt:
  Fixed wrong delimiters
sql/share/portuguese/errmsg.txt:
  Fixed wrong delimiters
sql/share/romanian/errmsg.txt:
  Fixed wrong delimiters
sql/share/russian/errmsg.txt:
  Fixed wrong delimiters
sql/share/serbian/errmsg.txt:
  Fixed wrong delimiters
sql/share/slovak/errmsg.txt:
  Fixed wrong delimiters
sql/share/spanish/errmsg.txt:
  Fixed wrong delimiters
sql/share/swedish/errmsg.txt:
  Fixed wrong delimiters
sql/share/ukrainian/errmsg.txt:
  Fixed wrong delimiters
sql/sql_acl.cc:
  Removed compiler warnings
strings/ctype-big5.c:
  Removed compiler warnings (VC++)
strings/ctype-euc_kr.c:
  Removed compiler warnings (VC++)
strings/ctype-gb2312.c:
  Removed compiler warnings (VC++)
strings/ctype-gbk.c:
  Removed compiler warnings (VC++)
strings/ctype-sjis.c:
  Removed compiler warnings (VC++)
strings/ctype-ucs2.c:
  Removed compiler warnings (VC++)
strings/ctype-ujis.c:
  Removed compiler warnings (VC++)
2003-12-08 12:25:37 +02:00
unknown
8bf9ccb627 Fixed test for 'init_slave' variable 2003-12-08 12:10:30 +04:00
unknown
c335939203 post-merge fixes
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
2003-12-08 09:44:04 +04:00
unknown
a0e4a6de56 Task ID 499:Add a new settable string variable(init_connect, init_slave)
to mysqld that is executed for all new connections.
(Similar to the client command: mysql_options(... MYSQL_INIT_COMMAND ...).


sql/mysql_priv.h:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/mysqld.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/protocol.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/set_var.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/slave.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/sql_class.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/sql_class.h:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/sql_parse.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/sql_show.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
2003-12-08 09:13:14 +04:00
unknown
0ff62350f6 let chk_index() understand 2-level fulltext index format
sql/sql_table.cc:
  typo fixed
2003-12-07 20:36:45 +01:00
unknown
f3bf35ec03 QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status
mysql-test/r/union.result:
  union and slow log tests
mysql-test/t/union.test:
  union and slow log tests
2003-12-06 23:21:09 +01:00
unknown
afbeb64e93 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-06 19:05:57 +01:00
unknown
2e82008bac fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
(isn't it obvious ?)


mysys/charset.c:
  all charsets support my_mbcharlen - no need to protect it with use_mb()
sql/sql_load.cc:
  all charsets support my_mbcharlen - no need to protect it with use_mb()
2003-12-06 19:05:26 +01:00
unknown
07de836b44 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into mysql.com:/home/kostja/mysql/mysql-4.1-max_prep_stmt_count


sql/mysqld.cc:
  Auto merged
2003-12-05 02:00:54 +03:00
unknown
997c4550f3 unused variable max_prep_stmt_count removed 2003-12-05 01:55:57 +03:00
unknown
c135ce0255 test result fixed 2003-12-04 23:18:04 +01:00
unknown
cf45aa2b11 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-04 22:07:04 +01:00
unknown
b66c016f13 make a clear distinction between max_word_length in *characters* and in *bytes* 2003-12-04 21:58:28 +01:00
unknown
580d754da6 Fixup error number - Broke during merge
mysql-test/t/create.test:
  Fixup error number
mysql-test/t/variables.test:
  Fixup error number
2003-12-04 18:09:36 +00:00
unknown
cebe1c0eee Merge gweir@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/bk/mysql-4.1
2003-12-04 11:54:53 -05:00
unknown
d535144e78 Add charset #defines for Windows platform (as of 4.1.1)
include/config-win.h:
  Add HAVE_CHARSET_* defines for Windows
2003-12-04 11:54:04 -05:00
unknown
270b72ff4f comment to user-level lock added 2003-12-04 19:12:01 +03:00
unknown
2e939d77df - Bumped up version number in configure.in 4.1.1-alpha -> 4.1.2-alpha
- tagged ChangeSet 1.1641 as "mysql-4.1.1"


BitKeeper/etc/ignore:
  Added INSTALL-WIN-SOURCE to the ignore list
configure.in:
   - Bumped up version number: 4.1.1-alpha -> 4.1.2-alpha
2003-12-04 15:20:44 +01:00
unknown
a7990d0245 README:
minor edits


sql-bench/README:
  minor edits
2003-12-03 21:10:44 -06:00
unknown
60cf79a22e Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2003-12-03 11:51:57 -06:00