Commit graph

2910 commits

Author SHA1 Message Date
unknown
2680ea948d Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-ctype-4.1
2003-01-17 20:49:47 +02:00
unknown
025cf7e497 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear
2003-01-17 22:49:46 +04:00
unknown
f948f2ad7e Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear


sql/log_event.cc:
  Auto merged
2003-01-17 22:04:43 +04:00
unknown
f707100a09 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear


sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
2003-01-17 21:59:03 +04:00
unknown
b27c8cc15b new option --local-load in mysqlbinlog
client/mysqlbinlog.cc:
  new option --local-load
sql/log_event.cc:
  converting 'load' to 'local load'
sql/log_event.h:
  converting 'load' to 'local load'
2003-01-17 21:52:56 +04:00
unknown
db5a7a836d merge
strings/ctype-utf8.c:
  Auto merged
strings/ctype-simple.c:
  merge
  Change '#if 0' to '#ifdef NOT_USED'
2003-01-17 16:45:17 +02:00
unknown
4655f1d4b4 Changed my_strntoxxx functions to clear error number on start
Allow one to change ANSI_QUOTES mode per thread and on the fly


sql/field.cc:
  Use new my_strntoxxx functions where function clears errno.
  Change variable names to 'not_used' for variables that is not used in function
sql/sql_base.cc:
  comment
sql/sql_lex.cc:
  Allow one to change ANSI_QUOTES mode per thread and on the fly
sql/sql_lex.h:
  Allow one to change ANSI_QUOTES mode per thread and on the fly
strings/ctype-simple.c:
  Changed my_strntoxxx functions to clear error number on start
  Changed my_strtod() to correctly set return error number
strings/ctype-utf8.c:
  Changed my_strntoxxx functions to clear error number on start
  Changed my_strtod() to correctly set return error number
2003-01-17 16:33:54 +02:00
unknown
1c9159b633 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-ctype-4.1
2003-01-17 15:43:39 +02:00
unknown
ac814246a4 using internal name conversion in query cache as it was suggested by Shurik
sql/sql_cache.cc:
  using internal name conversion as it was suggested by Shurik
2003-01-17 15:36:08 +02:00
unknown
ee49ffd563 Merge sgluhov@work.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.upd


sql/log_event.cc:
  Auto merged
2003-01-17 16:40:54 +04:00
unknown
b66cf8516e Replication: Optimize away string.append
Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
Fixed rpl_temporary test


mysql-test/r/rpl_temporary.result:
  Fixed rpl_temporary test
mysql-test/t/rpl_temporary.test:
  Fixed rpl_temporary test
sql/log_event.cc:
  Replication: Optimize away string.append
  Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-01-17 16:39:29 +04:00
unknown
423a7640fd Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1


libmysql/libmysql.c:
  Auto merged
2003-01-16 15:47:46 -08:00
unknown
d83bd16a65 Remove un-used code
sql/sql_prepare.cc:
  Remove uun-used code
2003-01-16 14:57:49 -08:00
unknown
4bd6c3564f strnto family functions now return error in a new argument 2003-01-16 17:17:07 +04:00
unknown
df1a1075dd field.cc:
strnxfrm for binary and simple charsets


sql/field.cc:
  strnxfrm for binary and simple charsets
2003-01-16 15:52:37 +04:00
unknown
80d2517412 strnxfrm() for simple and binary charsets fixes 2003-01-16 15:20:38 +04:00
unknown
3604aa00a3 Added --compatible mode to mysqldump.
client/mysqldump.c:
  Added --compatible mode to mysqldump. This mode can take the following
  values: mysql323,mysql40,postgresql,oracle,mssql,db2,sapdb,no_key_options,
  no_table_options,no_field_options.
  
  The table definition (SHOW CREATE TABLE name) will be compatible with
  the given mode.
mysql-test/r/sql_mode.result:
  Fixed a bug in sql_show.cc, which affected the result.
sql/sql_show.cc:
  Fixed a bug.
2003-01-16 05:35:59 +02:00
unknown
d08e02ebe1 Added support sql_mode, which can be used to produce various outputs
of SHOW CREATE TABLE 'name'. Depending on the mode, the output can
be compatible with various databases, including earlier versions of
MySQL
.


sql/field.cc:
  Added support for sql_mode.
  
  Changed find_set() to be aware of possible error. If the argument
  contains a value that is not legal in the set, err_pos and err_len
  are set.
sql/field.h:
  Added support for sql_mode.
  
  Changed find_set() to be aware of possible error. If the argument
  contains a value that is not legal in the set, err_pos and err_len
  are set.
sql/item_func.cc:
  Added support for sql_mode.
sql/mysql_priv.h:
  Some new sql modes.
sql/mysqld.cc:
  Added support for sql mode, including some new modes.
sql/set_var.cc:
  Added support for sql_mode.
  
  Added function that can be used to check values in a set.
sql/set_var.h:
  Added support for sql_mode.
  
  Added function that can be used to check values in a set.
sql/sql_class.cc:
  Removed previous usage of opt_sql_mode.
sql/sql_class.h:
  Removed previous usage of opt_sql_mode.
sql/sql_lex.cc:
  Changed previous version of sql_mode to the new noe.
sql/sql_parse.cc:
  Changed previous version of sql_mode to the new noe.
sql/sql_select.cc:
  Changed previous version of sql_mode to the new noe.
sql/sql_show.cc:
  Added support for various sql_modes for printing CREATE TABLE.
sql/sql_yacc.yy:
  Changed previous version of sql_mode to the new noe.
2003-01-16 02:04:50 +02:00
unknown
93419d23a3 All charsets now have strnxfrm.
Some function names have been renamed to be more self-descriptive
2003-01-15 18:06:07 +04:00
unknown
2d6f1c223d Merge abelkin@work.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
2003-01-14 19:18:09 +02:00
unknown
742de8f5ff after merging fixing
include/m_string.h:
  added include to va_list bicame known
mysql-test/r/union.result:
  some changing in error message
sql/sql_base.cc:
  error detection moved
sql/sql_lex.cc:
  new flag to detect table name error
sql/sql_lex.h:
  new flag to detect table name error
sql/sql_yacc.yy:
  check possibility of using table name added
2003-01-14 18:00:34 +02:00
unknown
5ce475835c bin chatset now handles strnncoll itself so we don't have to check
if charset is binary anymore
2003-01-14 18:28:50 +04:00
unknown
8b25594897 merge
BitKeeper/etc/ignore:
  added extra/mysql_waitpid
include/m_ctype.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/r/create.result:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2003-01-14 14:33:10 +02:00
unknown
910c125bb6 Updates for multi-byte character sets
(Note: test 'union' fails, but Sanja promised to fix this)


include/m_ctype.h:
  Changed prototype for strntod() to inform the user that source may be modified.
include/m_string.h:
  Moved my_vsnprintf to strings library
include/my_sys.h:
  Moved my_vsnprintf to strings library
libmysql/Makefile.shared:
  Moved my_vsnprintf to strings library
mysql-test/r/alter_table.result:
  Moved my_vsnprintf to strings library
mysql-test/r/create.result:
  Moved my_vsnprintf to strings library
mysql-test/r/ctype_many.result:
  Moved my_vsnprintf to strings library
mysql-test/r/fulltext.result:
  Moved my_vsnprintf to strings library
mysql-test/r/innodb.result:
  Moved my_vsnprintf to strings library
mysql-test/r/merge.result:
  Moved my_vsnprintf to strings library
mysql-test/r/select.result:
  Moved my_vsnprintf to strings library
mysql-test/r/show_check.result:
  Moved my_vsnprintf to strings library
mysql-test/r/type_blob.result:
  Moved my_vsnprintf to strings library
mysql-test/r/type_enum.result:
  Moved my_vsnprintf to strings library
mysql-test/r/type_ranges.result:
  Moved my_vsnprintf to strings library
mysql-test/r/type_set.result:
  Moved my_vsnprintf to strings library
mysys/Makefile.am:
  Moved my_vsnprintf to strings library
sql/field.cc:
  Fixed for character set handling
sql/field.h:
  Fixed for character set handling
sql/item.cc:
  Fixed for character set handling
sql/item.h:
  Fixed for character set handling
sql/item_func.cc:
  Fixed for character set handling
sql/item_func.h:
  Fixed for character set handling
sql/item_strfunc.cc:
  Fixed for character set handling
sql/item_sum.cc:
  Fixed for character set handling
sql/item_sum.h:
  Fixed for character set handling
sql/item_timefunc.cc:
  Fixed for character set handling
sql/mysqld.cc:
  Update to use new test_if_int()
sql/opt_range.cc:
  Fixed for character set handling
sql/procedure.h:
  Fixed for character set handling
sql/sql_class.cc:
  Fixed for character set handling
sql/sql_string.cc:
  Added multi byte support to append.
  Added set_latin1()
sql/sql_string.h:
  Added set_latin1()
sql/sql_update.cc:
  Cosmetic changes
strings/Makefile.am:
  Moved my_vsnprintf to strings library
strings/ctype-simple.c:
  Code review + cleanup
strings/ctype-utf8.c:
  Fixed strntod()
strings/my_vsnprintf.c:
  Added support for %#d and %#u
2003-01-14 14:28:36 +02:00
unknown
aef4ae161a ha_innodb.cc:
Added some assertions to make sure index_init is only called with a properly prepared InnoDB table handle


sql/ha_innodb.cc:
  Added some assertions to make sure index_init is only called with a properly prepared InnoDB table handle
2003-01-13 23:25:55 +02:00
unknown
2b174c6da1 sql_handler.cc:
Fix InnoDB HANDLER: InnoDB must know in each call that the handle is used by HANDLER; the previous implementation worked only by pure luck


sql/sql_handler.cc:
  Fix InnoDB HANDLER: InnoDB must know in each call that the handle is used by HANDLER; the previous implementation worked only by pure luck
2003-01-13 18:20:59 +02:00
unknown
d2503a04ee Fix for spatial objects 2003-01-13 16:36:04 +04:00
unknown
b82f3bbefd ut0mem.c, row0sel.c, row0mysql.c, ut0mem.h, row0sel.h, row0mysql.h:
Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
ha_innodb.cc:
  Do not fetch all columns if change_active_index() is called during a query; a sum(a), max(a) query seemed to do that, doing unnecessary copying (the change actually made in the previous bk ci)
  Free BLOB heap of handle when MySQL calls some ::extra()'s


sql/ha_innodb.cc:
  Do not fetch all columns if change_active_index() is called during a query; a sum(a), max(a) query seemed to do that, doing unnecessary copying (the change actually made in the previous bk ci)
innobase/include/row0mysql.h:
  Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
innobase/include/row0sel.h:
  Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
innobase/include/ut0mem.h:
  Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
innobase/row/row0mysql.c:
  Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
innobase/row/row0sel.c:
  Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
innobase/ut/ut0mem.c:
  Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
2003-01-12 23:58:56 +02:00
unknown
667a81eb27 Fix to make the tables re-inited for every execute call 2003-01-11 00:36:13 -08:00
unknown
6a2fbae677 Remove/change unwanted variables in client protocol
Add missed mysql_stmt_affected_rows()
sql_yacc.yy : Fix the compilation error .. bison 1.75


sql/sql_yacc.yy:
  Fix the compilarion error .. bison 1.75
2003-01-09 17:56:34 -08:00
unknown
91f18f0a26 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
innobase/mem/mem0pool.c:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-09 22:43:23 +02:00
unknown
f7ff1cca14 Post merge fix
Allow empty key list in USE|IGNORE|FORCE INDEX()


mysql-test/r/myisam.result:
  New explain format
mysql-test/t/myisam.test:
  test of index()
mysys/my_handler.c:
  Updated ha_key_cmp() to be as latest _mi_key_cmp() in 4.0
sql/sql_lex.cc:
  Post merge fix
sql/sql_lex.h:
  Post merge fix
sql/sql_parse.cc:
  Post merge fix
sql/sql_yacc.yy:
  Post merge fix for FORCE INDEX ()
  Allow empty key list in USE|IGNORE|FORCE INDEX()
2003-01-09 22:42:31 +02:00
unknown
ac2aea8c4a .del-koi8_u.xml~ec104975f7e009bf:
Delete: sql/share/charsets/koi8_u.xml
.del-koi8_r.xml~f95ebf1fb19f94cf:
  Delete: sql/share/charsets/koi8_r.xml


BitKeeper/deleted/.del-koi8_r.xml~f95ebf1fb19f94cf:
  Delete: sql/share/charsets/koi8_r.xml
BitKeeper/deleted/.del-koi8_u.xml~ec104975f7e009bf:
  Delete: sql/share/charsets/koi8_u.xml
2003-01-09 17:41:25 +04:00
unknown
49fc3a76e0 euc_kr, koi8_r and koi8_u have been renamed so that now
all charset names don't have "_" sign.
2003-01-09 17:39:02 +04:00
unknown
90bf0f9735 koi8u.xml, koi8r.xml:
new file
2003-01-09 17:27:13 +04:00
unknown
5a5c618ee4 do not call get_charset_by_name() with string "DEFAULT" 2003-01-09 16:38:23 +04:00
unknown
6383a27b53 Separating CHARSET and COLLATION terms
mysql-test/r/alter_table.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/create.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/innodb.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/isam.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/select.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/show_check.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_blob.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_float.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_ranges.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
sql/field.cc:
  In field type charset rather than collation name is displayed
sql/sql_db.cc:
  COLLATE clause has been added into SHOW CREATE DATABASE
sql/sql_lex.cc:
  Detect charset names rather than collation names
sql/sql_show.cc:
  COLLATION field has been added into SHOW FIELDS
sql/sql_yacc.yy:
  COLLATE syntax has been added in CREATE TABLE/DATABASE
2003-01-09 15:37:59 +04:00
unknown
9d812016c1 merge with 4.0.9
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys


client/mysqladmin.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/Makefile.am:
  Auto merged
include/my_base.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
sql/lex.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
configure.in:
  merge with 4.0.9
innobase/btr/btr0pcur.c:
  merge with 4.0.9
myisam/mi_check.c:
  merge with 4.0.9
myisam/mi_search.c:
  merge with 4.0.9
mysql-test/t/myisam.test:
  merge with 4.0.9
sql/log_event.cc:
  merge with 4.0.9
sql/mysql_priv.h:
  merge with 4.0.9
sql/sql_lex.h:
  merge with 4.0.9
sql/sql_parse.cc:
  merge with 4.0.9
sql/sql_yacc.yy:
  merge with 4.0.9
2003-01-09 03:55:26 +02:00
unknown
cd2f741d5d Add TYPE as an alias for specifying key type 2003-01-09 03:12:17 +02:00
unknown
b5e37b242e Don't count NULL values in cardinalty for MyISAM tables.
Free row buffer cache after each query for MyISAM tables.
Added table join option FORCE INDEX
Fixed core dump bug when connecting with hostname that could not be resolved.


include/my_base.h:
  Don't count NULL values in cardinalty
myisam/mi_check.c:
  Don't count NULL values in cardinalty
myisam/mi_extra.c:
  Free row buffer cache after each query
myisam/mi_open.c:
  Avoid realloc if cache size doesn't change
myisam/mi_search.c:
  Don't count NULL values in cardinalty
myisam/myisamdef.h:
  Change buffer length from uint to uint32 to make it more portable/predictable
mysql-test/r/myisam.result:
  Test case for cardinality with NULL keys and FORCE INDEX
mysql-test/t/myisam.test:
  Test case for cardinality with NULL keys and FORCE INDEX
sql/lex.h:
  Added table join option FORCE INDEX
sql/mysql_priv.h:
  Added table join option FORCE INDEX
sql/opt_range.cc:
  Added table join option FORCE INDEX
sql/sql_base.cc:
  Added table join option FORCE INDEX
sql/sql_lex.h:
  Added table join option FORCE INDEX
sql/sql_parse.cc:
  Added table join option FORCE INDEX
  Don't use strlen() on hostname without first checking if it's not NULL
sql/sql_select.cc:
  Added table join option FORCE INDEX
sql/sql_yacc.yy:
  Added table join option FORCE INDEX
sql/table.h:
  Added table join option FORCE INDEX
2003-01-09 02:19:14 +02:00
unknown
3f323f46da Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean


sql/item_strfunc.cc:
  Auto merged
2003-01-08 19:43:58 +04:00
unknown
dc5ce03f7f Fix for the bug about point(subselect(...))
sql/item_strfunc.cc:
  null_value-s was indefined here
2003-01-08 19:42:31 +04:00
unknown
3bc97a7f66 Renamed to look in common style 2003-01-08 16:29:31 +04:00
unknown
f94cc9b6e1 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-01-08 13:41:03 +04:00
unknown
8ef72be7ac COLLATE is field attribute not field type 2003-01-08 13:38:11 +04:00
unknown
a3f4a46bf2 merge 2003-01-08 11:27:07 +02:00
unknown
1543bad3e7 Fix for bug in LOAD DATA INFILE and replication
Fix for SHOW VARIABLES in embedded server


Docs/internals.texi:
  Added documentation for join_buffer_size
configure.in:
  Changed version number
sql/log_event.cc:
  Fix for bug in LOAD DATA INFILE
sql/log_event.h:
  Fix for bug in LOAD DATA INFILE
sql/slave.cc:
  Fix for bug in LOAD DATA INFILE
sql/sql_show.cc:
  Fix for SHOW VARIABLES in embedded server
2003-01-08 11:24:39 +02:00
unknown
add72d57f1 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-01-08 11:53:09 +04:00
unknown
02b7a30774 Fix embedded server crash
sql/sql_show.cc:
  fix embedded server crash
2003-01-07 23:46:30 -02:00
unknown
b3b66f6408 Portability fixes
Fixed test suite for HPUX 10.20 and MacOSX


Build-tools/Do-compile:
  Added timeout to mysqladmin shutdown commands
  Kill old running mysqld started by earlier runs
  Removed run time warning from LD_LIBRARY_PATH
client/mysqladmin.c:
  Return 1 if pid file isn't deleted on shutdown.
  Fix error message if pid file is not deleted
client/mysqltest.c:
  Always allow --debug flag
  (Makes it easier to run mysql-test-run)
mysql-test/mysql-test-run.sh:
  A lot of safety fixes. 
  This fixes some problems with test suite for HPUX 10.20 and MacOSX
sql-bench/bench-init.pl.sh:
  Allow tests to change time limit.
sql-bench/crash-me.sh:
  Indentation cleanups
  Added DROP for a created table
sql-bench/test-alter-table.sh:
  Added default time limit
  Changed test to be estimated to get down run time.
  Fixed that add_multi_col is detected
sql-bench/test-insert.sh:
  Comment cleanup
sql/mysql_priv.h:
  Removed not needed prototype.
sql/mysqld.cc:
  Removed DBUG warnings
  Removed default argument for clean_up() and made it static.
  More comments.
  Ignore SIGHUP during shutdown
sql/net_pkg.cc:
  More comments
sql/slave.cc:
  Added DBUG_PRINT messages
2003-01-07 16:53:10 +02:00