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
39859d5d7c making necessary changes after Sasha's correct remarks 2002-07-16 22:07:12 +03:00
unknown
8d4d7d6f25 Fixing slave timeouting 2002-07-16 21:16:34 +03:00
unknown
43376d554f slave.cc:
Suppress prints by slave.cc when there is a normal reconnect after the master has been quiet for the time of the net read timeout; this removes the Error 1159 messages many users have complained about in the replication of 3.23.51


sql/slave.cc:
  Suppress prints by slave.cc when there is a normal reconnect after the master has been quiet for the time of the net read timeout; this removes the Error 1159 messages many users have complained about in the replication of 3.23.51
2002-07-16 20:06:39 +03:00
unknown
1ca6b811e5 In my previous commit I didn't notice that we already have brazilian portuguese :(
BitKeeper/deleted/.del-errmsg.txt~7b5c3eb97e12d271:
  Delete: sql/share/pt_br/errmsg.txt
configure.in:
  Remove pt_br
sql/share/portuguese/errmsg.txt:
  Update portuhuese
2002-07-16 17:18:54 +05:00
unknown
e7454a0725 Brazilian Portuguesse messages
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-07-16 16:48:56 +05:00
unknown
335c58d1c2 sql_db.cc:
On Monty's suggestion move ha_drop_database back inside LOCK_mysql_create_db, but we release LOCK_open during it to let possible running queries complete. I tested this and it seemed to work also in complex concurrent DELETE, SELECT, DROP DATABASE, and CREATE DATABASE situations


sql/sql_db.cc:
  On Monty's suggestion move ha_drop_database back inside LOCK_mysql_create_db, but we release LOCK_open during it to let possible running queries complete. I tested this and it seemed to work also in complex concurrent DELETE, SELECT, DROP DATABASE, and CREATE DATABASE situations
2002-07-16 03:29:02 +03:00
unknown
0dd47486d6 sql_db.cc:
Revert Monty's change to the positioning of ha_drop_database(): otherwise a running query on a table to be dropped in DROP DATABASE always causes the server to hang


sql/sql_db.cc:
  Revert Monty's change to the positioning of ha_drop_database(): otherwise a running query on a table to be dropped in DROP DATABASE always causes the server to hang
2002-07-15 15:47:53 +03:00
unknown
f9232ee503 Added some patches provided by SuSE to fix build problems on
ppc64 and x86-64, fixed a compile bug when building with TCP wrapper
support on Linux


bdb/dist/acconfig.h:
  Added patch for x86_64 (provided by SuSE)
bdb/dist/aclocal/mutex.m4:
  Added patch for x86_64 (provided by SuSE)
bdb/include/mutex.h:
  Added patch for x86_64 (provided by SuSE)
include/global.h:
  Added a SMP-related patch for PPC64 (provided by SuSE)
sql/mysqld.cc:
  Compile fix for Linux when compiling with --with-librwap
2002-07-15 13:33:56 +02:00
unknown
765519dbcf Do handler specific drop-database at safe place.
Fix for access problem (merge from 4.0)


sql/sql_db.cc:
  Do handler specific drop-database at safe place.
sql/sql_parse.cc:
  Fix for access problem (merge from 4.0)
2002-07-14 10:37:34 +03:00
unknown
f95ed60934 Found bugs fixed
libmysqld/lib_sql.cc:
  This would be more correct
sql/item.cc:
  This error not to be exposed
sql/item_strfunc.cc:
  We don't want login/password stuff in Embedded Library
sql/sql_select.cc:
  This error not to be exposed
sql/sql_table.cc:
  Usual changes here
2002-07-11 13:43:21 +05:00
unknown
2998b25478 Merge work:/home/bk/mysql-4.0/
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0-new


mysys/my_getopt.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2002-07-10 20:19:36 +03:00
unknown
7e13b5fc68 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into ram.(none):/home/ram/work/mysql-4.1.spatial


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-07-10 12:46:01 +05:00
unknown
1f831db88f Clean up removing unreferenced local variable
sql/item_func.cc:
  Removing unreferenced local variable
2002-07-10 00:32:04 -03:00
unknown
a0a0af76fa This is the only way to fix ALTER TABLE bug with BDB
I wish I had connection stop  / start so that I could have made a 
test case.


Docs/manual.texi:
  This is the only way to fix ALTER TABLE bug with BDB
sql/sql_table.cc:
  This is the only way to fix ALTER TABLE bug with BDB
2002-07-09 14:57:06 +03:00
unknown
2da868d45c Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into bisonxp.(none):/home/hf/work/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2002-07-09 10:42:24 +05:00
unknown
615c1e4fcf Minor fixes
libmysqld/lib_sql.cc:
  Working when LIMIT is on
sql/sql_handler.cc:
  Usual fix to handle embedded case properly
sql/sql_select.cc:
  Usual fix to handle embedded case properly
sql/sql_table.cc:
  Usual fix to handle embedded case properly
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-07-09 10:39:22 +05:00
unknown
c0e8c9a11f Many files:
Merge InnoDB-3.23.52b


innobase/btr/btr0btr.c:
  Merge InnoDB-3.23.52b
innobase/btr/btr0cur.c:
  Merge InnoDB-3.23.52b
innobase/btr/btr0sea.c:
  Merge InnoDB-3.23.52b
innobase/buf/buf0buf.c:
  Merge InnoDB-3.23.52b
innobase/ha/ha0ha.c:
  Merge InnoDB-3.23.52b
innobase/ibuf/ibuf0ibuf.c:
  Merge InnoDB-3.23.52b
innobase/include/btr0cur.h:
  Merge InnoDB-3.23.52b
innobase/include/buf0buf.h:
  Merge InnoDB-3.23.52b
innobase/include/ha0ha.h:
  Merge InnoDB-3.23.52b
innobase/include/ibuf0ibuf.h:
  Merge InnoDB-3.23.52b
innobase/include/lock0lock.h:
  Merge InnoDB-3.23.52b
innobase/include/log0log.h:
  Merge InnoDB-3.23.52b
innobase/include/os0file.h:
  Merge InnoDB-3.23.52b
innobase/include/rem0rec.ic:
  Merge InnoDB-3.23.52b
innobase/include/srv0srv.h:
  Merge InnoDB-3.23.52b
innobase/include/sync0arr.h:
  Merge InnoDB-3.23.52b
innobase/include/sync0sync.h:
  Merge InnoDB-3.23.52b
innobase/include/trx0trx.h:
  Merge InnoDB-3.23.52b
innobase/lock/lock0lock.c:
  Merge InnoDB-3.23.52b
innobase/log/log0log.c:
  Merge InnoDB-3.23.52b
innobase/os/os0file.c:
  Merge InnoDB-3.23.52b
innobase/row/row0mysql.c:
  Merge InnoDB-3.23.52b
innobase/row/row0umod.c:
  Merge InnoDB-3.23.52b
innobase/row/row0upd.c:
  Merge InnoDB-3.23.52b
innobase/srv/srv0srv.c:
  Merge InnoDB-3.23.52b
innobase/srv/srv0start.c:
  Merge InnoDB-3.23.52b
innobase/sync/sync0arr.c:
  Merge InnoDB-3.23.52b
innobase/sync/sync0sync.c:
  Merge InnoDB-3.23.52b
innobase/trx/trx0trx.c:
  Merge InnoDB-3.23.52b
sql/ha_innobase.h:
  Merge InnoDB-3.23.52b
sql/ha_innobase.cc:
  Merge InnoDB-3.23.52b
sql/sql_lex.h:
  Merge InnoDB-3.23.52b
sql/mysqld.cc:
  Merge InnoDB-3.23.52b
sql/sql_parse.cc:
  Merge InnoDB-3.23.52b
sql/sql_yacc.yy:
  Merge InnoDB-3.23.52b
2002-07-08 19:34:49 +03:00
unknown
7cbdd6de7e cleanup 2002-07-05 08:15:57 +03:00
unknown
99bde364f6 ha_innobase.cc:
Remove a debug printf which unintentionally was committed to the source tree


sql/ha_innobase.cc:
  Remove a debug printf which unintentionally was committed to the source tree
2002-07-03 03:39:10 +03:00
unknown
6f1f9d5c74 ha_innobase.cc:
Clarify the setting of innodb_data_file_path in my.cnf: it is in the [mysqld] section


sql/ha_innobase.cc:
  Clarify the setting of innodb_data_file_path in my.cnf: it is in the [mysqld] section
2002-07-03 03:29:30 +03:00
unknown
1648e47889 SHOW CREATE DATABASE name;
Small fixes in database default charset code


sql/mysql_priv.h:
  SHOW CREATE DATABASE name;
sql/sql_db.cc:
  SHOW CREATE DATABASE name;
sql/sql_lex.h:
  SHOW CREATE DATABASE name;
sql/sql_parse.cc:
  SHOW CREATE DATABASE name;
sql/sql_yacc.yy:
  SHOW CREATE DATABASE name;
2002-07-02 14:31:54 +05:00
unknown
ff5fadb71a typo fixed 2002-07-01 19:13:14 +03:00
unknown
5d2927e4a6 subselect clean up
fix after automerge


sql/item_strfunc.cc:
  fix after automerge
sql/sql_lex.h:
  subselect clean up
sql/sql_select.cc:
  subselect clean up
2002-07-01 19:06:24 +03:00
unknown
fd8c758692 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-having-4.1


sql/item_strfunc.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-07-01 14:17:59 +03:00
unknown
e5b5f45319 subselect in having clause
fixed bug in sum function in subselect


mysql-test/r/subselect.result:
  subselect in having clause
mysql-test/t/subselect.test:
  subselect in having clause
sql/item.cc:
  subselect in having clause
sql/item.h:
  subselect in having clause
sql/item_cmpfunc.cc:
  subselect in having clause
sql/item_cmpfunc.h:
  subselect in having clause
sql/item_func.cc:
  subselect in having clause
sql/item_func.h:
  subselect in having clause
sql/item_strfunc.h:
  subselect in having clause
sql/item_subselect.cc:
  subselect in having clause
sql/item_subselect.h:
  subselect in having clause
sql/item_uniq.h:
  subselect in having clause
sql/sql_base.cc:
  subselect in having clause
sql/sql_class.cc:
  subselect in having clause
sql/sql_class.h:
  subselect in having clause
sql/sql_handler.cc:
  subselect in having clause
sql/sql_lex.cc:
  subselect in having clause
sql/sql_lex.h:
  subselect in having clause
sql/sql_prepare.cc:
  subselect in having clause
sql/sql_yacc.yy:
  subselect in having clause
2002-07-01 14:14:51 +03:00
unknown
53275045c5 Disable symlinks if compiled with -DHAVE_BROKEN_REALPATH 2002-07-01 11:38:46 +03:00
unknown
baa8486e52 Merge work:/home/bk/mysql-4.0/
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0-new


mysys/my_getopt.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-07-01 10:14:55 +03:00
unknown
fbaede459b Fixed bug in binary log when using LOAD DATA INFILE without active database.
Docs/manual.texi:
  Changelog and fix of typo
2002-06-30 23:25:46 +03:00
unknown
bbe55cd113 Fix problem with gcc 3.1 2002-06-30 23:04:11 +03:00
unknown
417c53ac5d Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
include/my_pthread.h:
  Auto merged
2002-06-30 19:34:54 +03:00
unknown
a86390f01a Update for running gcc 3.x (mainly on HPUX)
Portability fixes for HPUX
Rename of CHECK_LOCK to IS_FREE_LOCK
Apply lower_case_table_names also to databases
Cleanup of describe code
Don't allow \ in database names


Build-tools/Do-compile:
  Added option --make-options
Docs/manual.texi:
  Changelog
  Added XOR, ^ and IS_FREE_LOCK() descriptions
acinclude.m4:
  Update for running gcc 3.x on HPUX
client/mysql.cc:
  Portability fix
client/mysqlbinlog.cc:
  Fix for using gcc 3.1
configure.in:
  Fix for using gcc 3.1
include/my_global.h:
  Fix for using gcc 3.1
include/my_pthread.h:
  Removed warning on HPUX
innobase/configure.in:
  Portability fix (for gcc 3.1 on HPUX)
innobase/ut/ut0ut.c:
  Portability fix (for gcc 3.1 on HPUX)
mysql-test/r/func_test.result:
  Test of new functions
mysql-test/r/rpl_get_lock.result:
  Test of new functions
mysql-test/t/func_test.test:
  Test of new functions
mysql-test/t/rpl_get_lock.test:
  Test of new functions
mysys/my_tempnam.c:
  Portability fix
sql/item_cmpfunc.cc:
  Added comments to Item_cond_xor.
  Fixed NULL handling for XOR
sql/item_create.cc:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_create.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_func.cc:
  Cleanup XOR handling
sql/item_func.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/lex.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/mysqld.cc:
  Moved chroot() to be exectued earlier.
sql/sql_db.cc:
  Apply lower_case_table_names also to databases
sql/sql_parse.cc:
  Apply lower_case_table_names also to databases
sql/sql_select.cc:
  Cleanup describe code (after Sinisa's patch for EXPLAIN + UNION)
sql/table.cc:
  Don't allow \ in database names
2002-06-30 18:57:21 +03:00
unknown
422d3873af typo fixed 2002-06-30 13:00:36 +03:00
unknown
5c059a338f semaphores replaced by rwlock
include/my_pthread.h:
  small bug in #define
sql/sql_handler.cc:
  bug in order of #includes
2002-06-30 12:08:58 +03:00
unknown
663bc26d7f Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-06-29 21:16:11 +03:00
unknown
10d282f632 Added support for rw_tryrdlock() and rw_trywrlock()
include/my_sys.h:
  Removed not needed macro (SAFE_MUTEX can handle this case better).
sql/log.cc:
  Simple optimization
sql/log_event.cc:
  Fix problem in LOAD DATA if table_name is NULL (unlikely event)
sql/log_event.h:
  cleanup
sql/slave.cc:
  remove unnecessary assert
2002-06-29 20:26:33 +03:00
unknown
76ca485559 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-06-29 16:32:45 +03:00
unknown
b936b25d79 Added functions :
* binary XOR
* logical XOR
* CHECK_LOCK("lock_name")
2002-06-29 16:25:09 +03:00
unknown
370016677a Added support for semaphores in mysys.
(Needed for query cache for systems which doesn't have native semaphores)


mysys/my_getopt.c:
  Safety fix.
mysys/my_winsem.c:
  Shange all semaphore code to be uniform
mysys/thr_rwlock.c:
  cleanup
sql/gen_lex_hash.cc:
  Error message if wrong number of arguments.
sql/slave.cc:
  R
2002-06-29 00:16:15 +03:00
unknown
e0d8d62e39 Added interface for first set of dynamic variables. 2002-06-28 19:30:09 +03:00
unknown
7311cbe7de Updated windows files (VC++ files and winmysqladmin).
Portability fixes.
Removed compiler warnings.



VC++Files/client/mysql.dsp:
  Updated to 4.0.2
VC++Files/client/mysqladmin.dsp:
  Updated to 4.0.2
VC++Files/client/mysqlclient.dsp:
  Updated to 4.0.2
VC++Files/client/mysqldump.dsp:
  Updated to 4.0.2
VC++Files/client/mysqlimport.dsp:
  Updated to 4.0.2
VC++Files/client/mysqlshow.dsp:
  Updated to 4.0.2
VC++Files/innobase/innobase.dsp:
  Updated to 4.0.2
VC++Files/libmysql/libmySQL.dsp:
  Updated to 4.0.2
VC++Files/libmysqltest/myTest.dsp:
  Updated to 4.0.2
VC++Files/merge/merge.dsp:
  Updated to 4.0.2
VC++Files/myisam/myisam.dsp:
  Updated to 4.0.2
VC++Files/mysql.dsw:
  Updated to 4.0.2
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Updated to 4.0.2
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Updated to 4.0.2
VC++Files/mysqlmanager/MySqlManager.dsp:
  Updated to 4.0.2
VC++Files/mysys/mysys.dsp:
  Updated to 4.0.2
VC++Files/pack_isam/pack_isam.dsp:
  Updated to 4.0.2
VC++Files/perror/perror.dsp:
  Updated to 4.0.2
VC++Files/replace/replace.dsp:
  Updated to 4.0.2
VC++Files/sql/mysqld.dsp:
  Updated to 4.0.2
VC++Files/test1/test1.dsp:
  Updated to 4.0.2
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Updated to 4.0.2
VC++Files/thr_test/thr_test.dsp:
  Updated to 4.0.2
VC++Files/vio/vio.dsp:
  Updated to 4.0.2
VC++Files/zlib/zlib.dsp:
  Updated to 4.0.2
include/config-win.h:
  Added isnan() and finite()
include/myisam.h:
  Move thr_xxx functions to myisam_priv.h
myisam/mi_check.c:
  Portability fix.
myisam/mi_locking.c:
  Comment cleanup
myisam/myisamchk.c:
  Removed compiler warning
myisam/myisamdef.h:
  Added thr_xxx functions
myisam/sort.c:
  Portability fix
sql/field.cc:
  Portability fix
sql/sql_insert.cc:
  R
2002-06-28 17:26:11 +03:00
unknown
d7a84c7af0 Indentation cleanup & new comments
BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31:
  Delete: mysys/getvar.c
zlib/zlib.dsp:
  Turn on EOLN_NATIVE flag
libmysql/Makefile.shared:
  Remove getvar.c
myisam/mi_cache.c:
  Indentation cleanup
myisam/mi_check.c:
  Indentation cleanup
  Changed name of a variable
myisam/sort.c:
  Indentation cleanup
  Added initialization of a variable
myisammrg/myrg_delete.c:
  Indentation cleanup
myisammrg/myrg_rsame.c:
  Indentation cleanup
myisammrg/myrg_update.c:
  Indentation cleanup
myisammrg/myrg_write.c:
  Indentation cleanup
mysys/Makefile.am:
  removed getvar.c
sql/field.cc:
  Added warning counter to overflow() (and removed this from other places)
2002-06-28 09:18:23 +03:00
unknown
96d34f547b Fix 2002-06-27 19:00:49 +05:00
unknown
e6a32a67ba Now database default character is changed during ALTER DATABASE
if the current db is being altered
2002-06-27 15:21:52 +05:00
unknown
fce8822611 ALTER DATABASE DEFAULT CHARACTER SET latin1; 2002-06-27 14:41:02 +05:00
unknown
8d07955f3d merge
BitKeeper/etc/ignore:
  added scripts/mysql_tableinfo
sql/sql_parse.cc:
  Auto merged
2002-06-27 11:35:50 +03:00
unknown
835a75c97b Removed mysql_ssl_clear()
Added statistics information for alarms (for bug tracking)
Don't store "incomplete" in the xxx.cfg file if we are not using --restart. (Crash-me)
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
Aded new script mysql_tableinfo to make a system directory.


Docs/manual.texi:
  Changelog and TODO
include/mysql.h:
  Removed mysql_ssl_clear() (One should use mysql_close() instead)
include/thr_alarm.h:
  Added info for alarms
libmysql/libmysql.c:
  Made mysql_ssl_clear() static
libmysql/libmysql.def:
  cleanup
libmysqld/libmysqld.def:
  cleanup
myisam/myisamchk.c:
  describe -> description
myisam/myisampack.c:
  Fixed copyright.
mysys/thr_alarm.c:
  Added statistics information for alarms (for bug tracking)
scripts/Makefile.am:
  Added mysql_table_info
sql-bench/crash-me.sh:
  Don't store "incomplete" in the xxx.cfg file if we are not using --restart.
  This was done becasue "incomplete" made it harder to quickly repeat a test that
  failed.
sql-bench/limits/mysql.cfg:
  Update to 1.58
sql/hostname.cc:
  Remved compiler warning
sql/item_func.cc:
  cleanup
sql/item_func.h:
  Cleanup
sql/mysql_priv.h:
  Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
sql/opt_range.cc:
  Removed purify warning
sql/sql_parse.cc:
  cleanup
sql/sql_test.cc:
  Added ala
2002-06-27 11:27:04 +03:00
unknown
0d354e47ff SELECT DISTINCT CONVERT(field USING charset) now works properly 2002-06-26 18:08:33 +05:00
unknown
15171d977c Trying to make Arjen happy ... 2002-06-26 14:53:18 +03:00
unknown
328d6f42fc This now correctly substitutes charset to new table:
CREATE TABLE a SELECT strfunc(non_default_charset_expr)
2002-06-26 16:41:51 +05:00
unknown
1ff701ee0c Several problems were fixed (mostly BLOB+charset related)
Fixed that MyISAM were not working properly with non-8bit charsets in some cases
CONVERT() function now works properly


myisam/mi_unique.c:
  Fix for non-8bit charsets
sql/field.cc:
  Initialize blobs with charset
sql/field.h:
  Initialize blobs with charset
sql/field_conv.cc:
  Initialize blobs with charset
sql/item_strfunc.cc:
  CONVERT() function now has working fix_lenght_and_dec(), and it's own 
  fix_fields()
sql/item_strfunc.h:
  CONVERT() function now has working fix_lenght_and_dec(), and it's own 
  fix_fields()
sql/sql_select.cc:
  Fixes for BLOBs
  Fixed that wrong charset was used in some cases
2002-06-26 16:00:43 +05:00