Commit graph

8217 commits

Author SHA1 Message Date
bar@bar.mysql.r18.ru
8d52377a5c Some SHOW VARIABLES have been renamed:
collation_client  -> character_set_client
collation_results -> character_set_results
character_set     -> character_set_server

SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion
2003-05-21 17:44:12 +05:00
bar@bar.mysql.r18.ru
c03d807417 UCS2 and UTF8 are in separate files now 2003-05-21 15:29:44 +05:00
bar@bar.mysql.r18.ru
189d1373b8 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-21 13:59:00 +05:00
bar@bar.mysql.r18.ru
7f771ce2e1 "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
"character_set_system" has been added to display the system character set
2003-05-21 13:58:30 +05:00
bar@bar.mysql.r18.ru
c725a34b80 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-21 13:34:07 +05:00
venu@myvenu.com
3f1a05d316 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-05-21 01:21:51 -07:00
venu@myvenu.com
0c25993d24 Fix merge conflict by changing warning codes to new one 2003-05-21 01:21:06 -07:00
venu@myvenu.com
7b2ac7f83c client_test.c:
Updated protocol test
2003-05-21 01:15:04 -07:00
ram@mysql.r18.ru
13607aedd8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.latest
2003-05-21 12:27:27 +05:00
bar@bar.mysql.r18.ru
76900a9f4b Two separate startup arguments for mysqld:
--default-character-set and --default-collation
2003-05-21 12:26:35 +05:00
ram@mysql.r18.ru
d90720704b Added AsBinary alias for AsWKB function. 2003-05-21 12:26:06 +05:00
venu@myvenu.com
97a2c472bc Resolve merge conflict 2003-05-21 00:14:56 -07:00
venu@myvenu.com
39cbb547d4 Resolve merge colflict 2003-05-21 00:12:09 -07:00
venu@myvenu.com
9ad75823e7 Fix for Windows build by adding pack.c to appropriate .dsp files 2003-05-20 23:44:28 -07:00
venu@myvenu.com
08e10a976a Added mysql_fetch_column function
Added MYSQL_TYPE_NULL as a dummy bind case for fetch buffers
Fix for offset based re-fetch using mysql_fetch_column
Misc cleanups for ODBC compatibility
2003-05-20 23:41:15 -07:00
wax@kishkin.ru
93325f7b6c add check of __NT__ definition for shared_memory for tree 4.1 2003-05-21 04:57:59 +06:00
vva@eagle.mysql.r18.ru
666d46b6ee Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.1
2003-05-20 17:03:50 -04:00
vva@eagle.mysql.r18.ru
ec247fd6af changed processing of LOAD DATA in mysqlbinlog 2003-05-20 17:03:18 -04:00
bar@bar.mysql.r18.ru
5b788e660a A separate, better error message when it's impossible to aggregate strings for some operation 2003-05-20 16:36:59 +05:00
guilhem@mysql.com
b0062813e5 Version substitution so that tests pass on any build, independently of the
version is '-log', '-debug' etc.
2003-05-20 10:16:26 +02:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
bell@sanja.is.com.ua
d58b4bed4c new error message 2003-05-19 15:06:17 +03:00
monty@narttu.mysql.fi
fc0df599dc Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-19 12:02:11 +03:00
monty@narttu.mysql.fi
c01678bc3d Added option --read-only (Thanks to Markus Benning) 2003-05-19 12:01:38 +03:00
monty@narttu.mysql.fi
524878e935 Fix for when compiling with HAVE_ISAM enabled 2003-05-19 11:53:42 +03:00
monty@narttu.mysql.fi
dad4025e3f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-19 11:09:46 +03:00
monty@narttu.mysql.fi
755c89e29f Add empty() function for baselist. 2003-05-19 11:09:24 +03:00
heikki@hundin.mysql.fi
6ba4c68728 srv0start.c:
Better instructions for the user if adding of new ibdata files fails
2003-05-18 21:46:19 +03:00
heikki@hundin.mysql.fi
526bb7dc7b buf0buf.c:
When calculating the buf pool dirty pages ratio, add also free pages to the LRU list length: no need to active flushing if there are lots of free pages in the buffer pool
2003-05-17 16:23:46 +03:00
guilhem@mysql.com
e9c2a37008 LOCAL is an alias of NO_WRITE_TO_BINLOG 2003-05-16 15:28:17 +02:00
heikki@hundin.mysql.fi
5359d04608 buf0lru.c, buf0flu.c, buf0buf.c, buf0lru.h:
Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
trx0trx.c:
  Add forgotten return value (it was not used anywhere, fortunately)
ha_innodb.h, mysql_priv.h:
  Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
2003-05-16 16:27:50 +03:00
mysqldev@build.mysql2.com
cf79c47597 - re-enabled RAID support for the Max subpackage again 2003-05-16 13:36:13 +02:00
mysqldev@build.mysql2.com
eb3ba82ec6 my_global.h:
- QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX
2003-05-16 13:03:47 +02:00
guilhem@mysql.com
3d784a4177 changes to mysqladmin : use queries instead of commands (so that they have a chance to go
into the binlog), SLAVE START -> START SLAVE, error test changes.
2003-05-15 23:00:58 +02:00
guilhem@mysql.com
50c9a79826 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-05-15 18:36:29 +02:00
guilhem@mysql.com
4a0e006230 Scrum task 845. Thi is a behaviour change :
now by default, FLUSH, OPTIMIZE, ANALYZE, REPAIR commands are written to the
binlog, unless the new NO_WRITE_TO_BINLOG keyword was used :
OPTIMIZE NO_WRITE_TO_BINLOG table t;

Previously these commands were never written to the binlog, but there are
2 reasons to change this :
- the RENAME TABLE in MERGE table bug (#175) on slave
- the possible "differently optimised queries may lead to different
updates on the master and slave" bug, until we have automatic ORDER BY.

FLUSH LOGS/SLAVE/MASTER/TABLES WITH READ LOCK are never written to the binlog.
New test for the new logging behaviour.
Other small change : reload_acl_and_cache() and reset_slave() don't send their errors themselves,
this is more usual.
2003-05-15 18:35:39 +02:00
monty@narttu.mysql.fi
e2fc4f0b71 Fix to get thread_test to compile 2003-05-15 17:50:57 +03:00
monty@narttu.mysql.fi
836216f4df Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-15 15:52:00 +03:00
monty@narttu.mysql.fi
09c98127cb Remove warning from automake 2003-05-15 15:51:42 +03:00
bar@bar.mysql.r18.ru
080eb641fa configure.in:
./configure --with-charset=big5  didn't work
2003-05-15 16:57:34 +05:00
monty@narttu.mysql.fi
c935709140 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-15 00:31:32 +03:00
monty@narttu.mysql.fi
04004534ea Fixed new bug in ORDER BY 2003-05-15 00:31:12 +03:00
monty@narttu.mysql.fi
a46c0a7cac Portability fix for 64 bit machines 2003-05-14 23:06:06 +03:00
monty@narttu.mysql.fi
bceefa954a Merge with 3.23 (No releavant code changes) 2003-05-14 22:28:54 +03:00
monty@narttu.mysql.fi
b0719f2bf9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-14 22:13:20 +03:00
monty@narttu.mysql.fi
dcb7b452bd Fixed bug in CREATE ... DECIMAL(-1,1). Bug #432 2003-05-14 22:12:55 +03:00
monty@narttu.mysql.fi
cf99d89908 Portability fixes OpenUnix 8 & UnixWare 7.1.x 2003-05-14 22:08:30 +03:00
monty@narttu.mysql.fi
39861469e5 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-05-14 22:06:11 +03:00
heikki@hundin.mysql.fi
53b7eaf9ca os0sync.c:
Check return value of pthread_cond_...
2003-05-14 20:22:55 +03:00
heikki@hundin.mysql.fi
cef5df827a os0sync.c:
Check that pthread_mutex_init and pthread_mutex_destroy return 0
2003-05-14 20:17:01 +03:00