- 13 Sep, 2005 1 commit
-
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/violite.h: Auto merged mysql-test/r/ndb_autodiscover.result: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/ndbapi/SignalSender.cpp: Auto merged sql-common/client.c: Auto merged sql/examples/ha_archive.cc: Auto merged sql/net_serv.cc: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged configure.in: Resolve conflicts
-
- 12 Sep, 2005 39 commits
-
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean configure.in: Auto merged
-
unknown authored
Corrected typo mysql-test/mysql-test-run.pl: Corrected typo
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0 mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-4.1 configure.in: Auto merged
-
unknown authored
-
unknown authored
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
-
unknown authored
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean
-
unknown authored
mysql-test/r/ndb_autodiscover.result: Update results
-
unknown authored
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
-
unknown authored
into selena.:H:/MYSQL/src/#05588-mysql-4.1 include/my_global.h: Auto merged
-
unknown authored
into kite-hub.kitebird.com:/tmp/merge-4.1
-
unknown authored
into kite-hub.kitebird.com:/tmp/merge-4.1 README: Auto merged
-
unknown authored
Update README (2nd try) README: Update README (2nd try)
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean configure.in: Auto merged include/my_pthread.h: Auto merged sql/examples/ha_archive.cc: Auto merged
-
unknown authored
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 mysql-test/r/temp_table.result: Auto merged mysql-test/r/warnings.result: Auto merged sql/sql_db.cc: Auto merged client/mysqltest.c: Auto merged mysql-test/t/innodb.test: Auto merged sql/filesort.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/create.result: Merged from 4.1 to 5.0 mysql-test/r/innodb.result: Merged from 4.1 to 5.0 mysql-test/t/create.test: Merged from 4.1 to 5.0 sql/item_cmpfunc.cc: Merged from 4.1 to 5.0 sql/sql_table.cc: Merged from 4.1 to 5.0
-
unknown authored
mysql-test/r/select.result: post-merge fix mysql-test/t/select.test: post-merge fix
-
unknown authored
into mysql.com:/home/timka/mysql/src/5.0-bug-12943 sql/sql_parse.cc: Auto merged mysql-test/r/select.result: merge BUG#12943 mysql-test/t/select.test: merge BUG#12943
-
unknown authored
-
unknown authored
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
-
unknown authored
into mishka.mysql.com:/home/my/mysql-4.1
-
unknown authored
Fix for bug #13025; Server crash in filesort because wrong call to handler::position() client/mysqltest.c: Code cleanup during review mysql-test/r/innodb.result: Added test case for bug #13025; Server crash in filesort because wrong call to handler::position() mysql-test/t/innodb.test: Added test case for bug #13025; Server crash in filesort because wrong call to handler::position() sql/filesort.cc: Don't call handler::position() if row was not found sql/item_cmpfunc.cc: Indentation changes sql/sql_select.cc: Moved variable to outer level
-
unknown authored
into mysql.com:/usr/home/bar/mysql-5.0
-
unknown authored
Adding esperanto collation strings/ctype-uca.c: Adding esperanto collation mysys/charset-def.c: Adding esperanto collation mysql-test/t/ctype_uca.test: Adding esperanto collation mysql-test/r/ctype_uca.result: Adding esperanto collation config/ac-macros/character_sets.m4: Adding esperanto collation
-
unknown authored
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
-
unknown authored
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
-
unknown authored
into eel.(none):/home/jonas/src/mysql-4.1-push
-
unknown authored
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0 mysql-test/t/rpl_slave_status.test: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged
-
unknown authored
produce warning for 'create database if not exists' if database exists do not update database options in this case produce warning for 'create table if not exists' if table exists mysql-test/r/create.result: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS updated test case result mysql-test/r/temp_table.result: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS updated test case result mysql-test/r/warnings.result: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS updated test case result mysql-test/t/create.test: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS test case sql/sql_db.cc: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS produce warning for 'create database if not exists' if database exists do not update database options in this case sql/sql_table.cc: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS produce warning for 'create table if not exists' if table exists
-
unknown authored
corrected typo in ndb Parser
-
unknown authored
into mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
-
unknown authored
into mysql.com:/usr/home/ram/work/5.0.b12917
-
unknown authored
into mysql.com:/usr/home/ram/work/5.0.b12917
-
unknown authored
into mysql.com:/usr/home/bar/mysql-5.0.b12891
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0
-
unknown authored
-
unknown authored
into mysql.com:/usr/home/ram/work/5.0.b12917
-
unknown authored
into eel.(none):/home/jonas/src/mysql-4.1-push
-
unknown authored
-