Commit graph

7800 commits

Author SHA1 Message Date
unknown
27e77a8fd6 greek.xml:
Comments why "greek" is ISO greek


sql/share/charsets/greek.xml:
  Comments why "greek" is ISO greek
2003-03-26 14:11:04 +04:00
unknown
b7a723af12 German Phone book collation is always compiled
Some collation names have been renamed


BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e:
  Delete: strings/ctype-latin1_de.c
libmysql/Makefile.shared:
  German Phone book collation is always compiled
mysql-test/r/ctype_collate.result:
  Some collation names have been renamed
mysql-test/t/ctype_collate.test:
  Some collation names have been renamed
mysql-test/t/ctype_latin1_de-master.opt:
  Some collation names have been renamed
mysys/charset.c:
  get_charset_by_name() now will find its default collation if charset name is passed
sql/share/charsets/Index.xml:
  Some collation names have been renamed
sql/share/charsets/cp1251.xml:
  Some collation names have been renamed
sql/share/charsets/cp1257.xml:
  Some collation names have been renamed
sql/share/charsets/latin1.xml:
  Some collation names have been renamed
sql/share/charsets/latin2.xml:
  Some collation names have been renamed
sql/share/charsets/latin7.xml:
  Some collation names have been renamed
sql/share/charsets/macce.xml:
  Some collation names have been renamed
sql/share/charsets/macroman.xml:
  Some collation names have been renamed
sql/sql_show.cc:
  Nicer output from SHOW COLLATION
strings/Makefile.am:
  German Phone book collation is always compiled
strings/ctype-czech.c:
  Some collation names have been renamed
strings/ctype-extra.c:
  Don't compile dynamic charset. We should decide names convension before 
  making this available.
strings/ctype-latin1.c:
  German Phone book collation is always compiled
2003-03-26 13:27:19 +04:00
unknown
592a398f75 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
2003-03-25 19:58:40 -04:00
unknown
f4305a899a fix bug with parameters of LOAD DATA INFILE in exec_event
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-25 19:57:38 -04:00
unknown
0737f4adaa - removed redundant readline_dir from SUBDIRS to fix "make distclean"
(there is a Makefile in readline_topdir that already lists
   readline_dir in SUBDIRS)
2003-03-25 22:48:13 +01:00
unknown
3d6dcd6567 - fixed typo (build_command -> build-command) 2003-03-25 22:38:12 +01:00
unknown
f3a5d5aa98 - added new option "--build-command" to be able to use different
commands for building the sources
 - removed duplicate option "--revision"
 - added help for new option and reformatted help text a bit
2003-03-25 22:20:07 +01:00
unknown
5ed61c1121 crash-me.sh:
add new parameter  checks length_of_varchar_field,
  add new auxilary functions:
  get_recordset
  compare_recordset
  print_recordset


sql-bench/crash-me.sh:
  add new parameter  checks length_of_varchar_field,
  add new auxilary functions:
  get_recordset
  compare_recordset
  print_recordset
2003-03-26 00:19:56 +05:00
unknown
4291001df9 Fix for small bug #186 (If a connection has temporary tables and does
RESET MASTER, this breaks replication).
In the slave SQL thread, any DROP TEMPORARY TABLE is silently
converted to DROP TEMPORARY TABLE IF EXISTS, not to have irrelevant
"table does not exist". See comments in code or bug #186 for an example
of how irrelevant errors like this can arise.
2003-03-25 16:52:48 +01:00
unknown
838d043c93 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/suse80/my/mysql-4.1
2003-03-25 14:29:50 +01:00
unknown
f9df0feecb A fix for a bug in MyISAM with large number of NULL columns and at
least one BLOB column.
2003-03-25 14:49:43 +02:00
unknown
165d8e9c0b - fixed comments so mysql_copyright does not eat the whole files
sql/sql_error.cc:
   - fixed comment so mysql_copyright does not eat the whole file
sql/sql_prepare.cc:
   - fixed comment so mysql_copyright does not eat the whole file
2003-03-25 13:46:10 +01:00
unknown
028822d27b SHOW CHARACTER SET now can display comments
Low case letters are used in charset names


BitKeeper/deleted/.del-MacRoman.xml~f890bce37d31d382:
  Delete: sql/share/charsets/MacRoman.xml
BitKeeper/deleted/.del-MacCE.xml~fca413f3126f6189:
  Delete: sql/share/charsets/MacCE.xml
mysys/charset.c:
  SHOW CHARACTER SET now can display comments
sql/share/charsets/Index.xml:
  SHOW CHARACTER SET now can display comments
sql/sql_show.cc:
  SHOW CHARACTER SET now can display comments
strings/ctype.c:
  SHOW CHARACTER SET now can display comments
2003-03-25 16:12:49 +04:00
unknown
72830a7719 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-03-25 14:04:22 +02:00
unknown
71837a9577 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/suse80/my/mysql-4.1
2003-03-25 12:12:01 +01:00
unknown
044b0b2588 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
2003-03-25 13:07:02 +02:00
unknown
829045100d Fixed bug with GROUP BY and alias
mysql-test/r/group_by.result:
  Test for group by + alias bug
mysql-test/t/group_by.test:
  Test for group by + alias bug
2003-03-25 13:06:20 +02:00
unknown
c8bdced214 sql_string.cc:
NATIONAL CHARACTER() has latin1 charset now.
  Reasons are (by Monty):
  I think we should keepy having latin1 (default configure option)
  as the national character set.  The reason for this is simple that:

- This is ok for a large part of the world.
- It's faster and takes less space than utf8.


sql/sql_string.cc:
  NATIONAL CHARACTER() has latin1 charset now.
  Reasons are (by Monty):
  I think we should keepy having latin1 (default configure option)
  as the national character set.  The reason for this is simple that:
2003-03-25 14:54:07 +04:00
unknown
8816bbae1c sql_show.cc:
LIKE was used against wrong name


sql/sql_show.cc:
  LIKE was used against wrong name
2003-03-25 13:42:01 +04:00
unknown
f8b7332cf3 Two separate commands: SHOW COLLATION and SHOW CHARACTER SET 2003-03-25 13:38:05 +04:00
unknown
86050a90e6 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/suse80/my/mysql-4.1
2003-03-25 09:12:23 +01:00
unknown
bbbc2564b8 Collation names have been renamed to common style 2003-03-25 12:07:46 +04:00
unknown
40c367b3c1 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-24 21:08:54 -05:00
unknown
90527436fa Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-03-25 02:38:03 +02:00
unknown
11841c05ec Fixed bug in allocation memory in key cache. (Memory was not properly aligned which cased core dumps on sparc CPU's)
Changed keycache variables to start with my_ instead of _my_


include/my_sys.h:
  Changed keycache variables to start with my_ instead of _my_
myisam/mi_test2.c:
  Changed keycache variables to start with my_ instead of _my_
  Removed compiler warnings
myisam/sp_test.c:
  Removed compiler warning
mysys/mf_keycache.c:
  Fixed bug in allocation memory (Memory was not properly aligned which cased core dumps on sparc CPU's)
  Changed keycache variables to start with my_ instead of _my_
  Fixed indentation and comment syntax.
  Removed end space.
sql/mysqld.cc:
  Changed keycache variables to start with my_ instead of _my_
sql/sql_test.cc:
  Changed keycache variables to start with my_ instead of _my_
2003-03-25 02:37:41 +02:00
unknown
0783e5bc2f Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-03-24 23:29:06 +02:00
unknown
3b0438c8dd Fixed bug that binary log was not locked during a DELETE FROM TABLE_NAME; 2003-03-24 23:24:45 +02:00
unknown
3a74f343a1 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/suse80/my/mysql-4.1
2003-03-24 21:17:43 +01:00
unknown
396328d5d7 item_strfunc.cc:
Fixed that concat() didn't set character set in val_str
  concat_ws() now honors coercibility


sql/item_strfunc.cc:
  Fixed that concat() didn't set character set in val_str
  concat_ws() now honors coercibility
2003-03-24 20:01:05 +04:00
unknown
c9458e1646 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-03-24 17:50:24 +02:00
unknown
8848bb894c item_strfunc.cc:
The result didn't return proper collation


sql/item_strfunc.cc:
  The result didn't return proper collation
2003-03-24 19:33:44 +04:00
unknown
45e9ee67d1 item_strfunc.cc:
A bug has been fixed. ELT() didn't honor the second argument.
  Coercibility support has been added.


sql/item_strfunc.cc:
  A bug has been fixed. ELT() didn't honor the second argument.
  Coercibility support has been added.
2003-03-24 19:23:43 +04:00
unknown
6f063d3369 - fixed wrong order of commands in Mac OS X Readme.txt
(Thanks to Marc Liyanage for spotting this)
2003-03-24 15:06:11 +01:00
unknown
f1bd20c4c4 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item.cc:
  Auto merged
2003-03-24 15:04:01 +02:00
unknown
61fd01bf1e Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/suse80/my/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2003-03-24 12:19:07 +01:00
unknown
029b110c65 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/suse80/my/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2003-03-24 12:05:05 +01:00
unknown
bd294f07c5 make myisam usable without threads (and even w/o pthread_t) 2003-03-24 11:19:28 +01:00
unknown
fd8972cfa7 Reverted fix away from 4.0, because it may in rare circumstanses
cause compatibility problems. Fix will be enabled in 4.1.
2003-03-23 11:30:45 +02:00
unknown
c1719ad057 Changed some tests to pass with new auto_increment handling,
e.g. default value is not accepted with auto_increment anymore.
2003-03-22 20:34:20 +02:00
unknown
ebedd1521c Added error in case auto_increment and default where defined
at the same time.
2003-03-22 19:55:09 +02:00
unknown
3987075012 Fix for #178 Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
Now it does not SEGV, but USER() is still badly replicated
    (it is replicated to ""), which is a lower priority bug.


sql/item_strfunc.cc:
  Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
  Now it does not SEGV, but USER() is still badly replicated
  (it is replicated to ""), which is a lower priority bug.
2003-03-22 15:22:59 +01: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
unknown
0f18ab7897 Missed one file from Novell changes in 1.1686
netware/mysqld_safe.c:
  Changes to argument handling, spawn, etc
2003-03-21 16:14:52 -05:00
unknown
0ea383e048 Changes from Novell for various NetWare-only files, post-4.0.12
include/config-netware.h:
  Define USE_OLD_FUNCTIONS, remove NKS header includes
netware/BUILD/mwenv:
  Changes to compiler flags
netware/BUILD/nwbootstrap:
  bk changes syntax
netware/Makefile.am:
  Remove isamchk.def, mysqld.xdc, add comp_err.def to netware_build_files
netware/isamchk.def:
  Add XDCDATA
netware/isamlog.def:
  Add XDCDATA
netware/libmysql.def:
  Add XDCDATA
netware/my_manage.c:
  Changes in argument handling, use procve
netware/my_manage.h:
  Changes to argument handling, spawn
netware/my_print_defaults.def:
  Add XDCDATA
netware/myisamchk.def:
  Add XDCDATA
netware/myisamlog.def:
  Add XDCDATA
netware/myisampack.def:
  Add XDCDATA
netware/mysql.def:
  Add XDCDATA
netware/mysql_install.def:
  Add XDCDATA
netware/mysql_install_db.c:
  Argument handling changes, etc
netware/mysql_install_db.def:
  Add XDCDATA
netware/mysql_test_run.c:
  Argument handling, spawn changes, etc
netware/mysql_test_run.def:
  Add XDCDATA
netware/mysqladmin.def:
  Add XDCDATA
netware/mysqlbinlog.def:
  Add XDCDATA
netware/mysqlcheck.def:
  Add XDCDATA
netware/mysqld.def:
  Add XDCDATA
netware/mysqld_safe.def:
  Add XDCDATA
netware/mysqldump.def:
  Add XDCDATA
netware/mysqlimport.def:
  Add XDCDATA
netware/mysqlshow.def:
  Add XDCDATA
netware/mysqltest.def:
  Add XDCDATA
netware/pack_isam.def:
  Add XDCDATA
netware/perror.def:
  Add XDCDATA
netware/replace.def:
  Add XDCDATA
netware/resolveip.def:
  Add XDCDATA
2003-03-21 15:43:38 -05:00
unknown
f33c97281a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-03-21 21:10:20 +01:00
unknown
696962c4e6 Fix for bug #174 (charset 0 caused segfault) 2003-03-21 21:08:56 +01:00
unknown
746926e71e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2003-03-21 18:54:53 +02:00
unknown
e4ae47ff36 Fixes for fill_help_tables.sql
innobase/ha/ha0ha.c:
  Removed compiler warnings
mysql-test/t/innodb.test:
  Another fix for cardinality
scripts/Makefile.am:
  Install fill_help_tables.sql in prefix/share/mysql
  Don't install make_binary_distribution
scripts/fill_help_tables.sh:
  use INSERT IGNORE to avoid errors
scripts/make_binary_distribution.sh:
  Install and use fill_help_tables.sql
scripts/mysql_install_db.sh:
  Search for and use fill_help_tables.sql
sql/mysqld.cc:
  Don't write shutdown message when called from mysql_install_db
support-files/Makefile.am:
  Don't install binary-configure
support-files/binary-configure.sh:
  Don't use config files
2003-03-21 18:53:55 +02:00
unknown
8b71664441 crash-me.sh:
add foreign key value update test


sql-bench/crash-me.sh:
  add foreign key value update test
2003-03-21 21:42:51 +05:00
unknown
92f5103df4 item_cmpfunc.cc:
IFNULL() now honors collations


sql/item_cmpfunc.cc:
  IFNULL() now honors collations
2003-03-21 19:02:07 +04:00