Commit graph

7,300 commits

Author SHA1 Message Date
unknown
aeb47edbbc Every charset now have its own parser state arrays 2003-03-14 18:08:12 +04:00
unknown
13d28097e7 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-13 16:23:48 +04:00
unknown
fa2dfa0116 sql_lex.cc:
Move all charset recoding to the same place


sql/sql_lex.cc:
  Move all charset recoding to the same place
2003-03-13 16:23:18 +04:00
unknown
bfaa1d9a2b filesort.cc, sql_analyse.cc, item_func.cc, item_strfunc.cc, field.cc:
Unnesessary binary() calls have been removed


sql/field.cc:
  Unnesessary binary() calls have been removed
sql/item_strfunc.cc:
  Unnesessary binary() calls have been removed
sql/item_func.cc:
  Unnesessary binary() calls have been removed
sql/sql_analyse.cc:
  Unnesessary binary() calls have been removed
sql/filesort.cc:
  Unnesessary binary() calls have been removed
2003-03-13 15:34:46 +04:00
unknown
a6e8de843d Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.test
2003-03-13 14:13:17 +04:00
unknown
9fb88bfb14 Fix for embeded library compile 2003-03-13 14:12:28 +04:00
unknown
dd93a7994a Case insensitivrly has been added in charset and collation names. 2003-03-13 12:54:34 +04:00
unknown
85243c1086 A fix for mysql client program when use or connect were used
without arguments ...


client/mysql.cc:
  A fix for bug #90
2003-03-12 21:43:40 +02:00
unknown
92c9dc34b4 ALTER TABLE ADD SPATIAL KEY bug fix
myisam/mi_check.c:
  Additional condition added - we only can create 
  spatial key row-by-row now
2003-03-12 15:37:39 +04:00
unknown
4901295af1 Conflicts relsolving
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
2003-03-11 16:32:17 +04:00
unknown
92457d6e45 Added 'PURGE LOGS BEFORE' command
Added expire-logs-days option 


mysql-test/r/rpl_rotate_logs.result:
  Added test for 'PURGE LOGS BEFORE'
mysql-test/t/rpl_rotate_logs.test:
  Added test for 'PURGE LOGS BEFORE'
sql/log.cc:
  For 'Purge logs before' command
sql/mysqld.cc:
  Added 'expire-logs-days' option
sql/set_var.cc:
  Added 'expire-logs-days' option
sql/sql_class.h:
  For 'Purge logs before' command
sql/sql_parse.cc:
  Added 'expire-logs-days' option
sql/sql_yacc.yy:
  For 'Purge logs before' command
2003-03-11 13:49:06 +04:00
unknown
bbc8f836c0 Fix for a bug with ROW(..) <=> ROW(...) 2003-03-10 20:54:18 +02:00
unknown
462a72b802 Adding tests for the fixed ORDER BY 0 bug 2003-03-10 17:07:39 +02:00
unknown
249788280a Fix for a crashing bug 2003-03-08 22:19:41 +02:00
unknown
0c911187d4 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-03-07 21:48:22 +02:00
unknown
c3122e9a6c An interim code cleanup.
Major re-write of code yet has to be done, to circumvent
assigning of UNIT to current select and to deal better with 
offset, limit.


mysql-test/r/union.result:
  A fix of merge fix
2003-03-07 21:47:04 +02:00
unknown
e11ec6bf8e Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-07 10:18:16 -08:00
unknown
1d794e2de7 Change -IN_RPM -> --rpm and -WINDOWS -> --windows from mysql_install_db
support-files/mysql.spec.sh:
  Change -IN_RPM -> --rpm
scripts/make_win_src_distribution.sh:
  Change -WINDOWS -> --windows (call to mysql_install_db)
scripts/mysql_install_db.sh:
  Change -IN_RPM -> --rpm and -WINDOWS -> --windows
2003-03-07 10:16:23 -08:00
unknown
9f6256563c item_func.cc, item_cmpfunc.cc, unireg.cc, table.cc, sql_base.cc:
some default_charset_info were removed


sql/sql_base.cc:
  some default_charset_info were removed
sql/table.cc:
  some default_charset_info were removed
sql/unireg.cc:
  some default_charset_info were removed
sql/item_cmpfunc.cc:
  some default_charset_info were removed
sql/item_func.cc:
  some default_charset_info were removed
2003-03-07 13:39:53 +04:00
unknown
fb4ee80cfd sql_load.cc:
LOAD DATA INFILE now uses database character set instead of server character set. This is not excellent but at least allows to load for example cyrillic data into cyrillic database if server charset is latin1. In the future we should add a syntax to specify file charset or evern charset of each field.


sql/sql_load.cc:
  LOAD DATA INFILE now uses database character set instead of server character set. This is not excellent but at least allows to load for example cyrillic data into cyrillic database if server charset is latin1. In the future we should add a syntax to specify file charset or evern charset of each field.
2003-03-07 12:55:55 +04:00
unknown
11da9dede6 sql_acl.cc, item.h:
use of new argument
sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
mysql_priv.h:
  _default_charset_info has been removed
item_cmpfunc.h:
  Use cmp_charset
hostname.cc, hash_filo.h:
  Move charset to constructor argument


sql/hash_filo.h:
  Move charset to constructor argument
sql/hostname.cc:
  Move charset to constructor argument
sql/item_cmpfunc.h:
  Use cmp_charset
sql/mysql_priv.h:
  _default_charset_info has been removed
sql/sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
sql/item.h:
  use of new argument
sql/sql_acl.cc:
  use of new argument
2003-03-07 12:21:32 +04:00
unknown
8d9d12d182 New syntax to change client collation:
SET COLLATION latin1
SET COLLATION 'latin1'
SET COLLATION DEFAULT
2003-03-07 11:54:26 +04:00
unknown
64a7e9fd1b Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4nh
sql/mysqld.cc:
  Auto merged
2003-03-07 03:44:15 +05:00
unknown
36c2b9ca78 merge fixes
sql/item_subselect.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2003-03-06 17:31:22 +02:00
unknown
236015ed7a three bug fixes and major code cleanup 2003-03-06 17:02:10 +02:00
unknown
840e853e00 Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-03-06 13:56:02 +01:00
unknown
6038ec949a Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2003-03-06 13:52:21 +01:00
unknown
37211b4a03 - Changed C++-style comments to C-style comments to make IBM compiler happy 2003-03-06 13:51:37 +01:00
unknown
66d0033029 Added IsClosed() tests for MultiLineString objects.
Added Centroid(), Area() tests for MultiPolygon objects.
2003-03-06 16:25:06 +04:00
unknown
a8c7a0833c Bug fix: should use float8get() instead of (double *) type cast.
Code clean-up according 'Coding Standards and Styles'
2003-03-06 15:44:52 +04:00
unknown
9cbc3df7c3 novell41b.patch
BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee:
  Delete: netware/netware.patch
netware/BUILD/mwenv:
  Import patch novell41b.patch
netware/init_db.sql:
  Import patch novell41b.patch
netware/test_db.sql:
  Import patch novell41b.patch
2003-03-05 18:52:47 -05:00
unknown
401f3fb418 Fixed character set bug when replicating user variables
sql/log_event.cc:
  Fixed character set bug when replicating user variables.
  Simple optimisation of User_var_log_event::write_data
2003-03-05 16:10:40 +02:00
unknown
a6c0ea72d6 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-05 16:43:43 +04:00
unknown
a6597812a8 New fields in CHARSET_INFO structure to optimize searching for
binary and primary collations in the future
2003-03-05 16:43:10 +04:00
unknown
dfa4fad414 Bug fix: we should set proper my_errno 2003-03-05 16:07:12 +04:00
unknown
64d48cd6d1 SET NAMES has been extended to support optional collation:
SET NAMES <charset name> [COLLATE <collation name>]
2003-03-05 12:37:39 +04:00
unknown
b7b75213dc - typo fix (replaced blanks with a tab) 2003-03-05 08:13:37 +01:00
unknown
a8c01369d4 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-04 14:33:25 -08:00
unknown
df22e3c215 sql_prepare.cc:
Remove the unused code (from previous commit)


sql/sql_prepare.cc:
  Remove the unused code (from previous commit)
2003-03-04 14:31:42 -08:00
unknown
ade3fbc390 Fix EXPLAIN bug with binary protocol
Added new client tests (EXPLAIN + DECIMAL conv)



sql/sql_prepare.cc:
  Fix EXPLAIN bug with binary protocol
tests/client_test.c:
  New tests for EXPLAIN + DECIMAL conv
2003-03-04 14:22:30 -08:00
unknown
b10c79a889 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 22:24:00 +01:00
unknown
c18b50d5e4 Merge gweir@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/greg/bk/mysql-4.1
2003-03-04 12:30:51 -05:00
unknown
5f1f2216b3 Many files:
Change mode to -rwxrwxr-x


netware/BUILD/compile-AUTOTOOLS:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-linux-tools:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-END:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-START:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-all:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-debug:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-standard:
  Change mode to -rwxrwxr-x
netware/BUILD/mwasmnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/mwccnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/mwenv:
  Change mode to -rwxrwxr-x
netware/BUILD/mwldnlm:
  Change mode to -rwxrwxr-x
2003-03-04 12:30:29 -05:00
unknown
693d76ffe9 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-04 19:54:41 +04:00
unknown
92754ae2db SELECT BINARY expr
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
2003-03-04 19:53:53 +04:00
unknown
4d9b1f3be6 novell41.patch
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Delete: netware/libmysqld.def
BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
  Delete: netware/mw/mwenv
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Delete: netware/nwconfigure
netware/BUILD/mwasmnlm:
  Import patch novell41.patch
netware/BUILD/mwccnlm:
  Import patch novell41.patch
netware/BUILD/mwldnlm:
  Import patch novell41.patch
netware/BUILD/nwbootstrap:
  Import patch novell41.patch
scripts/make_binary_distribution.sh:
  Import patch novell41.patch
2003-03-04 10:34:32 -05:00
unknown
3cbb978d51 stringcmp() and sortcmp() have been unified
into the only one sortcmp() with additional
CHARSET_INFO *cmp_charset argument.
2003-03-04 18:01:59 +04:00
unknown
9dfa4eb60a Fix for reading variables from binary log. 2003-03-04 15:17:29 +02:00
unknown
6d1ab2314f Fix for using unitialized mutex when running version compiled with --debug
include/mysql_embed.h:
  Disable shared memory for embedded version
libmysqld/lib_sql.cc:
  Fix for --debug version (init_thread_environment was called in wrong place)
sql/log_event.h:
  Portability fix
sql/mysqld.cc:
  Fix for --debug version (init_thread_environment was called in wrong place)
sql/sql_parse.cc:
  Simply code cleanup
2003-03-04 15:02:49 +02:00
unknown
7e2aca564e Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
for binary collations
2003-03-04 12:33:52 +04:00