1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Commit Graph

3326 Commits

Author SHA1 Message Date
unknown
ced5e414b6 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
2003-03-15 13:35:40 +02:00
unknown
23c774bc72 sql_lex.cc:
Use LEX charset instead of system one


sql/sql_lex.cc:
  Use LEX charset instead of system one
2003-03-15 15:19:06 +04:00
unknown
9e4c1d2090 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
2003-03-15 13:04:34 +02:00
unknown
aad26453e6 fixed typo (double ++ in assert)
removed all side effects from asserts for not to confuse casual reader
2003-03-15 11:56:03 +01:00
unknown
6c546f765c Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged
2003-03-15 11:24:44 +02:00
unknown
f42419e4b3 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
2003-03-14 20:25:50 +01:00
unknown
c03b4b7255 cleanup 2003-03-14 20:22:06 +01:00
unknown
d60c11be84 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-14 10:44:08 -08:00
unknown
892879901e Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format
(normal protocol only, prepared protocol already handles it)


sql/protocol.cc:
  Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format
2003-03-14 10:35:13 -08:00
unknown
1aeec73192 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/sql_lex.h:
  Auto merged
2003-03-14 18:11:20 +04:00
unknown
aeb47edbbc Every charset now have its own parser state arrays 2003-03-14 18:08:12 +04:00
unknown
6da897e04b fixed uncachable union (bug #150)
mysql-test/r/union.result:
  sect of uncachable union
mysql-test/t/union.test:
  sect of uncachable union
sql/sql_lex.h:
  fixed uncachable union
2003-03-14 14:16:09 +02: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
9fb88bfb14 Fix for embeded library compile 2003-03-13 14:12:28 +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
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
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
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
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
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
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
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
92754ae2db SELECT BINARY expr
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
2003-03-04 19:53:53 +04: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
unknown
9d02a87cf3 Every character set now has binary collation 2003-03-04 11:04:19 +04:00
unknown
a49822237d Do not give an error when the user does START SLAVE on an already
running slave, just give a warning. Same thing for STOP SLAVE.
This will make scripts writing easier for users.


include/mysqld_error.h:
  New error codes (warning codes in fact) to warn that the slave was already started or stopped
mysql-test/include/master-slave.inc:
  STOP SLAVE now prints a warning, not an error, so we should expect a warning here
sql/share/czech/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/danish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/dutch/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/english/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/estonian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/french/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/german/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/greek/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/hungarian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/italian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/japanese/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/korean/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/norwegian-ny/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/norwegian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/polish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/portuguese/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/romanian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/russian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/serbian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/slovak/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/spanish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/swedish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/ukrainian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/sql_repl.cc:
  Do not give an error when the user does START SLAVE on an already
  running slave, just give a warning. Same thing for STOP SLAVE.
2003-03-03 23:12:17 +01:00
unknown
48df5b7537 Coercibility is now stored in user vars
sql/item.h:
  Change constant values order according to the word "coercibility" nature
sql/item_func.cc:
  Change constant values order according to the word "coercibility" nature
2003-03-03 13:16:39 +04:00
unknown
310545adf0 Strings which appear without charset context,
like number-to-string-convertion-result, now 
takes current database character set, instead of
thread character set. This makes it easy to be
SQL99 conformant and 4.0 compatible.

Item->thd_charset() is renamed to Item->default_charset()
as old name doesn't describe its nature anymore.
2003-03-03 10:53:08 +04:00
unknown
0da0ce9312 URGENT fixed bug in shared memory (handler_count)
sql/mysqld.cc:
  fixed bug in shared memory
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-02 19:35:37 +05:00
unknown
08387526d4 sql_yacc.yy:
Produce an error when a field collation and charset are not compatible


sql/sql_yacc.yy:
  Produce an error when a field collation and charset are not compatible
2003-03-02 14:47:56 +04:00
unknown
1019053392 New error message for situation like:
SELECT latin1_expr COLLATE anpther_charset_collation
2003-03-02 14:05:03 +04:00
unknown
0d19df2f5d Replication: give the slave I/O thread a higher priority than the slave SQL thread
so that it has fetched the most from the master's binlog before the master
accidently dies. SCRUM task #756.


sql/slave.cc:
  Replication: give the slave I/O thread a higher priority than the slave SQL thread
  so that it has fetched the most from the master's binlog before the master
  accidently dies.
sql/slave.h:
  Replication: give the slave I/O thread a higher priority than the slave SQL thread
  so that it has fetched the most from the master's binlog before the master
  accidently dies.
2003-03-01 23:59:27 +01:00
unknown
67b5eb7fa0 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
sql/sql_select.cc:
  Auto merged
2003-03-01 14:18:55 +01:00