Commit graph

8430 commits

Author SHA1 Message Date
heikki@hundin.mysql.fi
42c80c81f7 handler.cc:
If the autocommit is on, let handler.cc commit or rollback the whole transaction at an updating SQL statement end. This probably fixes bug number 578. The problem was that when explicit LOCK TABLES is used, then the lock count method in autocommit does not work.
2003-06-04 17:58:41 +03:00
monty@narttu.mysql.fi
100a66e6cb Added [mysqld-base-version] as a default group for the mysqld server
Portability fix for Windows 64
2003-06-04 16:05:27 +03:00
venu@myvenu.com
94b570daf9 client.c:
Missed file from earlier commit
2003-06-04 00:21:49 -07:00
venu@myvenu.com
2e27ab2708 protocol test update
(fix for memory ovverun bug from DBD(ranger) + changes for removal of collation from explain)
2003-06-04 00:19:09 -07:00
venu@myvenu.com
c14de0f584 1. Portability fixups for Connector/ODBC 3.52 & DBD
(Addition of mysql_fetch_column & mysql_stmt_free_result)
 2. Windows build fixups for libmysqld, mysqlbinlog and mysqldemb
2003-06-04 00:17:48 -07:00
venu@myvenu.com
99ceb8fd04 Windows build fixups (Fix for slave_net_timeout) 2003-06-03 22:57:42 -07:00
venu@myvenu.com
45fc8cc25b Fix windows build after applyiing the changes from new client.c(sql-common)
NOTE: Still the build fails to compile core server on Windows due to slave_net_timeout linker error from client.obj
      and make sure to have the next changeset, which fixes this.
2003-06-03 20:59:32 -07:00
venu@myvenu.com
8f57d0e2e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-06-03 18:45:53 -07:00
venu@myvenu.com
27469ec8b9 Windows build fixups with the latest source 2003-06-03 18:45:07 -07:00
guilhem@mysql.com
c172cab875 Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-03 23:14:09 +02:00
guilhem@mysql.com
4a80a6c7b9 One-line fix for bug 576 (DBUG_ASSERT failure when using CHANGE MASTER TO RELAY_LOG_POS=4).
Plus a changeset which I had committed but forgot to push (and this changeset is lost on
another computer, so I recreate it here). This changeset is "user-friendly SHOW BINLOG EVENTS
and CHANGE MASTER TO when log positions < 4 are used.
2003-06-03 23:13:06 +02:00
guilhem@mysql.com
3b974039f7 -- Waiting for Monty's approval before push --
Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master: 
if it was with IGNORE, do it with IGNORE,
if it was with REPLACE, do it with REPLACE,
and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
on the slave, i.e. a message where the keyname and key value appear :
'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'
2003-06-03 15:47:29 +02:00
bar@bar.mysql.r18.ru
514afa7a88 SPACE() is now ucs2 compatible 2003-06-03 18:24:57 +05:00
bar@bar.mysql.r18.ru
f696135c30 Collation & coercibility tests for LTRIM, RTRIM and TRIM 2003-06-03 17:13:19 +05:00
bar@bar.mysql.r18.ru
1ef8b2e34a LTRIM, RTRIM and TRIM now honors coercibility
LTRIM, RTRIM and TRIM now work fine with ucs2
2003-06-03 16:57:14 +05:00
hf@deer.(none)
b175a26f44 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb_bind
2003-06-03 15:29:45 +05:00
hf@deer.(none)
5990e7c38e Obsolete files removed 2003-06-03 15:27:17 +05:00
hf@deer.(none)
f78e0d7ad5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb_bind
2003-06-03 15:03:29 +05:00
hf@deer.(none)
9ad3c1cdca SCRUM:
splittiln common client's parts
2003-06-03 15:02:57 +05:00
bar@bar.mysql.r18.ru
759214fa41 MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
Some default_charset_info were removed
2003-06-03 14:59:17 +05:00
lenz@mysql.com
5a6d4e7e3b Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-06-02 19:23:16 +02:00
guilhem@mysql.com
41a5f79ab7 Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-02 17:31:45 +02:00
guilhem@mysql.com
4d5ae1d37c Clearer error message (in the customer's case, the relay log was corrupted,
not the master's binlog) (SW 1571).
2003-06-02 17:30:47 +02:00
heikki@hundin.mysql.fi
ce8e0aa0c4 os0sync.c:
Do not try to reserve os_sync_mutex in shutdown after it has been freed
2003-06-02 17:58:18 +03:00
heikki@hundin.mysql.fi
5eaa3c4e34 com0shm.c:
Removed auto event creation because it is not needed in any MySQL/InnoDB code
2003-06-02 16:11:06 +03:00
bar@bar.mysql.r18.ru
7342852dd9 "Collation" has been moved to SHOW FULL FIELDS
SHOW COLLATION columns have been removed:
  D -> Default
  C -> Compiled
  Y -> Yes
2003-06-02 17:19:06 +05:00
heikki@hundin.mysql.fi
eebdcd0c5f os0file.c:
Put back Monty's patch which the previous push accidentally erased: print also operation type in os_file_handle_error()
2003-06-02 13:45:45 +03:00
heikki@hundin.mysql.fi
e8e98d05f9 os0thread.h, os0sync.ic, os0sync.h, os0thread.c, os0sync.c, os0file.c:
Release all event semaphores at shutdown also in Windows
srv0start.c, srv0srv.c:
  make test sometimes failed because lock timeout thread exited without decrementing the InnoDB thread counter
2003-06-02 13:11:20 +03:00
bar@bar.mysql.r18.ru
de6ad3abef ctype-ucs2.c:
define ILSEQ for platforms that do not define it themself
2003-06-02 14:12:46 +05:00
lenz@mysql.com
048b89f01a Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-06-02 07:55:57 +02:00
monty@narttu.mysql.fi
f6a365a532 Small fixes (nothing nameworthy) 2003-06-01 23:40:01 +03:00
monty@narttu.mysql.fi
f6579fd921 Merge 2003-06-01 12:43:08 +03:00
monty@narttu.mysql.fi
891d7ccd86 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-06-01 12:33:23 +03:00
monty@narttu.mysql.fi
02adbe6599 Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED. Bug #478 2003-06-01 12:32:53 +03:00
bell@sanja.is.com.ua
902415bf3c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2003-06-01 10:51:33 +03:00
monty@narttu.mysql.fi
23daa1b2c9 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-05-31 18:45:00 +03:00
monty@narttu.mysql.fi
373a9caa82 Fixed compiler optimization problem with doubleget()
(Casused problems in GIS functions in 4.1)
2003-05-31 18:44:37 +03:00
hf@deer.(none)
02d3d7e8bd SCRUM:
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c

I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.
2003-05-31 15:15:46 +05:00
heikki@hundin.mysql.fi
dcdc6ffadc os0thread.c, os0thread.h, os0sync.h:
Cleanup
os0sync.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
2003-05-31 03:23:42 +03:00
heikki@hundin.mysql.fi
42671d18ae Many files:
Free all OS sync primitives and allocated memory in InnoDB shutdown
2003-05-31 03:12:03 +03:00
bell@sanja.is.com.ua
2848e6c0d4 fixed bug 549 - incorect query cache memory formating on very small query cache sizes 2003-05-31 01:41:11 +03:00
heikki@hundin.mysql.fi
cfda0a16ff srv0start.c:
Cleanup
2003-05-30 23:00:37 +03:00
heikki@hundin.mysql.fi
d1759530d3 Many files:
Exit all threads created by innoDB at shutdown
2003-05-30 22:44:37 +03:00
bell@sanja.is.com.ua
7b0afa3ae7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-mem_root-4.1
2003-05-30 21:09:38 +03:00
bell@sanja.is.com.ua
ac8180c2fc after review changes 2003-05-30 21:09:37 +03:00
bell@sanja.is.com.ua
56c77cc2d2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-mem_root-4.1
2003-05-30 21:09:36 +03:00
bar@bar.mysql.r18.ru
bb611fa0a2 mysqlshow and mysqldump now send their vharacter set to server
character_set_results is now the same with character_set_client by default
2003-05-30 23:09:35 +05:00
ram@mysql.r18.ru
e15ea0291a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1.latest
2003-05-30 23:09:34 +05:00
hf@deer.(none)
6bc3473f88 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb_bind
2003-05-30 23:09:33 +05:00
bar@bar.mysql.r18.ru
84893b4154 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-30 23:09:33 +05:00