1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
fa27ad9025 Fix for a user management system that resources can be reset to zero
with a GRANT statement.
2002-06-25 21:20:10 +03:00
unknown
458c785e1f A fix for small error in displaying db names in SHOW GRANTS 2002-06-25 20:24:15 +03:00
unknown
2a32642d8f post-merge fix 2002-06-24 22:22:23 +02:00
unknown
bb01662406 Merge linux.local:/data/mysql-4.0-root into linux.local:/data/mysql-4.0 2002-06-25 00:22:22 +04:00
unknown
1a64790587 mi_check T_xxx options massaged. T_REP_PARALLEL added
my_getopt-related style changes in myisamchk.c


include/myisam.h:
  mi_check T_xxx options massaged. T_REP_PARALLEL added
myisam/mi_check.c:
  mi_check T_xxx options massaged
myisam/myisamchk.c:
  mi_check T_xxx options massaged
  my_long_option structure reformatted
  s/(argument && \*argument=='0')/(argument == disable_my_option)/
sql/ha_myisam.cc:
  mi_check T_xxx options massaged
2002-06-24 21:21:33 +02:00
unknown
e117107d9c Adding handling of numbers with exponent to decimal type.
mysql-test/r/type_decimal.result:
  Results for More tests
mysql-test/t/type_decimal.test:
  More tests to handle exponent cases
sql/field.cc:
  Handle string with exponent for decimal type
2002-06-24 21:30:54 +04:00
unknown
969919146e Database default charset now works:
CREATE DATABASE dbname DEFAULT CHARACTERSET=latin1


sql/sql_class.cc:
  Database default charset
sql/sql_class.h:
  Database default charset
sql/sql_db.cc:
  Database default charset
sql/sql_table.cc:
  Database default charset
BitKeeper/etc/ignore:
  Added tests/client_test to the ignore list
2002-06-24 21:50:08 +05:00
unknown
38ffd49a8b slave.cc:
Slave thread is always in an auto-commit state: remove unnecessary tests when we flush master info


sql/slave.cc:
  Slave thread is always in an auto-commit state: remove unnecessary tests when we flush master info
2002-06-23 00:35:36 +03:00
unknown
eed135a94f Compiler warning with unreferenced local variable
sql/slave.cc:
  Removed not used local variable
2002-06-22 17:55:33 -03:00
unknown
b7b988b3c3 ha_innobase.cc:
Use current_thd to check if a transaction is done by a slave thread


sql/ha_innobase.cc:
  Use current_thd to check if a transaction is done by a slave thread
2002-06-22 20:33:48 +03:00
unknown
562faa29e2 sql_yacc.yy, mysql_priv.h, lex.h:
Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1


sql/lex.h:
  Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1
sql/mysql_priv.h:
  Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1
sql/sql_yacc.yy:
  Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1
2002-06-22 20:23:53 +03:00
unknown
c9faa802b2 mysqld.cc:
Add option innodb_flush_log_at_trx_commit=2 which means we always write the log to file at commit, but only do fsync about once per second


sql/mysqld.cc:
  Add option innodb_flush_log_at_trx_commit=2 which means we always write the log to file at commit, but only do fsync about once per second
2002-06-22 20:17:58 +03:00
unknown
7510893e70 ha_innobase.cc:
Merge 3.23.52


sql/ha_innobase.cc:
  Merge 3.23.52
2002-06-22 20:11:01 +03:00
unknown
4237b04189 log.cc, handler.cc:
Add BEGIN andd COMMIT around transactions in the binlog


sql/handler.cc:
  Add BEGIN andd COMMIT around transactions in the binlog
sql/log.cc:
  Add BEGIN andd COMMIT around transactions in the binlog
2002-06-22 20:05:30 +03:00
unknown
23dbcb0fa4 slave.h, slave.cc:
Do not flush the position to master.info file if we have a transaction open


sql/slave.cc:
  Do not flush the position to master.info file if we have a transaction open
sql/slave.h:
  Do not flush the position to master.info file if we have a transaction open
2002-06-22 20:00:32 +03:00
unknown
f8360c99e7 Minor compilation fix
sql/item_strfunc.cc:
  Fix type name typo
2002-06-22 11:44:46 +04:00
unknown
000828e011 database default character set is now stored in database directory 2002-06-21 16:55:55 +05:00
unknown
17b4e3ed96 Fixed charset problem on UPDATE in non-default-charset field 2002-06-21 14:46:50 +05:00
unknown
f7322a3cbd New CHARSET() function 2002-06-20 23:26:04 +05:00
unknown
2583ecd642 SELECT left(non_default_charset_field,n) GROUP BY 1
now works more correctly. Still needs fixes.
2002-06-20 22:52:56 +05:00
unknown
2753972c39 New syntax for string with charset: _latin1'string'
Remove dupicated code


sql/sql_lex.cc:
  new UNDERSCORE_CHARSET language item
2002-06-20 18:47:55 +05:00
unknown
a57e2220ba Some bugs that user has properly recognized in user management
system.
2002-06-20 16:46:25 +03:00
unknown
950df73713 Fixed some bugs after last merge
Added semaphore support to MIT-pthreads.


Docs/manual.texi:
  Updated benchmark data
configure.in:
  Portability fix for compiling MIT-pthreads with gcc 3.0.x
  (Still not perfect)
include/my_semaphore.h:
  Cleanup
mit-pthreads/Changes-mysql:
  Added semaphore support
mit-pthreads/include/Makefile.inc:
  Added semaphore support
mit-pthreads/include/pthread/ac-types.h:
  Added semaphore support
mit-pthreads/pthreads/GNUmakefile.inc:
  Added semaphore support
mit-pthreads/pthreads/Makefile.inc:
  Added semaphore support
mit-pthreads/stdio/xprintf.c:
  Added semaphore support
mysql-test/r/rpl_alter.result:
  Fixed test results after merge with 3.23
sql/ha_isam.cc:
  Fixed core dump after merge
sql/ha_isam.h:
  Fixed core dump after merge
sql/mini_client.cc:
  P
2002-06-20 15:25:02 +03:00
unknown
97b919485a Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2002-06-20 14:13:13 +05:00
unknown
78c4d8390a Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select_lex-4.1


sql/sql_yacc.yy:
  Auto merged
2002-06-19 20:05:50 +03:00
unknown
83dfb9f885 Now it is possible to drop default charset from table:
ALTER TABLE a CHARSET=DEFAULT
2002-06-19 21:48:34 +05:00
unknown
e38f8e8ce2 Default table character set has been added:
CREATE TABLE a (field,...) TYPE=type CHARSET=cset;


sql/handler.h:
  New flag to remember whether new table default charset 
  has been passed in ALTER TABLE
sql/lex.h:
  New language symbol
sql/sql_show.cc:
  Display default table charset if exists
sql/sql_table.cc:
  Check table charset before default server charset
sql/sql_yacc.yy:
  New create table option: default table character set
sql/table.cc:
  Table charset
sql/unireg.cc:
  field->charset must be initialized before. So assumes it is not NULL
2002-06-19 21:21:30 +05:00
unknown
6e04a0c885 merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2002-06-19 17:55:51 +03:00
unknown
c6a2ae17a0 EXISTS type of subselect
more correct parameters in result creation script


mysql-test/create-test-result:
  more correct parameters in result creation script
mysql-test/r/subselect.result:
  test of EXISTS
mysql-test/t/subselect.test:
  test of EXISTS
sql/item_subselect.cc:
  EXISTS type of subselect
sql/item_subselect.h:
  EXISTS type of subselect
sql/sql_class.cc:
  EXISTS type of subselect
sql/sql_class.h:
  EXISTS type of subselect
sql/sql_yacc.yy:
  EXISTS type of subselect
2002-06-19 17:52:44 +03:00
unknown
424ad58bec Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-06-19 00:38:58 +03:00
unknown
518787c299 Made keyread (key scanning) a key specific attribute.
This avoids using fulltext keys for table scanning.
This also reverts Sinisa's original fix for this problem.


Docs/manual.texi:
  Update of SQL_JOIN_MAX_SIZE information3602
client/mysqldump.c:
  comment cleanup
include/my_aes.h:
  General cleanup for new file
include/rijndael.h:
  General cleanup for new file
include/sha1.h:
  General cleanup for new file
mysys/my_aes.c:
  General cleanup for new file
mysys/rijndael.c:
  General cleanup for new file
mysys/sha1.c:
  General cleanup for new file
sql/ha_berkeley.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_innodb.cc:
  Merge with 3.23.x
sql/ha_innodb.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_isam.cc:
  Moved things to table_flags()
sql/ha_isam.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisam.cc:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisam.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisammrg.h:
  Made keyread (key scanning) a key specific attribute.
sql/handler.h:
  Made keyread (key scanning) a key specific attribute.
sql/item_strfunc.cc:
  Cleanup of AES_xxx code
sql/opt_range.cc:
  Made keyread (key scanning) a key specific attribute.
sql/sql_base.cc:
  Made keyread (key scanning) a key specific attribute.
sql/sql_cache.cc:
  Removed compiler warning
sql/sql_select.cc:
  Removed wrong patch to fulltext problem
sql/table.cc:
  Made keyread (key scanning) a key specific attribute.
sql/table.h:
  Made keyread (key scanning) a key specific attribute.
2002-06-19 00:22:30 +03:00
unknown
9b76862b7f Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into bison.(none):/home/hf/work/mysql-4.1


include/mysql.h:
  Auto merged
2002-06-18 20:36:28 +05:00
unknown
adc508c901 Fixed some comments , plus introduced some tests so that I do not
make some new mistakes.
2002-06-18 17:38:06 +03:00
unknown
4caf38387a My previous patch was not good at all.
This one is better, but should not be final.

Better fix is to make some changes in ha_myisammrg::index_read

This patch also reverts my previous one ...
2002-06-17 20:58:09 +03:00
unknown
2ec3617476 UCS2 charset has been added 2002-06-17 22:43:40 +05:00
unknown
9424f80f19 Merge with 3.23.52
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-linux-build:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
2002-06-17 16:08:34 +03:00
unknown
0bf296a02b Resolving of conflicts from pull
BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
include/violite.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
libmysqld/lib_vio.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/net_pkg.cc:
  Merging of pull conflicts
sql/sql_base.cc:
  Merging of pull conflicts
sql/sql_class.h:
  Merging of pull conflicts
2002-06-17 17:14:20 +05:00
unknown
4249f4cb72 Fixed problem with innodb_log_group_home_dir and SHOW VARIABLES
Docs/manual.texi:
  Updated TODO for 4.0
sql/mysqld.cc:
  Cleanup
sql/opt_range.cc:
  Cleanup
2002-06-17 15:07:46 +03:00
unknown
f97e1b6ae1 Backported fix from 4.0 which caused core dumps for some complex queries.
Docs/manual.texi:
  Fixed example
sql/mysqld.cc:
  Cleanup
2002-06-17 15:00:06 +03:00
unknown
ea10430d9c Net->client structures macro added
sql/mysql_priv.h:
  This macro compiles as network-sending in usual case and as writing record
  into client structures in embedded case
2002-06-17 16:41:04 +05:00
unknown
f4b014d5c3 Removing net emulation out of embedded library
include/mysql.h:
  Several structures content changed for embedded case
include/violite.h:
  enum_vio_type extended
libmysqld/embedded_priv.h:
  three new funcs added
libmysqld/lib_sql.cc:
  A lot of changes on the way to excude network emulation
libmysqld/lib_vio.c:
  vio structure changed.
  we're on the way to remove network...
libmysqld/libmysqld.c:
  A lot of changes.
sql/ha_myisam.cc:
  Network sending modified for embedded case.
sql/net_pkg.cc:
  Exclude network from error sending
sql/sql_acl.cc:
  Exclude access permissions checking in embedded case
sql/sql_base.cc:
  Implementation of send_fields got quite different in enbedded case and now
  placed in lib_sql.cc
sql/sql_class.cc:
  select_send::send_data for embedded case placed in lib_sql
sql/sql_class.h:
  Extra fields added for embedded case
sql/sql_parse.cc:
  remove this out of server
sql/sql_show.cc:
  lots of similar changes to exclude network emulation
sql/sql_table.cc:
  Network emulation excluded
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-06-17 16:24:51 +05:00
unknown
c47044f0ae Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-06-17 09:46:38 +03:00
unknown
8a8e4be22f Cleanup of checking of user resources
Added missing checking of no_keyread


Docs/manual.texi:
  Fixed wrong example
myisam/myisamchk.c:
  Removed not needed include file
mysys/my_pthread.c:
  Fix for HPUX
mysys/my_thr_init.c:
  Removed not needed warning
scripts/mysql_fix_privilege_tables.sh:
  Cleanup
sql/sql_lex.cc:
  Removed not needed initialization
sql/sql_parse.cc:
  Cleanup of checking of user resources
sql/sql_select.cc:
  Added checking of no_keyread
2002-06-16 17:06:12 +03:00
unknown
e9c43803dd Fixed a bug in optimiser with MERGE tables with non-unique values
with aggregating functions.

This consistently crashed Mysql
2002-06-15 20:59:42 +03:00
unknown
451a5e510b A fix for a bug which hits the optimiser when trying to group keys
for a seemingly impoosbile conds in WHERE....

This crashed MySQL in 4.0.2


Docs/manual.texi:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....
mysql-test/r/select.result:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....
mysql-test/t/select.test:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....
sql/opt_range.cc:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....
2002-06-15 14:56:35 +03:00
unknown
52eab5dca2 Merge
Docs/manual.texi:
  SCCS merged
2002-06-14 15:15:24 +03:00
unknown
4a1b497899 Fixed a rare bug when fulltext index is present and no tables are used.
A better fix would be to have a map of tables that are not used at all, 
and to annul just fledls in that TABLE.
2002-06-14 15:06:01 +03:00
unknown
501839ae29 Merge
BitKeeper/etc/logging_ok:
  auto-union
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
client/mysqldump.c:
  SCCS merged
2002-06-14 15:24:22 +04:00
unknown
8451d47ac7 This is just code style/minor optimizations cleanup changeset
client/mysqldump.c:
  Changes adviced by Monty
include/my_aes.h:
  Changes adviced by Monty
include/rijndael.h:
  Changes adviced by Monty
include/sha1.h:
  Changes adviced by Monty
mysys/my_aes.c:
  Changes adviced by Monty
mysys/rijndael.c:
  Changes adviced by Monty
mysys/sha1.c:
  Changes adviced by Monty
sql/item_strfunc.cc:
  Changes adviced by Monty
2002-06-14 15:14:30 +04:00
unknown
0ea0993cfb Some small changes in multi-table update "ported" from mulit-table
delete.
2002-06-13 17:08:27 +03:00