1
0
mirror of https://github.com/MariaDB/server.git synced 2025-10-24 07:13:33 +03:00
Commit Graph

1677 Commits

Author SHA1 Message Date
bar@bar.mysql.r18.ru
b80219f182 mysqldump.c:
SET NAMES is not sent to server when SET NAMES is not dumped
  Server decides which character set to use in this case
2003-06-10 12:07:02 +05:00
unknown
8484e6f759 mysqldump.c:
SET NAMES is not produced in compatibility modes


client/mysqldump.c:
  SET NAMES is not produced in compatibility modes
2003-06-10 11:34:00 +05:00
bar@bar.mysql.r18.ru
1ffc3cca56 mysqldump.c:
SET NAMES is not produced in compatibility modes
2003-06-10 11:34:00 +05:00
unknown
8b9fea0ce5 mysqldump.c:
mysqldump now produces SET NAMES. It can be disabled by --no-set-names


client/mysqldump.c:
  mysqldump now produces SET NAMES. It can be disabled by --no-set-names
2003-05-30 15:21:03 +05:00
bar@bar.mysql.r18.ru
c7b3ee228f mysqldump.c:
mysqldump now produces SET NAMES. It can be disabled by --no-set-names
2003-05-30 15:21:03 +05:00
unknown
eb4f5e2d6c --with-collation argument for configure. Now one can for example use this:
./configure --with-charset=latin1 --with-collation=latin1_danish_ci
2003-05-28 16:23:04 +05:00
bar@bar.mysql.r18.ru
67c6703463 --with-collation argument for configure. Now one can for example use this:
./configure --with-charset=latin1 --with-collation=latin1_danish_ci
2003-05-28 16:23:04 +05:00
unknown
3565727359 mysqlimport.c, mysqldump.c, mysqlcheck.c:
Bug fix: latin1 is not compiled charset and is not specified..
mysql.cc:
  Bug fix: latin1 is not compiled charset and is not specified...


client/mysql.cc:
  Bug fix: latin1 is not compiled charset and is not specified...
client/mysqlcheck.c:
  Bug fix: latin1 is not compiled charset and is not specified..
client/mysqldump.c:
  Bug fix: latin1 is not compiled charset and is not specified..
client/mysqlimport.c:
  Bug fix: latin1 is not compiled charset and is not specified..
2003-05-22 14:37:01 +05:00
bar@bar.mysql.r18.ru
b1adadd510 mysqlimport.c, mysqldump.c, mysqlcheck.c:
Bug fix: latin1 is not compiled charset and is not specified..
mysql.cc:
  Bug fix: latin1 is not compiled charset and is not specified...
2003-05-22 14:37:01 +05:00
unknown
daac922bc3 Merge with 4.0.13
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
  Auto merged
Makefile.am:
  Auto merged
acinclude.m4:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
Build-tools/Do-compile:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/violite.h:
  Auto merged
innobase/buf/buf0flu.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/include/buf0buf.h:
  Auto merged
innobase/include/buf0lru.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_range.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/delete.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/innodb_handler.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
mysql-test/t/select_safe.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/init.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/unireg.h:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/test-transactions.sh:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
tests/grant.res:
  Auto merged
sql/log_event.cc:
  Merge with 4.0.13
  Cleaned up comment syntax
2003-05-19 16:35:49 +03:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
unknown
97eef79b02 Merge to get security patch
BitKeeper/etc/logging_ok:
  auto-union
sql/sql_acl.cc:
  Auto merged
tests/grant.pl:
  Auto merged
tests/grant.res:
  Auto merged
BitKeeper/triggers/post-commit:
  use local file
client/mysqldump.c:
  Merge to get crash fix
2003-05-08 00:12:46 +03:00
monty@mashka.mysql.fi
5d5d5b08ac Merge to get security patch 2003-05-08 00:12:46 +03:00
unknown
7c04ced1e0 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mylan:/usr/home/serg/Abk/mysql


client/mysqldump.c:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-28 20:09:38 +02:00
serg@serg.mylan
30ae0cdcc7 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mylan:/usr/home/serg/Abk/mysql
2003-04-28 20:09:38 +02:00
unknown
6b8e2938f2 Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Auto merged
BitKeeper/deleted/.del-mysql.xdc:
  Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
sql/sql_parse.cc:
  Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
  Auto merged
2003-04-03 21:19:12 +03:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
unknown
f5feb33773 Merge with 3.23 to get fixes for:
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.


BitKeeper/etc/logging_ok:
  auto-union
sql/log.cc:
  Auto merged
client/client_priv.h:
  Merge with 3.23
client/mysqldump.c:
  Merge with 3.23
myisam/mi_dynrec.c:
  Merge with 3.23
mysql-test/t/myisam.test:
  Merge with 3.23
sql/log_event.cc:
  Merge with 3.23
sql/slave.cc:
  Merge with 3.23
sql/sql_delete.cc:
  Merge with 3.23
2003-04-03 12:33:13 +03:00
monty@narttu.mysql.fi
618857b6eb Merge with 3.23 to get fixes for:
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.
2003-04-03 12:33:13 +03:00
unknown
a6614aae0a Added quotes around CREATE DATABASE IF EXISTS name if -Q was given. 2003-03-30 19:36:14 +03:00
jani@dsl-kpogw4gb5.dial.inet.fi
66d9143a66 Added quotes around CREATE DATABASE IF EXISTS name if -Q was given. 2003-03-30 19:36:14 +03:00
unknown
a6ef8839a9 Added quotes around database name, when using -Q. 2003-03-29 16:59:03 +02:00
jani@dsl-kpogw4gb5.dial.inet.fi
4336d4117e Added quotes around database name, when using -Q. 2003-03-29 16:59:03 +02:00
unknown
9c3d7df569 Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches
client/mysql.cc:
  NetWare only: Remove pthread_yield on large screen results
client/mysqldump.c:
  NetWare only: Remove pthread_yield on large screen results
include/my_pthread.h:
  NetWare only: pthread_cond_timedwait now present in LibC
mysys/default.c:
  Add conditional for NetWare
mysys/my_init.c:
  Changes to netware_init
mysys/my_pthread.c:
  NetWare only: special my_pthread_cond_timedwait no longer needed
mysys/thr_mutex.c:
  NetWare: no need for pthread_mutex_lock calls
netware/BUILD/mwenv:
  Add zlib to environment variables
netware/Makefile.am:
  Add isam/isamchk.def to netware_build_files
scripts/make_binary_distribution.sh:
  Made bin directory files more flexible for alternate platforms, without unnecessary repetition
2003-03-28 14:24:32 -05:00
greg@mysql.com
080b73ee18 Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches 2003-03-28 14:24:32 -05:00
unknown
2ec4163759 Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC
client/mysql.cc:
  Remove unnecessary pthread_yield calls for NetWare
client/mysqldump.c:
  Remove unnecessary pthread_yield calls for NetWare
include/my_pthread.h:
  Special extern my_pthread_cond_timedwait no longer required for NetWare
mysql-test/t/backup.test:
  replace_result added so test passes correctly on NetWare
mysys/default.c:
  Add conditional to avoid non-applicable file checking on NetWare
mysys/my_init.c:
  Remove working directory change from netware_init()
mysys/my_pthread.c:
  Remove unnecessary NetWare version of my_pthread_cond_timedwait
mysys/thr_mutex.c:
  Remove unnecessary NetWare block
scripts/make_binary_distribution.sh:
  Changes to clear up extraneous EXTRA_BIN_FILES, NetWare sections
2003-03-21 16:45:39 -05:00
greg@mysql.com
67985efed5 Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC 2003-03-21 16:45:39 -05:00
unknown
8f739cd674 Do not silently do RESET MASTER when one does 'mysqldump --master-data' ;
only do it if the user specifies --delete-master-logs (new option).
Safer + fixes bug #159.


client/client_priv.h:
  New option --delete-master-logs for mysqldump
client/mysqldump.c:
  New option --delete-master-logs for mysqldump
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-19 15:16:51 +01:00
guilhem@mysql.com
45e3de8f32 Do not silently do RESET MASTER when one does 'mysqldump --master-data' ;
only do it if the user specifies --delete-master-logs (new option).
Safer + fixes bug #159.
2003-03-19 15:16:51 +01:00
unknown
7a440f7779 crash fix 2003-03-17 19:39:01 +01:00
serg@serg.mysql.com
018a9b7058 crash fix 2003-03-17 19:39:01 +01:00
unknown
2aa9f20735 mysqltest.c, mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:
system_charset_info was removed


client/mysql.cc:
  system_charset_info was removed
client/mysqlcheck.c:
  system_charset_info was removed
client/mysqldump.c:
  system_charset_info was removed
client/mysqlimport.c:
  system_charset_info was removed
client/mysqltest.c:
  system_charset_info was removed
2003-03-16 11:20:45 +04:00
root@home.(none)
1daed63ed8 mysqltest.c, mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:
system_charset_info was removed
2003-03-16 11:20:45 +04:00
unknown
6b11fa3a24 set_default_charset() is not used anymore
Some system_charset_info were removed


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-16 10:56:14 +04:00
root@home.(none)
f71a7e4b05 set_default_charset() is not used anymore
Some system_charset_info were removed
2003-03-16 10:56:14 +04:00
unknown
37211b4a03 - Changed C++-style comments to C-style comments to make IBM compiler happy 2003-03-06 13:51:37 +01:00
lenz@mysql.com
113e499b43 - Changed C++-style comments to C-style comments to make IBM compiler happy 2003-03-06 13:51:37 +01:00
unknown
aa9681f341 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


client/mysqldump.c:
  Auto merged
2003-02-18 20:35:57 +01:00
serg@serg.mysql.com
cc2dda24b6 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-18 20:35:57 +01:00
unknown
e793dfe95e Merge with 4.0.11 tree to get latest bug fixes
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/rpl000001.result:
  Auto merged
mysql-test/r/rpl000004.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/structs.h:
  Auto merged
Makefile.am:
  Merge with 4.0.11
mysql-test/mysql-test-run.sh:
  Merge with 4.0.11
mysql-test/r/rpl_log.result:
  Use local version (needs to be updated)
mysql-test/t/type_blob.test:
  Merge with 4.0.11
sql/mysqld.cc:
  Merge with 4.0.11
sql/protocol.cc:
  Use local version
2003-02-17 05:43:37 +02:00
monty@mashka.mysql.fi
90bf074438 Merge with 4.0.11 tree to get latest bug fixes 2003-02-17 05:43:37 +02:00
unknown
73cc50e45d Patch for novell
Reverted wrong patch for mysqld_safe.sh


client/mysqldump.c:
  Patch for novell.
scripts/mysqld_safe.sh:
  Reverted wrong patch.
  (We must delete the files first as otherwise we will get a problem if the files has the wrong permissions or if the machine went down without removing the socket file)
2003-02-16 22:50:00 +02:00
monty@mashka.mysql.fi
a533db746b Patch for novell
Reverted wrong patch for mysqld_safe.sh
2003-02-16 22:50:00 +02:00
unknown
b80049a55e Merge serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


BUILD/FINISH.sh:
  Auto merged
client/mysqldump.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53:
  Auto merged
2003-02-13 17:12:52 +01:00
serg@serg.mysql.com
474d013696 Merge serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-02-13 17:12:52 +01:00
unknown
18994cb0b7 do not ignore --allow-keywords if SHOW CREATE TABLE is used 2003-02-12 20:46:40 +01:00
serg@serg.mysql.com
6bb42870e0 do not ignore --allow-keywords if SHOW CREATE TABLE is used 2003-02-12 20:46:40 +01:00
unknown
2ff82a7b15 Merge with 4.0.11
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Makefile.am:
  Auto merged
bdb/os/os_handle.c:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
myisam/ft_static.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_test3.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/handler.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/count_distinct.test:
  Auto merged
mysql-test/t/func_crypt.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/table.cc:
  Auto merged
Docs/manual.texi:
  Use remote version
client/mysql.cc:
  Merge
configure.in:
  Merge
libmysql/libmysql.c:
  Merge
libmysqld/lib_sql.cc:
  Merge
myisam/ft_stopwords.c:
  Merge
myisam/myisamchk.c:
  Merge
mysql-test/r/bigint.result:
  Merge
mysql-test/r/group_by.result:
  Merge
mysql-test/r/rpl000009.result:
  Merge
mysql-test/t/group_by.test:
  Merge
mysql-test/t/rpl000009.test:
  Merge
mysql-test/t/rpl_rotate_logs.test:
  Merge
mysys/Makefile.am:
  Merge
mysys/charset.c:
  Merge
sql/item.h:
  Merge
sql/item_cmpfunc.cc:
  Merge
sql/item_cmpfunc.h:
  Merge
sql/item_create.cc:
  Merge
sql/item_func.cc:
  Merge
sql/item_strfunc.h:
  Merge
sql/log.cc:
  Merge
sql/mysql_priv.h:
  Merge
sql/mysqld.cc:
  Merge
sql/protocol.cc:
  Merge
sql/slave.cc:
  Merge
sql/sql_class.h:
  Merge
sql/sql_db.cc:
  Merge
sql/sql_handler.cc:
  Merge
sql/sql_parse.cc:
  Merge
sql/sql_select.cc:
  Merge
sql/sql_yacc.yy:
  Merge
2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
unknown
84f81dc593 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL


BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75:
  Delete: sql/ChangeLog
BUILD/compile-pentium-valgrind-max:
  Don't use valgrind with safemalloc as this can hide some bugs
Makefile.am:
  Added platform dirs
bdb/os/os_handle.c:
  Portability fix
client/mysql.cc:
  Fixes for Netware.
  Fixed duplicate output when using 'tee'
  Simple optimisations
client/mysqldump.c:
  Portability fix
client/mysqltest.c:
  Portability fix
configure.in:
  Fixes for Netware
extra/resolveip.c:
  Fixes for Netware
include/Makefile.am:
  Fixes for Netware
include/config-win.h:
  Portability fix
include/my_global.h:
  Fixes for Netware
include/my_net.h:
  Fixes for Netware
include/my_pthread.h:
  Fixes for Netware
  Added detection of mutexes that was not destroyed
include/my_sys.h:
  Fixes for Netware
  Added 'extern' before external functions
include/mysql.h:
  Fixes for Netware
innobase/configure.in:
  Fixes for Netware
innobase/include/os0thread.h:
  Fixes for Netware
innobase/os/os0sync.c:
  Fixes for Netware
innobase/os/os0thread.c:
  Fixes for Netware
innobase/srv/srv0srv.c:
  Fixes for Netware
innobase/srv/srv0start.c:
  Fixes for Netware
innobase/sync/sync0sync.c:
  Fixes for Netware
isam/test3.c:
  Disable test on Netware
libmysql/Makefile.shared:
  Added my_sleep
libmysql/get_password.c:
  Fixes for Netware
libmysql/libmysql.c:
  Fixes for Netware
  Made mysql_once_init() global
libmysql/manager.c:
  Fixes for Netware
myisam/mi_test3.c:
  Disable test for netware
mysql-test/mysql-test-run.sh:
  Give warning if output file contains errors
mysql-test/r/count_distinct.result:
  More tests
mysql-test/r/group_by.result:
  Test of ORDER BY NULL
mysql-test/t/backup.test:
  Fixes for Netware
mysql-test/t/count_distinct.test:
  More tests
mysql-test/t/func_crypt.test:
  Fixes for Netware
mysql-test/t/grant_cache.test:
  Fixes for Netware
mysql-test/t/group_by.test:
  Tests of ORDER BY NULL
mysql-test/t/rpl000015.test:
  Fixes for Netware
mysql-test/t/rpl000017.test:
  Fixes for Netware
mysql-test/t/rpl_rotate_logs.test:
  Fixes for Netware
mysys/Makefile.am:
  Added my_sleep.c and my_netware.c
mysys/charset.c:
  Fixes for Netware
mysys/default.c:
  Fixes for Netware
mysys/mf_tempfile.c:
  Fixes for Netware
mysys/my_clock.c:
  Fixes for Netware
mysys/my_copy.c:
  Fixes for Netware
mysys/my_getwd.c:
  Changed function comment from // -> /* */
mysys/my_init.c:
  Fixes for Netware
mysys/my_lock.c:
  Fixes for Netware
mysys/my_messnc.c:
  Fixes for Netware
mysys/my_os2cond.c:
  Removed comment
mysys/my_os2dirsrch.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2dirsrch.h:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2file64.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2mutex.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2thread.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2tls.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_pthread.c:
  Fixes for Netware
mysys/my_redel.c:
  Fixes for Netware
mysys/my_tempnam.c:
  Fixes for Netware
mysys/my_thr_init.c:
  Remove created mutexes when program ends.
mysys/mysys_priv.h:
  Cleanup
mysys/safemalloc.c:
  Prefix error messages with "Error:"
mysys/thr_alarm.c:
  Destroy internal mutex on end_thr_alarm.
mysys/thr_mutex.c:
  Added detection of mutex on which one didn't call pthread_mutex_destroy()
scripts/make_binary_distribution.sh:
  Fixes for Netware
sql/des_key_file.cc:
  Free mutex at end
sql/ha_innodb.cc:
  Free mutex at end
sql/ha_myisam.cc:
  Changed warnings from REPAIR Note:
  (For mysql-test-run)
sql/hostname.cc:
  Fixes for Netware
sql/item.h:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/item_func.cc:
  Free used mutexes
sql/item_sum.cc:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/log.cc:
  Free used mutexes
sql/my_lock.c:
  Fixes for Netware
sql/mysql_priv.h:
  Fixes for Netware
sql/mysqld.cc:
  Fixes for Netware
  Added Have_crypt
  Properly free mutexes from MYSQL_LOG by calling cleanup
  Free mutex before exit
sql/repl_failsafe.cc:
  Fixes for Netware
sql/set_var.cc:
  Added have_crypt
sql/share/english/errmsg.txt:
  Added version socket and port to stderr log
sql/slave.cc:
  Remove global MASTER_INFO variable and use instead an allocated variable.
  This allows us to correctly free used mutex.
sql/slave.h:
  Move constructors and destuctors to slave.cc
  (To make it easier to clear all needed variables)
sql/sql_base.cc:
  Safety fix
sql/sql_class.h:
  Portability fixes.
  Added 'cleanup' to log handling to be able to free mutexes.
sql/sql_insert.cc:
  Fixes for Netware
mysys/my_sleep.c:
  E
sql/sql_parse.cc:
  Fixes for Netware
sql/sql_select.cc:
  Added optimisation for ORDER BY NULL
sql/sql_select.h:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/sql_table.cc:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/sql_udf.cc:
  Free mutex on end
vio/test-ssl.c:
  Simple code cleanup
vio/test-sslclient.c:
  Simple code cleanup
vio/test-sslserver.c:
  Simple code cleanup
vio/viotest-ssl.c:
  Simple code cleanup
2003-01-28 08:38:28 +02:00