diff options
| author | unknown <joreland@mysql.com> | 2004-08-19 10:37:47 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-08-19 10:37:47 +0200 |
| commit | b368cb3f6e57f7cba609088ca3ff2376bbe1b56a (patch) | |
| tree | 4a02cfc818f5b160557187bee066fa1f8be37473 /ndb | |
| parent | 853a01f7195a1a65af9cdcc8f555a8f319cbf795 (diff) | |
| parent | 0e0b785fc31dfaaaaf4d4d95d58758680bb54bdd (diff) | |
| download | mariadb-git-b368cb3f6e57f7cba609088ca3ff2376bbe1b56a.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/include/kernel/Interpreter.hpp | 6 | ||||
| -rw-r--r-- | ndb/include/util/BaseString.hpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ndb/include/kernel/Interpreter.hpp b/ndb/include/kernel/Interpreter.hpp index 2c282be361c..74399f5732e 100644 --- a/ndb/include/kernel/Interpreter.hpp +++ b/ndb/include/kernel/Interpreter.hpp @@ -83,7 +83,7 @@ public: static Uint32 LoadConst64(Uint32 Register); // Value in next 2 words static Uint32 Add(Uint32 DstReg, Uint32 SrcReg1, Uint32 SrcReg2); static Uint32 Sub(Uint32 DstReg, Uint32 SrcReg1, Uint32 SrcReg2); - static Uint32 Branch(Uint32 Inst, Uint32 R1, Uint32 R2); + static Uint32 Branch(Uint32 Inst, Uint32 Reg1, Uint32 Reg2); static Uint32 ExitOK(); /** @@ -184,8 +184,8 @@ Interpreter::Sub(Uint32 Dcoleg, Uint32 SrcReg1, Uint32 SrcReg2){ inline Uint32 -Interpreter::Branch(Uint32 Inst, Uint32 R1, Uint32 R2){ - return (R1 << 9) + (R2 << 6) + Inst; +Interpreter::Branch(Uint32 Inst, Uint32 Reg1, Uint32 Reg2){ + return (Reg1 << 9) + (Reg2 << 6) + Inst; } inline diff --git a/ndb/include/util/BaseString.hpp b/ndb/include/util/BaseString.hpp index 8755c13e9bb..a1bb91ea9c5 100644 --- a/ndb/include/util/BaseString.hpp +++ b/ndb/include/util/BaseString.hpp @@ -176,7 +176,7 @@ public: /** * Trim string from <i>delim</i> */ - static char* trim(char * src, const char * delim = " \t"); + static char* trim(char * src, const char * delim); private: char* m_chr; unsigned m_len; |