Commit graph

6804 commits

Author SHA1 Message Date
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
280145686e 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 16:26:06 +02:00
unknown
7ccf6b75d8 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-01-17 18:15:21 +04:00
unknown
4b75a129fc New scan() function in CHARSET_INFO structure (not used yet) 2003-01-17 18:14:54 +04:00
unknown
d26a7d483c Fixed bug with the --slow-log when logging an administrator command
(like FLUSH TABLES).
(Code is already in 4.0)


sql/log.cc:
  Fixed bug with the --slow-log when logging an administrator command
  (like FLUSH TABLES).
2003-01-17 15:56:16 +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
380115abd7 page0cur.c:
Fix bug in PAGE_CUR_LE_OR_EXTENDS search


innobase/page/page0cur.c:
  Fix bug in PAGE_CUR_LE_OR_EXTENDS search
2003-01-17 15:26:13 +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
ee0f0a81da Some comments have been added
XXX10_to_str were not inizialized
2003-01-17 16:25:10 +04:00
unknown
ecdbdeddad Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2003-01-17 14:23:48 +02:00
unknown
67aede0163 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-17 14:09:44 +02:00
unknown
4dd2eb198f After merge fix
BitKeeper/etc/ignore:
  added extra/mysql_waitpid
2003-01-17 13:57:15 +02:00
unknown
723e70ebb7 Fixed typo 2003-01-17 13:52:23 +02:00
unknown
92d93cae72 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-17 12:48:47 +01:00
unknown
22b693d80b bugfix for MERGE tables and MAX(key) 2003-01-17 12:48:23 +01:00
unknown
f9d5ae0435 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-17 02:51:34 -08:00
unknown
e6c2ca3131 Use always base "10" to remove base guesser in strntoul() implementation
strings/ctype-simple.c:
  Hide unused code
strings/ctype-utf8.c:
  Hide unused code
2003-01-17 13:17:22 +04:00
unknown
57ab67de6b ctype-utf8.c:
Workaround for platforms which don't support EILSEQ


strings/ctype-utf8.c:
  Workaround for platforms which don't support EILSEQ
2003-01-17 12:35:47 +04:00
unknown
6878f548ca Merge miguel@work.mysql.com:/home/bk/mysql-4.0
into hegel.local:/home/miguel/dev/mysql-4.0
2003-01-16 22:31:54 -04:00
unknown
f20d079b47 Fix VC++ error compiler 2003-01-16 22:29:24 -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
a6e8464b38 Implement store_result (read_binary_rows & mysql_stmt_store_result) 2003-01-16 15:00:22 -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
0ae9e6e8dd ha_innodb.cc:
Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST


sql/ha_innodb.cc:
  Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST
2003-01-17 00:50:27 +02:00
unknown
90b2534f8f Merge with 3.23
innobase/btr/btr0btr.c:
  Auto merged
ltconfig:
  Auto merged
innobase/include/btr0btr.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
man/isamlog.1:
  Auto merged
man/mysql.1:
  Auto merged
man/mysql_zap.1:
  Auto merged
man/isamchk.1:
  Auto merged
man/mysqlaccess.1:
  Auto merged
man/mysqladmin.1:
  Auto merged
man/mysqld_multi.1:
  Auto merged
man/mysqld.1:
  Auto merged
man/mysqld_safe.1:
  Auto merged
man/mysqldump.1:
  Auto merged
man/mysqlshow.1:
  Auto merged
man/replace.1:
  Auto merged
myisam/mi_unique.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
man/perror.1:
  Auto merged
Makefile.am:
  merge with 3.23
client/mysqltest.c:
  merge with 3.23
innobase/btr/btr0pcur.c:
  merge with 3.23 (use local file)
innobase/row/row0purge.c:
  merge with 3.23 (use local file)
scripts/mysql_fix_privilege_tables.sh:
  Merge with 3.23 (Apply debian patches)
sql/ha_innodb.cc:
  merge with 3.23 (use local file)
sql/mysqld.cc:
  Merge with 3.23 (use local file)
sql/net_serv.cc:
  Merge with 3.23 (use local file)
sql/sql_db.cc:
  Merge with 3.23 (use local file)
2003-01-16 20:47:46 +02:00
unknown
3d00544c0f Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2003-01-16 20:12:00 +02:00
unknown
3531347e8c lock0lock.c:
Fix a bug in the query cache algorithm for the AUTOCOMMIT=0 case


innobase/lock/lock0lock.c:
  Fix a bug in the query cache algorithm for the AUTOCOMMIT=0 case
2003-01-16 18:35:04 +02:00
unknown
4bd6c3564f strnto family functions now return error in a new argument 2003-01-16 17:17:07 +04:00
unknown
ef3091541e bugfix for 'ANALYZE for MERGE' and table-less MERGE table
mysql-test/r/merge.result:
  test added
mysql-test/t/merge.test:
  test added
2003-01-16 13:23:33 +01: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
cc014ceba8 ha_innodb.cc:
Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle


sql/ha_innodb.cc:
  Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle
2003-01-16 08:06:43 +02:00
unknown
574ac5d3f0 ha_innodb.cc:
Make SHOW INNODB STATUS aware when we are estimating index range size etc.


sql/ha_innodb.cc:
  Make SHOW INNODB STATUS aware when we are estimating index range size etc.
2003-01-16 07:15:55 +02: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
cb460d38cc btr0btr.h, btr0btr.c, row0purge.c:
Backport from 4.0: fix the BLOB hang if the index tree is of height 1


innobase/row/row0purge.c:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
innobase/btr/btr0btr.c:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
innobase/include/btr0btr.h:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
2003-01-16 01:21:13 +02:00
unknown
b96140fe3a ha_innobase.cc:
Backport from 4.0: fix possible adaprive hash index latch hang


sql/ha_innobase.cc:
  Backport from 4.0: fix possible adaprive hash index latch hang
2003-01-16 01:13:50 +02:00
unknown
ab44cbcaf9 ha_innodb.cc:
Fix a typo


sql/ha_innodb.cc:
  Fix a typo
2003-01-16 01:07:08 +02:00
unknown
dd11eadca3 ha_innodb.cc:
Fix a possible hang at the adaptive hash index latch if MySQL does query estimations also in the middle of a SELECT statement processing


sql/ha_innodb.cc:
  Fix a possible hang at the adaptive hash index latch if MySQL does query estimations also in the middle of a SELECT statement processing
2003-01-16 00:44:27 +02:00
unknown
fb01635389 srv0srv.c:
Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded


innobase/srv/srv0srv.c:
  Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded
2003-01-15 22:48:02 +02:00
unknown
2e5c24d09e trx0trx.c:
Print also the thread ids in SHOW INNODB STATUS also in Linux


innobase/trx/trx0trx.c:
  Print also the thread ids in SHOW INNODB STATUS also in Linux
2003-01-15 21:26:45 +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
f2bff1dae9 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2003-01-15 16:00:43 +02:00
unknown
150a238f03 resolving conflicts
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/log_event.cc:
  Conflicts resolving
sql/log_event.h:
  conflicts
sql/mysqld.cc:
  conflicts
sql/opt_range.cc:
  conflicts
sql/protocol.cc:
  conflicts
sql/sql_show.cc:
  conflicts
2003-01-15 13:15:35 +04:00
unknown
09b79b65f2 SCRUM
embedded library trimming


include/my_global.h:
  HAVE_REPLICATION & HAVE_EXTERNAL_CLIENT macro definitions
libmysqld/lib_sql.cc:
  Protocol:: methods implementation for embedded case
sql/field.cc:
  geometry type methods implementations
sql/ha_berkeley.cc:
  set_nfields deletion
sql/ha_innodb.cc:
  macro changed
sql/ha_myisam.cc:
  set_nfields deletion
sql/ha_myisam.h:
  code #ifdef-ed
sql/item.cc:
  bugfix
sql/item_func.cc:
  macro changed
sql/item_strfunc.cc:
  superfluous code deleted
sql/log.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/log_event.cc:
  #ifdef constructions changed
sql/log_event.h:
  #ifdef-s changed
sql/mf_iocache.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/mini_client.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/mysql_priv.h:
  code removation
sql/mysqld.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/opt_range.cc:
  code trimming
sql/protocol.cc:
  net_store_data becomes a member of Protocol
sql/protocol.h:
  changes to make Protocol working in embedded library
sql/repl_failsafe.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/repl_failsafe.h:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/set_var.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/slave.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/slave.h:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_parse.cc:
  code trimming
sql/sql_prepare.cc:
  comment added
sql/sql_repl.cc:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_repl.h:
  HAVE_REPLICATION instead of EMBEDDED_LIBRARY
sql/sql_show.cc:
  mysql_list_processes to work in embedded library
sql/sql_table.cc:
  set_nfields deletion
2003-01-15 12:11:44 +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